meissa/c4k-website
6
5
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

feature/improve-start-script #2

Merged
jem merged 10 commits from feature/improve-start-script into main 2024-02-22 12:52:34 +00:00
Conversation 0 Commits 10 Files changed 17 +24 -26
2 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 375f11c0d9 - Show all commits

39
src/test/cljc/dda/c4k_website/core_test.cljc
View file

@ -5,8 +5,7 @@
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) :cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[dda.c4k-common.yaml :as yaml] [dda.c4k-common.yaml :as yaml]
[dda.c4k-website.core :as cut] [dda.c4k-website.core :as cut]))
[clojure.spec.alpha :as s]))
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :website-test [resource-name] (defmethod yaml/load-resource :website-test [resource-name]
@ -23,26 +22,26 @@
{:websites {:websites
[{:unique-name "example.io" [{:unique-name "example.io"
:fqdns ["example.org", "www.example.com"] :fqdns ["example.org", "www.example.com"]
:gitea-host "finegitehost.net" :forgejo-host "finegitehost.net"
:gitea-repo "repo" :forgejo-repo "repo"
:branchname "main"} :branchname "main"}
{:unique-name "test.io" {:unique-name "test.io"
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"] :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"]
:gitea-host "gitlab.de" :forgejo-host "gitlab.de"
:gitea-repo "repo" :forgejo-repo "repo"
:branchname "main"}]}) :branchname "main"}]})
(def websites2 (def websites2
{:websites {:websites
[{:unique-name "test.io" [{:unique-name "test.io"
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"] :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"]
:gitea-host "gitlab.de" :forgejo-host "gitlab.de"
:gitea-repo "repo" :forgejo-repo "repo"
:branchname "main"} :branchname "main"}
{:unique-name "example.io" {:unique-name "example.io"
:fqdns ["example.org", "www.example.com"] :fqdns ["example.org", "www.example.com"]
:gitea-host "finegitehost.net" :forgejo-host "finegitehost.net"
:gitea-repo "repo" :forgejo-repo "repo"
:branchname "main"}]}) :branchname "main"}]})
(def auth1 (def auth1
@ -66,8 +65,8 @@
(def flattened-and-reduced-config (def flattened-and-reduced-config
{:unique-name "example.io", {:unique-name "example.io",
:fqdns ["example.org" "www.example.com"], :fqdns ["example.org" "www.example.com"],
:gitea-host "finegitehost.net", :forgejo-host "finegitehost.net",
:gitea-repo "repo", :forgejo-repo "repo",
:branchname "main"}) :branchname "main"})
(def flattened-and-reduced-auth (def flattened-and-reduced-auth
@ -80,13 +79,13 @@
:websites :websites
[{:unique-name "example.io", [{:unique-name "example.io",
:fqdns ["example.org" "www.example.com"], :fqdns ["example.org" "www.example.com"],
:gitea-host "finegitehost.net", :forgejo-host "finegitehost.net",
:gitea-repo "repo", :forgejo-repo "repo",
:branchname "main"}, :branchname "main"},
{:unique-name "test.io", {:unique-name "test.io",
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"], :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
:gitea-host "gitlab.de", :forgejo-host "gitlab.de",
:gitea-repo "repo", :forgejo-repo "repo",
:branchname "main", :branchname "main",
:sha256sum-output "123456789ab123cd345de script-file-name.sh"}], :sha256sum-output "123456789ab123cd345de script-file-name.sh"}],
:mon-cfg {:grafana-cloud-url "url-for-your-prom-remote-write-endpoint", :cluster-name "jitsi", :cluster-stage "test"}} :mon-cfg {:grafana-cloud-url "url-for-your-prom-remote-write-endpoint", :cluster-name "jitsi", :cluster-stage "test"}}
@ -95,14 +94,14 @@
:websites :websites
[{:unique-name "test.io", [{:unique-name "test.io",
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"], :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
:gitea-host "gitlab.de", :forgejo-host "gitlab.de",
:gitea-repo "repo", :forgejo-repo "repo",
:branchname "main", :branchname "main",
:sha256sum-output "123456789ab123cd345de script-file-name.sh"} :sha256sum-output "123456789ab123cd345de script-file-name.sh"}
{:unique-name "example.io", {:unique-name "example.io",
:fqdns ["example.org" "www.example.com"], :fqdns ["example.org" "www.example.com"],
:gitea-host "finegitehost.net", :forgejo-host "finegitehost.net",
:gitea-repo "repo", :forgejo-repo "repo",
:branchname "main"}], :branchname "main"}],
:mon-cfg {:grafana-cloud-url "url-for-your-prom-remote-write-endpoint", :cluster-name "jitsi", :cluster-stage "test"}})))) :mon-cfg {:grafana-cloud-url "url-for-your-prom-remote-write-endpoint", :cluster-name "jitsi", :cluster-stage "test"}}))))

11
src/test/resources/website-test/valid-config.yaml
View file

@ -2,16 +2,15 @@ issuer: "staging"
websites: websites:
- unique-name: "test.io" - unique-name: "test.io"
fqdns: ["test.de", "test.org", "www.test.de", "www.test.org"] fqdns: ["test.de", "test.org", "www.test.de", "www.test.org"]
gitea-host: "gitlab.de" forgejo-host: "codeberg.org"
gitea-repo: "repo" forgejo-repo: "repo"
branchname: "main" branchname: "main"
sha256sum-output: "123456789ab123cd345de script-file-name.sh"
- unique-name: "example.io" - unique-name: "example.io"
fqdns: ["example.org", "www.example.com"] fqdns: ["example.org", "www.example.com"]
gitea-host: "finegitehost.net" forgejo-host: "fineForgejoHost.net"
gitea-repo: "repo" forgejo-repo: "repo"
branchname: "main" branchname: "main"
mon-cfg: mon-cfg:
grafana-cloud-url: "url-for-your-prom-remote-write-endpoint" grafana-cloud-url: "url-for-your-prom-remote-write-endpoint"
cluster-name: "jitsi" cluster-name: "website"
cluster-stage: "test" cluster-stage: "test"