From 349eb9dfc52aa56ff637339992ecb4e5e9627f8b Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 20 Jan 2023 13:53:35 +0100 Subject: [PATCH] Use common yaml --- src/main/clj/dda/c4k_keycloak/yaml.clj | 20 --------- src/main/cljc/dda/c4k_keycloak/keycloak.cljc | 2 +- src/main/cljs/dda/c4k_keycloak/yaml.cljs | 44 -------------------- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 src/main/clj/dda/c4k_keycloak/yaml.clj delete mode 100644 src/main/cljs/dda/c4k_keycloak/yaml.cljs diff --git a/src/main/clj/dda/c4k_keycloak/yaml.clj b/src/main/clj/dda/c4k_keycloak/yaml.clj deleted file mode 100644 index c05db95..0000000 --- a/src/main/clj/dda/c4k_keycloak/yaml.clj +++ /dev/null @@ -1,20 +0,0 @@ -(ns dda.c4k-keycloak.yaml - (:require - [clojure.java.io :as io] - [clj-yaml.core :as yaml] - [clojure.walk])) - -(defn cast-lazy-seq-to-vec - [lazy-seq] - (clojure.walk/postwalk #(if (instance? clojure.lang.LazySeq %) - (into [] %) - %) lazy-seq)) - -(defn load-resource [resource-name] - (slurp (io/resource resource-name))) - -(defn from-string [input] - (cast-lazy-seq-to-vec (yaml/parse-string input))) - -(defn to-string [edn] - (yaml/generate-string edn :dumper-options {:flow-style :block})) \ No newline at end of file diff --git a/src/main/cljc/dda/c4k_keycloak/keycloak.cljc b/src/main/cljc/dda/c4k_keycloak/keycloak.cljc index 245d610..939016f 100644 --- a/src/main/cljc/dda/c4k_keycloak/keycloak.cljc +++ b/src/main/cljc/dda/c4k_keycloak/keycloak.cljc @@ -1,7 +1,7 @@ (ns dda.c4k-keycloak.keycloak (:require [clojure.spec.alpha :as s] - [dda.c4k-keycloak.yaml :as yaml] + [dda.c4k-common.yaml :as yaml] [dda.c4k-common.base64 :as b64] [dda.c4k-common.common :as cm])) diff --git a/src/main/cljs/dda/c4k_keycloak/yaml.cljs b/src/main/cljs/dda/c4k_keycloak/yaml.cljs deleted file mode 100644 index a6f68d4..0000000 --- a/src/main/cljs/dda/c4k_keycloak/yaml.cljs +++ /dev/null @@ -1,44 +0,0 @@ -(ns dda.c4k-keycloak.yaml - (:require - ["js-yaml" :as yaml] - [shadow.resource :as rc])) - -(def postgres-config (rc/inline "postgres/config.yaml")) - -(def postgres-secret (rc/inline "postgres/secret.yaml")) - -(def postgres-deployment (rc/inline "postgres/deployment.yaml")) - -(def postgres-service (rc/inline "postgres/service.yaml")) - -(def keycloak-secret (rc/inline "keycloak/secret.yaml")) - -(def keycloak-deployment (rc/inline "keycloak/deployment.yaml")) - -(def keycloak-certificate (rc/inline "keycloak/certificate.yaml")) - -(def keycloak-ingress (rc/inline "keycloak/ingress.yaml")) - -(def keycloak-service (rc/inline "keycloak/service.yaml")) - -(def ingress-test (rc/inline "ingress_test.yaml")) - -(defn load-resource [resource-name] - (case resource-name - "postgres/config.yaml" postgres-config - "postgres/secret.yaml" postgres-secret - "postgres/deployment.yaml" postgres-deployment - "postgres/service.yaml" postgres-service - "keycloak/secret.yaml" keycloak-secret - "keycloak/deployment.yaml" keycloak-deployment - "keycloak/certificate.yaml" keycloak-certificate - "keycloak/ingress.yaml" keycloak-ingress - "keycloak/service.yaml" keycloak-service - "ingress_test.yaml" ingress-test)) - -(defn from-string [input] - (js->clj (yaml/load input) - :keywordize-keys true)) - -(defn to-string [edn] - (yaml/dump (clj->js edn))) \ No newline at end of file