From e7a2b0e577319be0c4949e6d1a9a5666fea8efc9 Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 19 Aug 2022 13:02:07 +0200 Subject: [PATCH] Minor adjustments --- src/main/cljc/dda/c4k_gitea/backup.cljc | 2 -- src/main/cljc/dda/c4k_gitea/gitea.cljc | 4 ++-- src/main/cljs/dda/c4k_gitea/browser.cljs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_gitea/backup.cljc b/src/main/cljc/dda/c4k_gitea/backup.cljc index b5b32f1..fb44fa0 100644 --- a/src/main/cljc/dda/c4k_gitea/backup.cljc +++ b/src/main/cljc/dda/c4k_gitea/backup.cljc @@ -11,8 +11,6 @@ (s/def ::restic-password cm/bash-env-string?) (s/def ::restic-repository cm/bash-env-string?) -(def auth? (s/keys :req-un [::aws-access-key-id ::aws-secret-access-key ::restic-password ::restic-repository])) - #?(:cljs (defmethod yaml/load-resource :backup [resource-name] (case resource-name diff --git a/src/main/cljc/dda/c4k_gitea/gitea.cljc b/src/main/cljc/dda/c4k_gitea/gitea.cljc index 2cf0d62..8b6e8b6 100644 --- a/src/main/cljc/dda/c4k_gitea/gitea.cljc +++ b/src/main/cljc/dda/c4k_gitea/gitea.cljc @@ -93,8 +93,8 @@ (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))))) -(defn-spec generate-ingress pred/map-or-seq? - [config config?] +(defn generate-ingress + [config] (let [{:keys [fqdn issuer]} config] (-> (yaml/load-as-edn "gitea/ingress.yaml") diff --git a/src/main/cljs/dda/c4k_gitea/browser.cljs b/src/main/cljs/dda/c4k_gitea/browser.cljs index 810f80c..ec41aa4 100644 --- a/src/main/cljs/dda/c4k_gitea/browser.cljs +++ b/src/main/cljs/dda/c4k_gitea/browser.cljs @@ -93,7 +93,7 @@ (br/validate! "domain-whitelist" ::gitea/service-domain-whitelist :optional true) (br/validate! "postgres-data-volume-path" ::pgc/postgres-data-volume-path :optional true) (br/validate! "volume-total-storage-size" ::gitea/volume-total-storage-size :deserializer js/parseInt) - (br/validate! "auth" gitea/auth? :deserializer edn/read-string) + (br/validate! "auth" core/auth? :deserializer edn/read-string) (br/set-form-validated!)) (defn add-validate-listener [name]