From 90acdc034e87627637df230ed58d65506a6f8cbd Mon Sep 17 00:00:00 2001
From: jerger <michael.jerger@meissa-gmbh.de>
Date: Sat, 21 May 2022 10:58:54 +0200
Subject: [PATCH] fix compile

---
 shadow-cljs.edn                            |  2 +-
 src/main/clj/dda/c4k_nextcloud/uberjar.clj | 13 ++++---------
 src/main/cljc/dda/c4k_nextcloud/core.cljc  |  3 +++
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 4860c84..e7487f0 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -4,7 +4,7 @@
                 "src/test/cljc"
                 "src/test/cljs"
                 "src/test/resources"]
- :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "1.0.0"]
+ :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "2.0.3"]
                 [hickory "0.7.1"]]
  :builds {:frontend {:target :browser
                      :modules {:main {:init-fn dda.c4k-nextcloud.browser/init}}
diff --git a/src/main/clj/dda/c4k_nextcloud/uberjar.clj b/src/main/clj/dda/c4k_nextcloud/uberjar.clj
index 97b9321..865b92c 100644
--- a/src/main/clj/dda/c4k_nextcloud/uberjar.clj
+++ b/src/main/clj/dda/c4k_nextcloud/uberjar.clj
@@ -21,11 +21,6 @@
                          :args (s/?
                                 (s/cat :config ::filename
                                        :auth ::filename))))
-
-(defn expound-config
-  [config]
-  (expound/expound ::nextcloud/config config))
-
 (defn invalid-args-msg 
   [spec args]
   (s/explain spec args)
@@ -47,14 +42,14 @@
                   auth-parse-fn (if (yaml/is-yaml? auth) yaml/from-string edn/read-string)
                   parsed-config (config-parse-fn config-str)
                   parsed-auth (auth-parse-fn auth-str)
-                  config-valid? (s/valid? nextcloud/config? parsed-config)
-                  auth-valid? (s/valid? core/auth? parsed-auth)]
+                  config-valid? (s/valid? ::core/config parsed-config)
+                  auth-valid? (s/valid? ::core/auth parsed-auth)]
               (if (and config-valid? auth-valid?)
                 (println (core/generate parsed-config parsed-auth))
                 (do
                   (when (not config-valid?) 
                     (println 
-                     (expound/expound-str nextcloud/config? parsed-config {:print-specs? false})))
+                     (expound/expound-str ::core/config parsed-config {:print-specs? false})))
                   (when (not auth-valid?) 
                     (println 
-                     (expound/expound-str core/auth? parsed-auth {:print-specs? false})))))))))))
+                     (expound/expound-str ::core/auth parsed-auth {:print-specs? false})))))))))))
diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc
index 46f1807..8cd5205 100644
--- a/src/main/cljc/dda/c4k_nextcloud/core.cljc
+++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc
@@ -24,6 +24,9 @@
                             ::aws-access-key-id ::aws-secret-access-key
                             ::restic-password]))
 
+(s/def ::config config?)
+(s/def ::auth auth?)
+
 (defn-spec k8s-objects any?
   [config (s/merge config? auth?)]
   (let [nextcloud-default-storage-config {:pvc-storage-class-name default-storage-class