diff --git a/src/main/cljc/dda/c4k_common/postgres.cljc b/src/main/cljc/dda/c4k_common/postgres.cljc index 687b6e1..64f5fde 100644 --- a/src/main/cljc/dda/c4k_common/postgres.cljc +++ b/src/main/cljc/dda/c4k_common/postgres.cljc @@ -34,12 +34,11 @@ :pv-storage-size-gb 10 :pvc-storage-class-name "manual"})) -; REVIEW gec: This breaking change means, every call from outside to generate-config will mean something completely different. -(defn-spec generate-config-configmap map? +(defn-spec generate-configmap map? [& config (s/? pg-config?)] (let [final-config (merge default-config (first config))] - (int/generate-config-configmap final-config))) + (int/generate-configmap final-config))) (defn-spec generate-deployment map? @@ -89,7 +88,7 @@ config)] [(int/generate-secret final-config auth) (int/generate-persistent-volume final-config) - (int/generate-config-configmap final-config) + (int/generate-configmap final-config) (int/generate-pvc final-config) (int/generate-deployment final-config) (int/generate-service final-config)])) @@ -99,7 +98,7 @@ (let [final-config (merge default-config config)] [(int/generate-persistent-volume final-config) - (int/generate-config-configmap final-config) + (int/generate-configmap final-config) (int/generate-pvc final-config) (int/generate-deployment final-config) (int/generate-service final-config)])) diff --git a/src/main/cljc/dda/c4k_common/postgres/postgres_internal.cljc b/src/main/cljc/dda/c4k_common/postgres/postgres_internal.cljc index 48a456b..84dd022 100644 --- a/src/main/cljc/dda/c4k_common/postgres/postgres_internal.cljc +++ b/src/main/cljc/dda/c4k_common/postgres/postgres_internal.cljc @@ -52,7 +52,7 @@ (def postgres-function (s/keys :opt-un [::deserializer ::optional])) -(defn-spec generate-config-configmap map? +(defn-spec generate-configmap map? [config pg-config?] (let [{:keys [postgres-size db-name namespace]} config] (-> @@ -62,7 +62,7 @@ (assoc-in [:data :postgres-db] db-name)))) (defn-spec ^{:deprecated "6.4.1"} generate-config map? - "use generate-config-configmap instead" + "use generate-configmap instead" [config pg-config?] (let [{:keys [postgres-size db-name namespace]} config] (-> diff --git a/src/test/cljc/dda/c4k_common/postgres/postgres_internal_test.cljc b/src/test/cljc/dda/c4k_common/postgres/postgres_internal_test.cljc index 3e37fcc..187a18e 100644 --- a/src/test/cljc/dda/c4k_common/postgres/postgres_internal_test.cljc +++ b/src/test/cljc/dda/c4k_common/postgres/postgres_internal_test.cljc @@ -5,18 +5,18 @@ [clojure.spec.test.alpha :as st] [dda.c4k-common.postgres.postgres-internal :as cut])) -(st/instrument `cut/generate-config-configmap) +(st/instrument `cut/generate-configmap) (st/instrument `cut/generate-deployment) (st/instrument `cut/generate-persistent-volume) (st/instrument `cut/generate-pvc) (st/instrument `cut/generate-secret) (st/instrument `cut/generate-service) -(deftest should-generate-config-configmap +(deftest should-generate-configmap (is (= {:name "postgres-config", :namespace "default" :labels {:app "postgres"}} - (:metadata (cut/generate-config-configmap {:postgres-image "postgres:13" + (:metadata (cut/generate-configmap {:postgres-image "postgres:13" :postgres-size :2gb :db-name "postgres" :postgres-data-volume-path "/var/postgres" @@ -26,7 +26,7 @@ (is (= {:name "postgres-config", :namespace "myapp" :labels {:app "postgres"}} - (:metadata (cut/generate-config-configmap {:postgres-image "postgres:13" + (:metadata (cut/generate-configmap {:postgres-image "postgres:13" :postgres-size :2gb :db-name "postgres" :postgres-data-volume-path "/var/postgres" @@ -36,7 +36,7 @@ (is (= {:postgres-db "postgres" :postgresql.conf "max_connections = 100\nwork_mem = 4MB\nshared_buffers = 512MB\n"} - (:data (cut/generate-config-configmap {:postgres-image "postgres:13" + (:data (cut/generate-configmap {:postgres-image "postgres:13" :postgres-size :2gb :db-name "postgres" :postgres-data-volume-path "/var/postgres" @@ -46,7 +46,7 @@ (is (= {:postgres-db "postgres" :postgresql.conf "max_connections = 700\nwork_mem = 3MB\nshared_buffers = 2048MB\n"} - (:data (cut/generate-config-configmap {:postgres-image "postgres:13" + (:data (cut/generate-configmap {:postgres-image "postgres:13" :postgres-size :8gb :db-name "postgres" :postgres-data-volume-path "/var/postgres" @@ -56,7 +56,7 @@ (is (= {:postgres-db "test" :postgresql.conf "max_connections = 100\nwork_mem = 4MB\nshared_buffers = 512MB\n"} - (:data (cut/generate-config-configmap {:postgres-image "postgres:13" + (:data (cut/generate-configmap {:postgres-image "postgres:13" :postgres-size :2gb :db-name "test" :postgres-data-volume-path "/var/postgres" diff --git a/src/test/cljc/dda/c4k_common/postgres_test.cljc b/src/test/cljc/dda/c4k_common/postgres_test.cljc index a9c958e..4117667 100644 --- a/src/test/cljc/dda/c4k_common/postgres_test.cljc +++ b/src/test/cljc/dda/c4k_common/postgres_test.cljc @@ -5,18 +5,18 @@ [clojure.spec.test.alpha :as st] [dda.c4k-common.postgres :as cut])) -(st/instrument `cut/generate-config-configmap) +(st/instrument `cut/generate-configmap) (st/instrument `cut/generate-persistent-volume) (st/instrument `cut/generate-secret) (st/instrument `cut/generate) (st/instrument `cut/generate-config) (st/instrument `cut/generate-auth) -(deftest should-generate-config-configmap +(deftest should-generate-configmap (is (= {:postgres-db "postgres" :postgresql.conf "max_connections = 100\nwork_mem = 4MB\nshared_buffers = 512MB\n"} - (:data (cut/generate-config-configmap))))) + (:data (cut/generate-configmap))))) (deftest should-generate-persistent-volume (is (= {:kind "PersistentVolume"