From 13c5ac14c9818cadbc518962d3e2b373d26ae3cd Mon Sep 17 00:00:00 2001
From: Michael Jerger <michael.jerger@meissa-gmbh.de>
Date: Fri, 14 Feb 2025 13:49:17 +0100
Subject: [PATCH] fix ns for secrets
---
src/main/cljc/dda/c4k_jitsi/core.cljc | 6 +++---
src/main/cljc/dda/c4k_jitsi/jitsi.cljc | 6 ++++--
src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc | 2 ++
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/cljc/dda/c4k_jitsi/core.cljc b/src/main/cljc/dda/c4k_jitsi/core.cljc
index 76291a3..8f44e88 100644
--- a/src/main/cljc/dda/c4k_jitsi/core.cljc
+++ b/src/main/cljc/dda/c4k_jitsi/core.cljc
@@ -52,12 +52,12 @@
(defn-spec auth-objects cp/map-or-seq?
[config config?
auth auth?]
+ (let [resolved-config (merge config-defaults config)]
(map yaml/to-string
(filter
#(not (nil? %))
(cm/concat-vec
- (jitsi/prosody-auth auth)
+ (jitsi/prosody-auth config auth)
;[(jitsi/generate-secret-jitsi config auth)]
(when (:contains? config :mon-cfg)
- (mon/generate-auth (:mon-cfg config) (:mon-auth auth)))))))
-
+ (mon/generate-auth (:mon-cfg config) (:mon-auth auth))))))))
diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
index 2b58835..449a498 100644
--- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
+++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
@@ -159,8 +159,10 @@
(load-and-adjust-namespace "jitsi/prosody-config-test-deployment.yaml" namespace)]))
(defn-spec prosody-auth cp/map-or-seq?
- [auth auth?]
- (let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
+ [config config?
+ auth auth?]
+ (let [{:keys [namespace]} config
+ {:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
[(load-and-adjust-namespace "jitsi/prosody-auth-secret.yaml" namespace)
(load-and-adjust-namespace "jitsi/prosody-auth-jibri-secret.yaml" namespace)
(->
diff --git a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
index 9025a57..2933d5e 100644
--- a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
+++ b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
@@ -340,6 +340,8 @@
:namespace "jitsi"}))))
(is (= 5
(count (cut/prosody-auth
+ {:fqdn "xy.xy.xy"
+ :namespace "jitsi"}
{:jvb-auth-password "jvb-auth"
:jicofo-auth-password "jicofo-auth"
:jicofo-component-secret "jicofo-comp"})))))
\ No newline at end of file