infrastructure/excalidraw-backend/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-jitsi"
 MODULE = "excalidraw-backend"
 PROJECT_ROOT_PATH = "../.."
-version = "1.5.2-SNAPSHOT"
+version = "1.5.1-SNAPSHOT"
 
 
 @init

infrastructure/web/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-jitsi"
 MODULE = "web"
 PROJECT_ROOT_PATH = "../.."
-version = "1.5.2-SNAPSHOT"
+version = "1.5.1-SNAPSHOT"
 
 
 @init

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-jitsi",
     "description": "Generate c4k yaml for a jitsi deployment.",
     "author": "meissa GmbH",
-    "version": "1.5.2-SNAPSHOT",
+    "version": "1.5.1-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
     "repository": "https://www.npmjs.com/package/c4k-jitsi",
     "license": "APACHE2",

project.clj

@@ -1,11 +1,11 @@
-(defproject org.domaindrivenarchitecture/c4k-jitsi "1.5.2-SNAPSHOT"
+(defproject org.domaindrivenarchitecture/c4k-jitsi "1.5.1-SNAPSHOT"
   :description "jitsi c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "1.11.1"]
                  [org.clojure/tools.reader "1.3.6"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.0.3"]
+                 [org.domaindrivenarchitecture/c4k-common-clj "6.0.2"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"

shadow-cljs.edn

@@ -4,7 +4,7 @@
                 "src/test/cljc"
                 "src/test/cljs"
                 "src/test/resources"]
- :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.0.3"]
+ :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.0.2"]
                 [hickory "0.7.1"]]
  :builds {:frontend {:target :browser
                      :modules {:main {:init-fn dda.c4k-jitsi.browser/init}}

src/main/cljc/dda/c4k_jitsi/jitsi.cljc

@@ -29,8 +29,6 @@
        "jitsi/deployment.yaml"           (rc/inline "jitsi/deployment.yaml")
        "jitsi/etherpad-service.yaml"     (rc/inline "jitsi/etherpad-service.yaml")
        "jitsi/jvb-service.yaml"          (rc/inline "jitsi/jvb-service.yaml")
-       "jitsi/excalidraw-backend-service.yaml" (rc/inline "jitsi/excalidraw-backend-service.yaml")
-       "jitsi/excalidraw-deployment.yaml"      (rc/inline "jitsi/excalidraw-deployment.yaml")
        "jitsi/secret.yaml"               (rc/inline "jitsi/secret.yaml")
        "jitsi/web-service.yaml"          (rc/inline "jitsi/web-service.yaml")
        (throw (js/Error. "Undefined Resource!")))))

src/main/cljs/dda/c4k_jitsi/browser.cljs

@@ -43,7 +43,7 @@
 (defn config-from-document []
   (let [issuer (br/get-content-from-element "issuer" :optional true)
         mon-cluster-name (br/get-content-from-element "mon-cluster-name" :optional true)
-        mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true)
+        mon-cluster-stage (br/get-content-from-element "mon-cluster-stage" :optional true :deserializer keyword)
         mon-cloud-url (br/get-content-from-element "mon-cloud-url" :optional true)]
     (merge
      {:fqdn (br/get-content-from-element "fqdn")}     
@@ -59,10 +59,10 @@
   (br/validate! "fqdn" ::jitsi/fqdn)  
   (br/validate! "issuer" ::jitsi/issuer :optional true)
   (br/validate! "mon-cluster-name" ::mon/cluster-name :optional true)
-  (br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true)
+  (br/validate! "mon-cluster-stage" ::mon/cluster-stage :optional true :deserializer keyword)
   (br/validate! "mon-cloud-url" ::mon/grafana-cloud-url :optional true)
   (br/validate! "auth" core/auth? :deserializer edn/read-string)
-  (br/set-form-validated!))
+  (br/set-validated!))
 
 (defn add-validate-listener [name]
   (-> (br/get-element-by-id name)