From edfa762a39d108ac95c41a4179f8659495bbb2f5 Mon Sep 17 00:00:00 2001
From: erik <erik.seiert@meissa-gmbh.de>
Date: Thu, 14 Jul 2022 12:29:46 +0200
Subject: [PATCH] added specs for generate-secrets

---
 src/main/cljc/dda/c4k_gitea/core.cljc  |  2 +-
 src/main/cljc/dda/c4k_gitea/gitea.cljc | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/cljc/dda/c4k_gitea/core.cljc b/src/main/cljc/dda/c4k_gitea/core.cljc
index ff6596d..b383f4b 100644
--- a/src/main/cljc/dda/c4k_gitea/core.cljc
+++ b/src/main/cljc/dda/c4k_gitea/core.cljc
@@ -26,6 +26,6 @@
                                           :postgres-size :2gb})
            (postgres/generate-service)
            (gitea/generate-appini-env config)
-           (gitea/generate-secrets config)
+           (gitea/generate-secrets (:auth config))
            (gitea/generate-ingress config)
            (gitea/generate-certificate config)]))))
diff --git a/src/main/cljc/dda/c4k_gitea/gitea.cljc b/src/main/cljc/dda/c4k_gitea/gitea.cljc
index 55039c6..22811cc 100644
--- a/src/main/cljc/dda/c4k_gitea/gitea.cljc
+++ b/src/main/cljc/dda/c4k_gitea/gitea.cljc
@@ -12,13 +12,15 @@
 
 (s/def ::fqdn pred/fqdn-string?)
 (s/def ::issuer pred/letsencrypt-issuer?)
+(s/def ::maileruser pred/bash-env-string?)
+(s/def ::mailerpw pred/bash-env-string?)
 
 (def config-defaults {:issuer "staging"})
 
 (def config? (s/keys :req-un [::fqdn]
                      :opt-un [::issuer]))
 
-(def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password]))
+(def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password ::maileruser ::mailerpw]))
 
 #?(:cljs
    (defmethod yaml/load-resource :gitea [resource-name]
@@ -50,12 +52,12 @@
      (cm/replace-all-matching-values-by-new-value "DBPW" postgres-db-password))))
 
 (defn-spec generate-secrets pred/map-or-seq? 
-  [config config?]
-  (let [{:keys [mailer-user mailer-pw]} config]
+  [auth auth?]
+  (let [{:keys [maileruser mailerpw]} auth]
     (->
      (yaml/load-as-edn "gitea/secrets.yaml")
-     (cm/replace-all-matching-values-by-new-value "MAILERUSER" (b64/encode mailer-user))
-     (cm/replace-all-matching-values-by-new-value "MAILERPW" (b64/encode mailer-pw))
+     (cm/replace-all-matching-values-by-new-value "MAILERUSER" (b64/encode maileruser))
+     (cm/replace-all-matching-values-by-new-value "MAILERPW" (b64/encode mailerpw))
      )))
 
 (defn-spec generate-ingress pred/map-or-seq?