Split Config and Auth

src/main/clj/dda/c4k_keycloak/uberjar.clj

@@ -7,10 +7,11 @@
 (set! *warn-on-reflection* true)
 
 (defn -main [& cmd-args]
-  (uberjar/main-common
+  (uberjar/main-cm
    "c4k-keycloak"
    core/config?
    core/auth?
    core/config-defaults
-   core/k8s-objects
+   core/config-objects
+   core/auth-objects
    cmd-args))

src/main/cljc/dda/c4k_keycloak/core.cljc

@@ -30,18 +30,28 @@
                             ::postgres/postgres-db-user ::postgres/postgres-db-password]
                    :opt-un [::mon/mon-auth]))
 
-(defn-spec k8s-objects cp/map-or-seq?
+(defn-spec config-objects cp/map-or-seq?
+  [config config?]
+  (map yaml/to-string
+       (filter
+        #(not (nil? %))
+        (cm/concat-vec
+         (ns/generate config)
+         (postgres/generate-config config)
+         [(kc/generate-service config)
+          (kc/generate-deployment config)]
+         (kc/generate-ingress config)
+         (when (contains? config :mon-cfg)
+           (mon/generate-config))))))
+
+(defn-spec auth-objects cp/map-or-seq?
   [config config?
    auth auth?]
   (map yaml/to-string
        (filter
         #(not (nil? %))
         (cm/concat-vec
-         (ns/generate config)
+         (postgres/generate-auth config auth)
-         (postgres/generate config auth)
+         [(kc/generate-secret config auth)]
-         [(kc/generate-secret config auth)
+         (when (and (contains? auth :mon-auth) (contains? config :mon-cfg))
-          (kc/generate-service config)
+           (mon/generate-auth (:mon-config config) (:mon-auth auth)))))))
-          (kc/generate-deployment config)]
-         (kc/generate-ingress config)
-         (when (:contains? config :mon-cfg)
-           (mon/generate (:mon-cfg config) (:mon-auth auth)))))))