From 45aefd24e52003a40aa50d9c29aae3d97ec98fce Mon Sep 17 00:00:00 2001
From: Enola Knezevic <115070135+enola-dkfz@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:27:38 +0100
Subject: [PATCH 1/2] renamed exporter API key to EXPORTER_API_KEY (#252)

---
 ccp/modules/exporter-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml
index af4c67b..10ae89f 100644
--- a/ccp/modules/exporter-compose.yml
+++ b/ccp/modules/exporter-compose.yml
@@ -69,4 +69,4 @@ services:
   focus:
     environment:
       EXPORTER_URL: "http://exporter:8092"
-      AUTH_HEADER: "${EXPORTER_API_KEY}"
+      EXPORTER_API_KEY: "${EXPORTER_API_KEY}"

From e3510363ad2a2eb22ad686c4fb2e7cb346e8d2e4 Mon Sep 17 00:00:00 2001
From: patrickskowronekdkfz
 <86347677+patrickskowronekdkfz@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:18:07 +0100
Subject: [PATCH 2/2] fix: remove credentials from git remote, if update fails
 (#253)

Signed-off-by: Patrick Skowronek <patrick.skowronek@dkfz-heidelberg.de>
---
 lib/update-bridgehead.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh
index 44655b1..56afb17 100755
--- a/lib/update-bridgehead.sh
+++ b/lib/update-bridgehead.sh
@@ -58,7 +58,8 @@ for DIR in /etc/bridgehead $(pwd); do
     OUT=$(retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1)
   fi
   if [ $? -ne 0 ]; then
-    report_error log "Unable to update git $DIR: $OUT"
+    OUT_SAN=$(echo $OUT | sed -E 's|://[^:]+:[^@]+@|://credentials@|g')
+    report_error log "Unable to update git $DIR: $OUT_SAN"
   fi
 
   new_git_hash="$(git -C $DIR rev-parse --verify HEAD)"