From cb06b081bac5415d086373a9a2e250b5e9f647e9 Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 2 Dec 2022 12:33:45 +0100 Subject: [PATCH] [Skip-CI] Add test for hashfile-vol Add resource file for cljs. Formatting in entrypoint.sh --- .../image/resources/entrypoint.sh | 12 ------------ src/main/cljc/dda/c4k_website/website.cljc | 3 ++- src/test/cljc/dda/c4k_website/website_test.cljc | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/infrastructure/c4k-website-build/image/resources/entrypoint.sh b/infrastructure/c4k-website-build/image/resources/entrypoint.sh index 75cbe2d..aa4dcf5 100755 --- a/infrastructure/c4k-website-build/image/resources/entrypoint.sh +++ b/infrastructure/c4k-website-build/image/resources/entrypoint.sh @@ -14,18 +14,6 @@ source /usr/local/bin/functions.sh filename="website.zip" hashfilename="hashfile" -# download website data -# create empty hashfile -# compare current hash to hashfile - # same? - # do nothing - # not same? - # overwrite hashfile with new hash - # unzip website - # execute scripts (if applicable) - # build website - # move files - echo "Downloading website data" get-website-data $filename diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc index cecf5f7..bb1d09f 100644 --- a/src/main/cljc/dda/c4k_website/website.cljc +++ b/src/main/cljc/dda/c4k_website/website.cljc @@ -139,6 +139,7 @@ "website/website-build-cron.yaml" (rc/inline "website/website-build-cron.yaml") "website/website-build-secret.yaml" (rc/inline "website/website-build-secret.yaml") "website/website-content-volume.yaml" (rc/inline "website/website-content-volume.yaml") + "website/hashfile-volume.yaml" (rc/inline "website/hashfile-volume.yaml") (throw (js/Error. "Undefined Resource!"))))) (defn-spec generate-website-ingress pred/map-or-seq? @@ -187,7 +188,7 @@ (defn-spec generate-hashfile-volume pred/map-or-seq? [config flattened-and-reduced-config?] - (replace-common-data "website/website-content-volume.yaml" config)) + (replace-common-data "website/hashfile-volume.yaml" config)) (defn-spec generate-website-build-cron pred/map-or-seq? [config flattened-and-reduced-config?] diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc index d798877..4989809 100644 --- a/src/test/cljc/dda/c4k_website/website_test.cljc +++ b/src/test/cljc/dda/c4k_website/website_test.cljc @@ -12,6 +12,7 @@ (st/instrument `cut/generate-nginx-deployment) (st/instrument `cut/generate-nginx-service) (st/instrument `cut/generate-website-content-volume) +(st/instrument `cut/generate-hashfile-volume) (st/instrument `cut/generate-website-ingress) (st/instrument `cut/generate-website-certificate) (st/instrument `cut/generate-website-build-cron) @@ -259,3 +260,19 @@ :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"] :username "someuser" :authtoken "abedjgbasdodj"}))))) + +(deftest should-generate-hashfile-volume + (is (= {:apiVersion "v1", + :kind "PersistentVolumeClaim", + :metadata + {:name "test-io-hashfile-volume", + :namespace "default", + :labels {:app "test-io-nginx", :app.kubernetes.part-of "test-io-website"}}, + :spec {:storageClassName "local-path", :accessModes ["ReadWriteOnce"], :resources {:requests {:storage "16Mi"}}}} + (cut/generate-hashfile-volume {:unique-name "test.io", + :gitea-host "gitea.evilorg", + :gitea-repo "none", + :branchname "mablain", + :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"] + :username "someuser" + :authtoken "abedjgbasdodj"}))))