From f64f4f3ab554c05e0b82e7141497f1eab522b28d Mon Sep 17 00:00:00 2001
From: patdyn <erik.seiert@meissa-gmbh.de>
Date: Wed, 7 Aug 2024 14:48:04 +0200
Subject: [PATCH] Update functions to replace NAMESPACE

---
 src/main/cljc/dda/c4k_keycloak/core.cljc     |  4 ++--
 src/main/cljc/dda/c4k_keycloak/keycloak.cljc | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/cljc/dda/c4k_keycloak/core.cljc b/src/main/cljc/dda/c4k_keycloak/core.cljc
index 2cfcbcf..3e1a02c 100644
--- a/src/main/cljc/dda/c4k_keycloak/core.cljc
+++ b/src/main/cljc/dda/c4k_keycloak/core.cljc
@@ -39,8 +39,8 @@
         (cm/concat-vec
          (ns/generate config)
          (postgres/generate config auth)
-         [(kc/generate-secret auth)
-          (kc/generate-service)
+         [(kc/generate-secret config auth)
+          (kc/generate-service config)
           (kc/generate-deployment config)]
          (kc/generate-ingress config)
          (when (:contains? config :mon-cfg)
diff --git a/src/main/cljc/dda/c4k_keycloak/keycloak.cljc b/src/main/cljc/dda/c4k_keycloak/keycloak.cljc
index 3cf61a0..256ceba 100644
--- a/src/main/cljc/dda/c4k_keycloak/keycloak.cljc
+++ b/src/main/cljc/dda/c4k_keycloak/keycloak.cljc
@@ -37,20 +37,29 @@
     config)))
 
 (defn-spec generate-secret cp/map-or-seq?
-  [auth auth?]
-  (let [{:keys [keycloak-admin-user keycloak-admin-password]} auth]
+  [config config?
+   auth auth?]
+  (let [{:keys [namespace]} config
+        {:keys [keycloak-admin-user keycloak-admin-password]} auth]
     (->
      (yaml/load-as-edn "keycloak/secret.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace)
      (cm/replace-key-value :keycloak-user (b64/encode keycloak-admin-user))
      (cm/replace-key-value :keycloak-password (b64/encode keycloak-admin-password)))))
 
-(defn-spec generate-service cp/map-or-seq? []
-  (yaml/load-as-edn "keycloak/service.yaml"))
+(defn-spec generate-service cp/map-or-seq? 
+  [config config?]
+  (let [{:keys [namespace]} config
+        {:keys [keycloak-admin-user keycloak-admin-password]} auth]
+    (->
+     (yaml/load-as-edn "keycloak/service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
 (defn-spec generate-deployment cp/map-or-seq?
   [config config?]
-  (let [{:keys [fqdn]} config]
+  (let [{:keys [fqdn namespace]} config]
     (-> 
      (yaml/load-as-edn "keycloak/deployment.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace)
      (cm/replace-all-matching-values-by-new-value "FQDN" fqdn))))