diff --git a/project.clj b/project.clj index 8fd5d4d..85329f0 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ (defproject dda/k8s-keycloak "0.1.0-SNAPSHOT" - :description "common utils for dda config" + :description "keycloak k8s-installation package" :url "https://www.domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" :url "https://www.apache.org/licenses/LICENSE-2.0.html"} diff --git a/src/main/clj/dda/k8s_keycloak/uberjar.clj b/src/main/clj/dda/k8s_keycloak/uberjar.clj index 23be64e..8fcb6ec 100644 --- a/src/main/clj/dda/k8s_keycloak/uberjar.clj +++ b/src/main/clj/dda/k8s_keycloak/uberjar.clj @@ -39,8 +39,8 @@ (some #(= "-h" %) options) (println usage) :default - (let [config-str (slurp (:config args)) - auth-str (slurp (:auth args)) + (let [config-str (slurp config) + auth-str (slurp auth) config-edn (edn/read-string config-str) auth-edn (edn/read-string auth-str) config-valid? (s/valid? core/config? config-edn) diff --git a/src/main/cljc/dda/k8s_keycloak/core.cljc b/src/main/cljc/dda/k8s_keycloak/core.cljc index e816f5a..c1c0bf8 100644 --- a/src/main/cljc/dda/k8s_keycloak/core.cljc +++ b/src/main/cljc/dda/k8s_keycloak/core.cljc @@ -4,12 +4,11 @@ [clojure.spec.alpha :as s] #?(:clj [orchestra.core :refer [defn-spec]] :cljs [orchestra.core :refer-macros [defn-spec]]) - [keycloak.core-domain :as cd] [dda.k8s-keycloak.yaml :as yaml])) -(def config? cd/config?) +(def config? any?) -(def auth? (s/keys :req-un [::cd/auth])) +(def auth? any?) (defn generate-config [my-config my-auth] (-> diff --git a/valid-auth.edn b/valid-auth.edn new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/valid-auth.edn @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/valid-config.edn b/valid-config.edn new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/valid-config.edn @@ -0,0 +1 @@ +{} \ No newline at end of file