From ebca7a3454e88cb9ae62d0e9547b5e40ca9b4056 Mon Sep 17 00:00:00 2001
From: Clemens <clemens.geibel@meissa-gmbh.de.de>
Date: Thu, 7 Mar 2024 12:12:37 +0100
Subject: [PATCH] added git host as env var

---
 infrastructure/build/image/resources/functions.sh | 3 +--
 src/main/cljc/dda/c4k_website/core.cljc           | 1 -
 src/main/cljc/dda/c4k_website/website.cljc        | 1 +
 src/main/resources/website/build-configmap.yaml   | 1 +
 src/test/cljc/dda/c4k_website/website_test.cljc   | 3 ++-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/infrastructure/build/image/resources/functions.sh b/infrastructure/build/image/resources/functions.sh
index af2e7f5..8333acb 100644
--- a/infrastructure/build/image/resources/functions.sh
+++ b/infrastructure/build/image/resources/functions.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# TODO provide GITHOST
 function generate-netrc-file() {
-    echo "machine $GITHOST password $AUTHTOKEN" > ~/.netrc
+    echo "machine $GIT_HOST password $AUTHTOKEN" > ~/.netrc
 }
 
 function get-website-data() {    
diff --git a/src/main/cljc/dda/c4k_website/core.cljc b/src/main/cljc/dda/c4k_website/core.cljc
index af5383e..83c63b4 100644
--- a/src/main/cljc/dda/c4k_website/core.cljc
+++ b/src/main/cljc/dda/c4k_website/core.cljc
@@ -78,7 +78,6 @@
     (-> unsorted-auth
         (assoc-in [:websiteauths] sorted-auth))))
 
-; TODO: Replace this with a function that merges defaults into website config
 (defn-spec flatten-and-reduce-config map?
   [config config?]
   (let
diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc
index d1dc3ac..4c61147 100644
--- a/src/main/cljc/dda/c4k_website/website.cljc
+++ b/src/main/cljc/dda/c4k_website/website.cljc
@@ -115,6 +115,7 @@
     (->
      (yaml/load-as-edn "website/build-configmap.yaml")
      (replace-all-matching-prefixes "NAME" name)
+     (cm/replace-all-matching-values-by-new-value "GITHOST" forgejo-host)
      (cm/replace-all-matching-values-by-new-value "REPOURL" (generate-gitrepourl
                                                               forgejo-host
                                                               repo-user
diff --git a/src/main/resources/website/build-configmap.yaml b/src/main/resources/website/build-configmap.yaml
index fce312c..96dbb86 100644
--- a/src/main/resources/website/build-configmap.yaml
+++ b/src/main/resources/website/build-configmap.yaml
@@ -6,5 +6,6 @@ metadata:
   labels:
     app.kubernetes.part-of: NAME-website
 data:
+  GIT_HOST: GITHOST
   GITREPOURL: REPOURL
   GITCOMMITURL: COMMITURL
\ No newline at end of file
diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc
index 21895fc..2ed5fb3 100644
--- a/src/test/cljc/dda/c4k_website/website_test.cljc
+++ b/src/test/cljc/dda/c4k_website/website_test.cljc
@@ -236,7 +236,8 @@
                      :namespace "test-io",
                      :labels {:app.kubernetes.part-of "test-io-website"}},
           :data
-          {:GITREPOURL "https://mygit.de/api/v1/repos/someuser/repo/archive/main.zip"
+          {:GIT_HOST "mygit.de"
+           :GITREPOURL "https://mygit.de/api/v1/repos/someuser/repo/archive/main.zip"
            :GITCOMMITURL "https://mygit.de/api/v1/repos/someuser/repo/git/commits/HEAD"}}
          (cut/generate-build-configmap {:issuer "staging"
                                         :build-cpu-request "500m"