From 98b53c6509bee70afa98b4d0f6f05ab445415614 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Fri, 10 Jun 2022 15:24:32 +0200 Subject: [PATCH] chg staging type to string --- src/main/cljc/dda/c4k_gitea/core.cljc | 2 +- src/main/cljc/dda/c4k_gitea/gitea.cljc | 2 +- src/test/cljc/dda/c4k_gitea/gitea_test.cljc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/cljc/dda/c4k_gitea/core.cljc b/src/main/cljc/dda/c4k_gitea/core.cljc index 2c9890b..a0dc2d3 100644 --- a/src/main/cljc/dda/c4k_gitea/core.cljc +++ b/src/main/cljc/dda/c4k_gitea/core.cljc @@ -6,7 +6,7 @@ [dda.c4k-common.postgres :as postgres] [dda.c4k-gitea.gitea :as gitea])) -(def config-defaults {:issuer :staging}) +(def config-defaults {:issuer "staging"}) (def config? (s/keys :req-un [::gitea/fqdn] :opt-un [::gitea/issuer])) diff --git a/src/main/cljc/dda/c4k_gitea/gitea.cljc b/src/main/cljc/dda/c4k_gitea/gitea.cljc index 2faad60..56b432a 100644 --- a/src/main/cljc/dda/c4k_gitea/gitea.cljc +++ b/src/main/cljc/dda/c4k_gitea/gitea.cljc @@ -34,7 +34,7 @@ (defn generate-ingress [config] (let [{:keys [fqdn issuer] - :or {issuer :staging}} config + :or {issuer "staging"}} config letsencrypt-issuer (name issuer)] (-> (yaml/load-as-edn "gitea/ingress.yaml") diff --git a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc b/src/test/cljc/dda/c4k_gitea/gitea_test.cljc index 6951360..f35565d 100644 --- a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc +++ b/src/test/cljc/dda/c4k_gitea/gitea_test.cljc @@ -46,7 +46,7 @@ :persistentVolumeClaim {:claimName "gitea-root-pvc"}} {:name "gitea-data-volume", :persistentVolumeClaim {:claimName "gitea-data-pvc"}}]}}}} - (cut/generate-deployment {:fqdn "test.com" :issuer :staging :postgres-db-user "pg-user" :postgres-db-password "pg-pw"})))) + (cut/generate-deployment {:fqdn "test.com" :issuer "staging" :postgres-db-user "pg-user" :postgres-db-password "pg-pw"})))) (deftest should-generate-ingress @@ -68,4 +68,4 @@ :path "/", :backend {:service {:name "gitea-service", :port {:number 3000}}}}]}}]}} - (cut/generate-ingress {:fqdn "test.com" :issuer :staging})))) + (cut/generate-ingress {:fqdn "test.com" :issuer "staging"}))))