fix: 🐛 add config for PROCEDURES_SERVER_URL

Signed-off-by: Manuel Ruck <[email protected]>
demokratie-live · Sep 22, 2024 · 5427b10 · 5427b10
1 parent b7c1864
commit 5427b10
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/bundestag.io/admin/.env b/bundestag.io/admin/.env
@@ -7,4 +7,5 @@ AI_SERVER_URL_CODEGEN=http://localhost:4003
 AI_ACCESS_TOKEN=EMPTY
 AI_SIMULATION=true
 NON_NAMED_VOTES_AI_SERVER_URL=http://localhost:3005
-NON_NAMED_VOTES_AI_SECRET=CHANGE_ME
+NON_NAMED_VOTES_AI_SECRET=CHANGE_ME
+PROCEDURES_SERVER_URL=http://localhost:3006
diff --git a/bundestag.io/admin/.env.example b/bundestag.io/admin/.env.example
@@ -7,4 +7,5 @@ AI_SERVER_URL_CODEGEN=http://localhost:4003
 AI_ACCESS_TOKEN=EMPTY
 AI_SIMULATION=true
 NON_NAMED_VOTES_AI_SERVER_URL=http://localhost:3005
-NON_NAMED_VOTES_AI_SECRET=CHANGE_ME
+NON_NAMED_VOTES_AI_SECRET=CHANGE_ME
+PROCEDURES_SERVER_URL=http://localhost:3006
diff --git a/bundestag.io/admin/manifests/deployment.yaml b/bundestag.io/admin/manifests/deployment.yaml
@@ -41,6 +41,8 @@ spec:
               value: 'http://non-named-votes-ai'
             - name: NON_NAMED_VOTES_AI_SECRET
               value: ${var.NON_NAMED_VOTES_AI_SECRET}
+            - name: PROCEDURES_SERVER_URL
+              value: 'http://procedures'
           ports:
             - containerPort: 4003
               name: http

diff --git a/bundestag.io/admin/src/app/list/past/page.tsx b/bundestag.io/admin/src/app/list/past/page.tsx
@@ -1,3 +1,4 @@
+import { config } from '@/lib/config';
 import Entry from '../_components/entry';
 import { IProcedure } from '@democracy-deutschland/bundestagio-common';
 
@@ -24,7 +25,7 @@ export default async function Page() {
 }
 
 async function getData(): Promise<IProcedure[]> {
-  const res = await fetch('http://procedures/procedures/list/past', {
+  const res = await fetch(`${config.PROCEDURES_SERVER_URL}/procedures/list/past`, {
     headers: {
       'Cache-Control': 'no-cache',
       cache: 'no-store',

diff --git a/bundestag.io/admin/src/app/list/upcoming/page.tsx b/bundestag.io/admin/src/app/list/upcoming/page.tsx
@@ -1,3 +1,4 @@
+import { config } from '@/lib/config';
 import Entry from '../_components/entry';
 import { IProcedure } from '@democracy-deutschland/bundestagio-common';
 
@@ -24,7 +25,7 @@ export default async function Page() {
 }
 
 async function getData(): Promise<IProcedure[]> {
-  const res = await fetch('http://procedures/procedures/list/upcoming', {
+  const res = await fetch(`${config.PROCEDURES_SERVER_URL}/procedures/list/upcoming`, {
     headers: {
       'Cache-Control': 'no-cache',
       cache: 'no-store',

diff --git a/bundestag.io/admin/src/lib/config.ts b/bundestag.io/admin/src/lib/config.ts
@@ -2,6 +2,7 @@ import { log } from './logger';
 
 const errors: string[] = [];
 const AI_SIMULATION = process.env.AI_SIMULATION === 'true';
+const PROCEDURES_SERVER_URL = process.env.PROCEDURES_SERVER_URL ?? 'http://procedures';
 
 if (!process.env.BUNDESTAGIO_SERVER_URL) {
   errors.push('Please define the BUNDESTAGIO_SERVER_URL environment variable inside .env.local');
@@ -27,4 +28,5 @@ export const config = {
   AI_SERVER_URL: process.env.AI_SERVER_URL,
   AI_ACCESS_TOKEN: process.env.AI_ACCESS_TOKEN,
   AI_SIMULATION: AI_SIMULATION,
+  PROCEDURES_SERVER_URL: PROCEDURES_SERVER_URL,
 };