From 20401c20b734a795a1867d9a27ed3df0b41934a7 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Thu, 29 Feb 2024 15:52:46 +0100 Subject: [PATCH] refactore websites -> websiteconfigs --- doc/architecture.md | 2 +- src/main/cljc/dda/c4k_website/core.cljc | 14 +++++++------- .../dda/c4k_website/website/website_internal.cljc | 4 ++-- src/main/cljs/dda/c4k_website/browser.cljs | 12 ++++++------ src/test/cljc/dda/c4k_website/core_test.cljc | 8 ++++---- src/test/resources/website-test/valid-config.yaml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/architecture.md b/doc/architecture.md index d3b551e..ca28e46 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -24,7 +24,7 @@ For the example configuration ```yaml issuer: "staging" -websites: +websiteconfigs: - unique-name: "test.io" fqdns: ["test.de", "test.org", "www.test.de", "www.test.org"] forgejo-host: "codeberg.org" diff --git a/src/main/cljc/dda/c4k_website/core.cljc b/src/main/cljc/dda/c4k_website/core.cljc index dd9a64c..7362f7d 100644 --- a/src/main/cljc/dda/c4k_website/core.cljc +++ b/src/main/cljc/dda/c4k_website/core.cljc @@ -39,10 +39,10 @@ ::build-memory-request ::build-memory-limit])) (def websiteauth? (s/keys :req-un [::unique-name ::username ::authtoken])) -(s/def ::websites (s/coll-of websiteconfig?)) +(s/def ::websiteconfigs (s/coll-of websiteconfig?)) (s/def ::auth (s/coll-of websiteauth?)) -(def config? (s/keys :req-un [::websites] +(def config? (s/keys :req-un [::websiteconfigs] :opt-un [::issuer ::volume-size ::mon-cfg])) @@ -62,9 +62,9 @@ (defn-spec sort-config map? [unsorted-config config?] - (let [sorted-websites (into [] (sort-by :unique-name (unsorted-config :websites)))] + (let [sorted-websiteconfigs (into [] (sort-by :unique-name (unsorted-config :websiteconfigs)))] (-> unsorted-config - (assoc-in [:websites] sorted-websites)))) + (assoc-in [:websiteconfigs] sorted-websiteconfigs)))) (defn-spec sort-auth map? [unsorted-auth auth?] @@ -75,7 +75,7 @@ (defn-spec flatten-and-reduce-config map? [config config?] (let - [first-entry (first (:websites config))] + [first-entry (first (:websiteconfigs config))] (conj first-entry (when (contains? config :issuer) {:issuer (config :issuer)}) @@ -103,11 +103,11 @@ sorted-auth (sort-auth auth) result []] - (if (and (empty? (config :websites)) (empty? (sorted-auth :auth))) + (if (and (empty? (config :websiteconfigs)) (empty? (sorted-auth :auth))) result (recur (-> config - (assoc-in [:websites] (rest (config :websites)))) + (assoc-in [:websiteconfigs] (rest (config :websiteconfigs)))) (-> auth (assoc-in [:auth] (rest (sorted-auth :auth)))) diff --git a/src/main/cljc/dda/c4k_website/website/website_internal.cljc b/src/main/cljc/dda/c4k_website/website/website_internal.cljc index 087a705..6cc3ffe 100644 --- a/src/main/cljc/dda/c4k_website/website/website_internal.cljc +++ b/src/main/cljc/dda/c4k_website/website/website_internal.cljc @@ -46,11 +46,11 @@ (def websiteauth? (s/keys :req-un [::unique-name ::username ::authtoken])) -(s/def ::websites (s/coll-of websiteconfig?)) +(s/def ::websiteconfigs (s/coll-of websiteconfig?)) (s/def ::auth (s/coll-of websiteauth?)) -(def websites? (s/keys :req-un [::websites])) +(def websiteconfigs? (s/keys :req-un [::websiteconfigs])) (def auth? (s/keys :req-un [::auth])) diff --git a/src/main/cljs/dda/c4k_website/browser.cljs b/src/main/cljs/dda/c4k_website/browser.cljs index 159f881..73763ce 100644 --- a/src/main/cljs/dda/c4k_website/browser.cljs +++ b/src/main/cljs/dda/c4k_website/browser.cljs @@ -24,8 +24,8 @@ (br/generate-group "website-data" (br/generate-text-area - "websites" "Contains fqdns, repo infos, an optional sha256sum-output for script execution for each website:" - "{ :websites + "websiteconfigs" "Contains fqdns, repo infos, an optional sha256sum-output for script execution for each website:" + "{ :websiteconfigs [{:unique-name \"test.io\", :fqdns [\"test.de\" \"www.test.de\"], :gitea-host \"githost.de\", @@ -70,12 +70,12 @@ (defn config-from-document [] (let [issuer (br/get-content-from-element "issuer" :optional true) - websites (br/get-content-from-element "websites" :deserializer edn/read-string) + websiteconfigs (br/get-content-from-element "websiteconfigs" :deserializer edn/read-string) mon-cluster-name (br/get-content-from-element "mon-cluster-name" :optional true) mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true) mon-cloud-url (br/get-content-from-element "mon-cloud-url" :optional true)] (merge - {:websites websites} + {:websiteconfigs websiteconfigs} (when (not (st/blank? issuer)) {:issuer issuer}) (when (some? mon-cluster-name) @@ -84,7 +84,7 @@ :grafana-cloud-url mon-cloud-url}})))) (defn validate-all! [] - (br/validate! "websites" website/websites? :deserializer edn/read-string) + (br/validate! "websiteconfigs" website/websiteconfigs? :deserializer edn/read-string) (br/validate! "issuer" ::website/issuer :optional true) (br/validate! "mon-cluster-name" ::mon/cluster-name :optional true) (br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true) @@ -108,7 +108,7 @@ core/config-defaults core/k8s-objects) (br/set-output!))))) - (add-validate-listener "websites") + (add-validate-listener "websiteconfigs") (add-validate-listener "issuer") (add-validate-listener "mon-cluster-name") (add-validate-listener "mon-cluster-stage") diff --git a/src/test/cljc/dda/c4k_website/core_test.cljc b/src/test/cljc/dda/c4k_website/core_test.cljc index 43551e4..ef74984 100644 --- a/src/test/cljc/dda/c4k_website/core_test.cljc +++ b/src/test/cljc/dda/c4k_website/core_test.cljc @@ -26,7 +26,7 @@ (is (s/valid? cut/auth? (yaml/load-as-edn "website-test/valid-auth.yaml")))) (def websites1 - {:websites + {:websiteconfigs [{:unique-name "example.io" :fqdns ["example.org", "www.example.com"] :forgejo-host "finegitehost.net" @@ -39,7 +39,7 @@ :branchname "main"}]}) (def websites2 - {:websites + {:websiteconfigs [{:unique-name "test.io" :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"] :forgejo-host "gitlab.de" @@ -83,7 +83,7 @@ (deftest sorts-config (is (= {:issuer "staging", - :websites + :websiteconfigs [{:unique-name "example.io", :fqdns ["example.org" "www.example.com"], :forgejo-host "finegitehost.net", @@ -98,7 +98,7 @@ :mon-cfg {:grafana-cloud-url "url-for-your-prom-remote-write-endpoint", :cluster-name "jitsi", :cluster-stage "test"}} (cut/sort-config {:issuer "staging", - :websites + :websiteconfigs [{:unique-name "test.io", :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"], :forgejo-host "gitlab.de", diff --git a/src/test/resources/website-test/valid-config.yaml b/src/test/resources/website-test/valid-config.yaml index 0d2c1a4..1b987b4 100644 --- a/src/test/resources/website-test/valid-config.yaml +++ b/src/test/resources/website-test/valid-config.yaml @@ -1,5 +1,5 @@ issuer: "staging" -websites: +websiteconfigs: - unique-name: "test.io" fqdns: ["test.de", "test.org", "www.test.de", "www.test.org"] forgejo-host: "codeberg.org"