Refactor common yaml loading

src/main/cljc/dda/c4k_taiga/backup.cljc

@@ -24,14 +24,14 @@
 (defn generate-config [my-conf]
   (let [{:keys [restic-repository]} my-conf]
     (->
-     (yaml/from-string (yaml/load-resource "backup/config.yaml"))
+     (yaml/load-as-edn "backup/config.yaml")
      (cm/replace-key-value :restic-repository restic-repository))))
 
 (defn generate-cron []
-   (yaml/from-string (yaml/load-resource "backup/cron.yaml")))
+   (yaml/load-as-edn "backup/cron.yaml"))
 
 (defn generate-backup-restore-deployment [my-conf]
-  (let [backup-restore-yaml (yaml/from-string (yaml/load-resource "backup/backup-restore-deployment.yaml"))]
+  (let [backup-restore-yaml (yaml/load-as-edn "backup/backup-restore-deployment.yaml")]
     (if (and (contains? my-conf :local-integration-test) (= true (:local-integration-test my-conf)))
       (cm/replace-named-value backup-restore-yaml "CERTIFICATE_FILE" "/var/run/secrets/localstack-secrets/ca.crt")
       backup-restore-yaml)))
@@ -39,7 +39,7 @@
 (defn generate-secret [my-auth]
   (let [{:keys [aws-access-key-id aws-secret-access-key restic-password]} my-auth]
     (->
-     (yaml/from-string (yaml/load-resource "backup/secret.yaml"))
+     (yaml/load-as-edn "backup/secret.yaml")
      (cm/replace-key-value :aws-access-key-id (b64/encode aws-access-key-id))
      (cm/replace-key-value :aws-secret-access-key (b64/encode aws-secret-access-key))
      (cm/replace-key-value :restic-password (b64/encode restic-password)))))

src/main/cljc/dda/c4k_taiga/taiga.cljc

@@ -112,60 +112,60 @@
       config))))
 
 (defn-spec generate-async-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/async-deployment.yaml")))
+  (yaml/load-as-edn "taiga/async-deployment.yaml"))
 
 (defn-spec generate-async-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/async-service.yaml")))
+  (yaml/load-as-edn "taiga/async-service.yaml"))
 
 (defn-spec generate-async-rabbitmq-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/async-rabbitmq-deployment.yaml")))
+  (yaml/load-as-edn "taiga/async-rabbitmq-deployment.yaml"))
 
 (defn-spec generate-events-rabbitmq-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/events-rabbitmq-service.yaml")))
+  (yaml/load-as-edn "taiga/events-rabbitmq-service.yaml"))
 
 (defn-spec generate-async-rabbitmq-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/async-rabbitmq-service.yaml")))
+  (yaml/load-as-edn "taiga/async-rabbitmq-service.yaml"))
 
 (defn-spec generate-back-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/back-deployment.yaml")))
+  (yaml/load-as-edn "taiga/back-deployment.yaml"))
 
 (defn-spec generate-back-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/back-service.yaml")))
+  (yaml/load-as-edn "taiga/back-service.yaml"))
 
 (defn-spec generate-events-rabbitmq-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/events-rabbitmq-deployment.yaml")))
+  (yaml/load-as-edn "taiga/events-rabbitmq-deployment.yaml"))
 
 (defn-spec generate-events-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/events-deployment.yaml")))
+  (yaml/load-as-edn "taiga/events-deployment.yaml"))
 
 (defn-spec generate-events-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/events-service.yaml")))
+  (yaml/load-as-edn "taiga/events-service.yaml"))
 
 (defn-spec generate-front-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/front-deployment.yaml")))
+  (yaml/load-as-edn "taiga/front-deployment.yaml"))
 
 (defn-spec generate-front-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/front-service.yaml")))
+  (yaml/load-as-edn "taiga/front-service.yaml"))
 
 (defn-spec generate-gateway-configmap cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/gateway-configmap.yaml")))
+  (yaml/load-as-edn "taiga/gateway-configmap.yaml"))
 
 (defn-spec generate-gateway-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/gateway-deployment.yaml")))
+  (yaml/load-as-edn "taiga/gateway-deployment.yaml"))
 
 (defn-spec generate-gateway-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/gateway-service.yaml")))
+  (yaml/load-as-edn "taiga/gateway-service.yaml"))
 
 (defn-spec generate-protected-deployment cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/protected-deployment.yaml")))
+  (yaml/load-as-edn "taiga/protected-deployment.yaml"))
 
 (defn-spec generate-protected-service cp/map-or-seq? []
-  (yaml/from-string (yaml/load-resource "taiga/protected-service.yaml")))
+  (yaml/load-as-edn "taiga/protected-service.yaml"))
 
 (defn-spec generate-configmap cp/map-or-seq? 
   [config config?]
   (let [{:keys [fqdn enable-telemetry public-register-enabled]} (merge config-defaults config)]
-    (-> (yaml/load-as-edn "taiga/configmap.yaml")        
+    (-> (yaml/load-as-edn "taiga/configmap.yaml")     
         (cm/replace-key-value :TAIGA_SITES_DOMAIN fqdn)
         (cm/replace-key-value :TAIGA_URL (str "https://" fqdn))
         (cm/replace-key-value :TAIGA_WEBSOCKETS_URL (str "wss://" fqdn))
@@ -176,7 +176,7 @@
   [config config?]
   (let [{:keys [storage-class-name storage-media-size]} (merge config-defaults config)]
     (->
-     (yaml/from-string (yaml/load-resource "taiga/pvc-taiga-media-data.yaml"))
+     (yaml/load-as-edn "taiga/pvc-taiga-media-data.yaml")
      (assoc-in [:spec :storageClassName] storage-class-name)
      (assoc-in [:spec :resources :requests :storage] (str storage-media-size "Gi")))))
 
@@ -184,7 +184,7 @@
   [config config?]
   (let [{:keys [storage-class-name storage-static-size]} (merge config-defaults config)]
     (->
-     (yaml/from-string (yaml/load-resource "taiga/pvc-taiga-static-data.yaml"))
+     (yaml/load-as-edn "taiga/pvc-taiga-static-data.yaml")
      (assoc-in [:spec :storageClassName] storage-class-name)
      (assoc-in [:spec :resources :requests :storage] (str storage-static-size "Gi")))))
 
@@ -195,7 +195,7 @@
                 rabbitmq-user rabbitmq-pw rabbitmq-erlang-cookie
                 django-superuser-username django-superuser-password django-superuser-email]} auth]
     (->
-     (yaml/from-string (yaml/load-resource "taiga/secret.yaml"))
+     (yaml/load-as-edn "taiga/secret.yaml")
      (cm/replace-key-value :TAIGA_SECRET_KEY (b64/encode taiga-secret-key))
      (cm/replace-key-value :EMAIL_HOST_USER (b64/encode mailer-user))
      (cm/replace-key-value :EMAIL_HOST_PASSWORD (b64/encode mailer-pw))
@@ -210,7 +210,7 @@
   [config config?]
   (let [{:keys [storage-class-name storage-async-rabbitmq-size]} (merge config-defaults config)]
     (->
-     (yaml/from-string (yaml/load-resource "taiga/rabbitmq-pvc-async.yaml"))
+     (yaml/load-as-edn "taiga/rabbitmq-pvc-async.yaml")
      (assoc-in [:spec :storageClassName] storage-class-name)
      (assoc-in [:spec :resources :requests :storage] (str storage-async-rabbitmq-size "Gi")))))
 
@@ -218,7 +218,7 @@
   [config config?]
   (let [{:keys [storage-class-name storage-events-rabbitmq-size]} (merge config-defaults config)]
     (-> 
-     (yaml/from-string (yaml/load-resource "taiga/rabbitmq-pvc-events.yaml"))
+     (yaml/load-as-edn "taiga/rabbitmq-pvc-events.yaml")
      (assoc-in [:spec :storageClassName] storage-class-name)
      (assoc-in [:spec :resources :requests :storage] (str storage-events-rabbitmq-size "Gi")))))