diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc index 91178d9..9003e59 100644 --- a/src/main/cljc/dda/c4k_website/website.cljc +++ b/src/main/cljc/dda/c4k_website/website.cljc @@ -51,11 +51,6 @@ (s/def ::websiteauths (s/coll-of websiteauth?)) -(def config? (s/keys :req-un [::websiteconfigs] - :opt-un [::issuer ::volume-size])) - -(def auth? (s/keys :req-un [::websiteauths])) - (defn-spec get-hash-from-sha256sum-output string? [sha256sum-output string?] (if (nil? sha256sum-output) diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc index 250740e..8f19da8 100644 --- a/src/test/cljc/dda/c4k_website/website_test.cljc +++ b/src/test/cljc/dda/c4k_website/website_test.cljc @@ -4,7 +4,7 @@ :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) [clojure.spec.test.alpha :as st] [dda.c4k-common.test-helper :as th] - [dda.c4k-common.base64 :as b64] + [dda.c4k-common.base64 :as b64] [dda.c4k-website.website :as cut] [clojure.spec.alpha :as s])) @@ -18,29 +18,6 @@ (st/instrument `cut/generate-website-build-cron) (st/instrument `cut/generate-website-build-secret) -(deftest should-be-valid-website-auth-spec - (is (true? (s/valid? cut/auth? {:websiteauths - [{:unique-name "test.io" - :username "someuser" - :authtoken "abedjgbasdodj"} - {:unique-name "example.io" - :username "someuser" - :authtoken "abedjgbasdodj"}]})))) - -(deftest should-be-valid-website-conf-spec - (is (true? (s/valid? cut/config? {:issuer "staging" - :websiteconfigs - [{:unique-name "test.io" ; - :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"] - :gitea-host "gitlab.de" - :gitea-repo "repo" - :branchname "main"} - {:unique-name "example.io" - :fqdns ["example.org", "www.example.com"] - :gitea-host "finegitehost.net" - :gitea-repo "repo" - :branchname "main"}]})))) - (deftest should-generate-nginx-configmap-website (is (= "server {\n listen 80 default_server;\n listen [::]:80 default_server;\n server_name test.de www.test.de test-it.de www.test-it.de;\n add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload'; \n add_header X-Frame-Options \"SAMEORIGIN\";\n add_header X-Content-Type-Options nosniff;\n add_header Referrer-Policy \"strict-origin\";\n # add_header Permissions-Policy \"permissions here\";\n root /var/www/html/website/;\n index index.html;\n location / {\n try_files $uri $uri/ /index.html =404;\n }\n}\n" (:website.conf (:data (cut/generate-nginx-configmap {:unique-name "test.io",