From 710092c020c215626fd89d46b43c5071c0e6e7cc Mon Sep 17 00:00:00 2001
From: DavidCroftDKFZ <46788708+DavidCroftDKFZ@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:17:38 +0100
Subject: [PATCH] Autogenerate secrets for feedback-agent

---
 bbmri/modules/eric-compose.yml           | 2 +-
 bbmri/modules/feedback-agent-compose.yml | 6 +++---
 ccp/docker-compose.yml                   | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml
index fbfe118..29e2a5c 100644
--- a/bbmri/modules/eric-compose.yml
+++ b/bbmri/modules/eric-compose.yml
@@ -22,7 +22,7 @@ services:
       BROKER_URL: ${ERIC_BROKER_URL}
       PROXY_ID: ${ERIC_PROXY_ID}
       APP_focus_KEY: ${ERIC_FOCUS_BEAM_SECRET_SHORT}
-      APP_feedback-agent_KEY: App1Secret
+      APP_feedback-agent_KEY: ${FEEDBACK_AGENT_BEAM_SECRET}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ALL_PROXY: http://forward_proxy:3128
       TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
diff --git a/bbmri/modules/feedback-agent-compose.yml b/bbmri/modules/feedback-agent-compose.yml
index 0e30a33..d2dab90 100644
--- a/bbmri/modules/feedback-agent-compose.yml
+++ b/bbmri/modules/feedback-agent-compose.yml
@@ -18,12 +18,12 @@ services:
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://feedback-agent-db:5432/compose-postgres
       - SPRING_DATASOURCE_USERNAME=compose-postgres
-      - SPRING_DATASOURCE_PASSWORD=compose-postgres
+      - SPRING_DATASOURCE_PASSWORD=${FEEDBACK_AGENT_DB_PASSWORD}
       - SPRING_JPA_HIBERNATE_DDL_AUTO=update
       - BEAM_PROXY_URI=http://beam-proxy-eric:8081
       - FEEDBACK_HUB_URL=http://feedback-hub-be:8071
       - BLAZE_BASE_URL=http://blaze:8080/fhir
-      - FEEDBACK_AGENT_SECRET=App1Secret
+      - FEEDBACK_AGENT_SECRET=${FEEDBACK_AGENT_BEAM_SECRET}
       - FEEDBACK_AGENT_BEAM_ID=feedback-agent.${ERIC_PROXY_ID}
       - FEEDBACK_HUB_BEAM_ID=feedback-hub.feedback-central.${ERIC_BROKER_ID}
       - EXPORTER_API_KEY=${EXPORTER_API_KEY}
@@ -46,7 +46,7 @@ services:
     container_name: feedback-agent-db
     environment:
       - POSTGRES_USER=compose-postgres
-      - POSTGRES_PASSWORD=compose-postgres
+      - POSTGRES_PASSWORD=${FEEDBACK_AGENT_DB_PASSWORD}
 
 # This is needed when you run both agent and hub locally in a test
 # environment. Not necessary in production, though it probably won't
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index cae0a48..c4a3b0f 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -32,7 +32,6 @@ services:
       RETRY_COUNT: ${FOCUS_RETRY_COUNT}
       EPSILON: 0.28
     depends_on:
-#      - "beam-proxy"
       - "beam-proxy"
       - "blaze"