meissa/c4k-website
6
5
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

Merge branch 'yaml-ns-refactoring' into 'main'

Browse source 
Remove yaml/load-as-edn multimethod

See merge request domaindrivenarchitecture/c4k-website!1
This commit is contained in:
Pat Dyn 2022-11-08 13:58:24 +00:00
commit c7a7581732
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -5,7 +5,7 @@
:url "https://www.apache.org/licenses/LICENSE-2.0.html"} :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
:dependencies [[org.clojure/clojure "1.10.3"] :dependencies [[org.clojure/clojure "1.10.3"]
[org.clojure/tools.reader "1.3.6"] [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"]] [hickory "0.7.1"]]
:target-path "target/%s/" :target-path "target/%s/"
:source-paths ["src/main/cljc" :source-paths ["src/main/cljc"

2
shadow-cljs.edn
View file

@ -4,7 +4,7 @@
"src/test/cljc" "src/test/cljc"
"src/test/cljs" "src/test/cljs"
"src/test/resources"] "src/test/resources"]
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.1"] :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.2"]
[hickory "0.7.1"]] [hickory "0.7.1"]]
:builds {:frontend {:target :browser :builds {:frontend {:target :browser
:modules {:main {:init-fn dda.c4k-website.browser/init}} :modules {:main {:init-fn dda.c4k-website.browser/init}}

5
src/main/cljc/dda/c4k_website/ingress_cert.cljc
View file

@ -34,11 +34,6 @@
"ingress/https-ingress.yaml" (rc/inline "ingress/https-ingress.yaml") "ingress/https-ingress.yaml" (rc/inline "ingress/https-ingress.yaml")
(throw (js/Error. "Undefined Resource!"))))) (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? (defn-spec generate-host-rule pred/map-or-seq?
[service-name ::service-name [service-name ::service-name
service-port ::service-port service-port ::service-port

5
src/main/cljc/dda/c4k_website/website.cljc
View file

@ -96,11 +96,6 @@
"website/website-content-volume.yaml" (rc/inline "website/website-content-volume.yaml") "website/website-content-volume.yaml" (rc/inline "website/website-content-volume.yaml")
(throw (js/Error. "Undefined Resource!"))))) (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? (defn-spec generate-website-http-ingress pred/map-or-seq?
[config flattened-and-reduced-config?] [config flattened-and-reduced-config?]
(let [{:keys [unique-name fqdns]} config] (let [{:keys [unique-name fqdns]} config]