From 02074ef37dcb6f5ab9c51fe218bd907d7a2ad764 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 8 Nov 2022 13:44:12 +0100 Subject: [PATCH 1/2] shadow-cljs/resource need literal string --- shadow-cljs.edn | 2 +- src/main/cljc/dda/c4k_website/website.cljc | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 4d22f27..b527e2b 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.1"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.2-SNAPSHOT"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-website.browser/init}} diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc index d829be3..8d3a4e5 100644 --- a/src/main/cljc/dda/c4k_website/website.cljc +++ b/src/main/cljc/dda/c4k_website/website.cljc @@ -96,11 +96,6 @@ "website/website-content-volume.yaml" (rc/inline "website/website-content-volume.yaml") (throw (js/Error. "Undefined Resource!"))))) -; TODO: Review jem 2022/10/26: move this fkt. to a more general place -#?(:cljs - (defmethod yaml/load-as-edn :website [resource-name] - (yaml/from-string (yaml/load-resource resource-name)))) - (defn-spec generate-website-http-ingress pred/map-or-seq? [config flattened-and-reduced-config?] (let [{:keys [unique-name fqdns]} config] From 1f24a6e62c5a1d390621a50ea724f9a383cec928 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 8 Nov 2022 14:50:16 +0100 Subject: [PATCH 2/2] Remove yaml/load-as-edn multimethod * Also update deps --- project.clj | 2 +- shadow-cljs.edn | 2 +- src/main/cljc/dda/c4k_website/ingress_cert.cljc | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/project.clj b/project.clj index bd75532..5739234 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.10.3"] [org.clojure/tools.reader "1.3.6"] - [org.domaindrivenarchitecture/c4k-common-clj "3.0.2-SNAPSHOT"] + [org.domaindrivenarchitecture/c4k-common-clj "3.0.2"] [hickory "0.7.1"]] :target-path "target/%s/" :source-paths ["src/main/cljc" diff --git a/shadow-cljs.edn b/shadow-cljs.edn index b527e2b..ea8dc4c 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.2-SNAPSHOT"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.2"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-website.browser/init}} diff --git a/src/main/cljc/dda/c4k_website/ingress_cert.cljc b/src/main/cljc/dda/c4k_website/ingress_cert.cljc index 33742c6..fadcf9c 100644 --- a/src/main/cljc/dda/c4k_website/ingress_cert.cljc +++ b/src/main/cljc/dda/c4k_website/ingress_cert.cljc @@ -34,11 +34,6 @@ "ingress/https-ingress.yaml" (rc/inline "ingress/https-ingress.yaml") (throw (js/Error. "Undefined Resource!"))))) -; TODO: Review jem 2022/10/26: generalize! -#?(:cljs - (defmethod yaml/load-as-edn :ingress [resource-name] - (yaml/from-string (yaml/load-resource resource-name)))) - (defn-spec generate-host-rule pred/map-or-seq? [service-name ::service-name service-port ::service-port