Compare commits

..

No commits in common. "e6e63051aefad2d08b21965dcaf89998cb5b219d" and "73f98a768fd3417b99eb729c5a7c34af5d321e76" have entirely different histories.

5 changed files with 75 additions and 90 deletions

View file

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

View file

@ -1,10 +1,10 @@
(ns dda.c4k-forgejo.backup (ns dda.c4k-forgejo.backup
(:require (:require
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
#?(:cljs [shadow.resource :as rc])
[dda.c4k-common.yaml :as yaml] [dda.c4k-common.yaml :as yaml]
[dda.c4k-common.base64 :as b64] [dda.c4k-common.base64 :as b64]
[dda.c4k-common.common :as cm] [dda.c4k-common.common :as cm]))
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
(s/def ::aws-access-key-id cm/bash-env-string?) (s/def ::aws-access-key-id cm/bash-env-string?)
(s/def ::aws-secret-access-key cm/bash-env-string?) (s/def ::aws-secret-access-key cm/bash-env-string?)
@ -13,7 +13,12 @@
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :backup [resource-name] (defmethod yaml/load-resource :backup [resource-name]
(get (inline-resources "backup") resource-name))) (case resource-name
"backup/config.yaml" (rc/inline "backup/config.yaml")
"backup/cron.yaml" (rc/inline "backup/cron.yaml")
"backup/secret.yaml" (rc/inline "backup/secret.yaml")
"backup/backup-restore-deployment.yaml" (rc/inline "backup/backup-restore-deployment.yaml")
(throw (js/Error. "Undefined Resource!")))))
(defn generate-config [my-conf] (defn generate-config [my-conf]
(let [{:keys [restic-repository]} my-conf] (let [{:keys [restic-repository]} my-conf]

View file

@ -2,15 +2,17 @@
(:require (:require
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[clojure.string :as st] [clojure.string :as st]
#?(:cljs [shadow.resource :as rc])
#?(:clj [orchestra.core :refer [defn-spec]] #?(:clj [orchestra.core :refer [defn-spec]]
:cljs [orchestra.core :refer-macros [defn-spec]]) :cljs [orchestra.core :refer-macros [defn-spec]])
#?(:clj [clojure.edn :as edn]
:cljs [cljs.reader :as edn])
[dda.c4k-common.yaml :as yaml] [dda.c4k-common.yaml :as yaml]
[dda.c4k-common.common :as cm] [dda.c4k-common.common :as cm]
[dda.c4k-common.ingress :as ing] [dda.c4k-common.ingress :as ing]
[dda.c4k-common.base64 :as b64] [dda.c4k-common.base64 :as b64]
[dda.c4k-common.predicate :as pred] [dda.c4k-common.predicate :as pred]
[dda.c4k-common.postgres :as postgres] [dda.c4k-common.postgres :as postgres]))
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
(defn domain-list? (defn domain-list?
[input] [input]
@ -66,7 +68,14 @@
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :forgejo [resource-name] (defmethod yaml/load-resource :forgejo [resource-name]
(get (inline-resources "forgejo") resource-name))) (case resource-name
"forgejo/appini-env-configmap.yaml" (rc/inline "forgejo/appini-env-configmap.yaml")
"forgejo/deployment.yaml" (rc/inline "forgejo/deployment.yaml")
"forgejo/secrets.yaml" (rc/inline "forgejo/secrets.yaml")
"forgejo/service.yaml" (rc/inline "forgejo/service.yaml")
"forgejo/service-ssh.yaml" (rc/inline "forgejo/service-ssh.yaml")
"forgejo/datavolume.yaml" (rc/inline "forgejo/datavolume.yaml")
(throw (js/Error. "Undefined Resource!")))))
(defn generate-appini-env (defn generate-appini-env
[config] [config]

View file

@ -1,30 +0,0 @@
(ns dda.c4k-forgejo.backup-test
(:require
#?(:clj [clojure.test :refer [deftest is are testing run-tests]]
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
[clojure.spec.test.alpha :as st]
[dda.c4k-forgejo.backup :as cut]))
(st/instrument `cut/generate-config)
(deftest should-generate-backup-config
(testing "federated"
(is (= {:apiVersion "v1",
:kind "ConfigMap",
:metadata
{:name "backup-config",
:labels
#:app.kubernetes.io{:name "backup", :part-of "forgejo"}},
:data {:restic-repository "s3:s3.amazonaws.com/backup/federated-repo"}}
(cut/generate-config
{:restic-repository "s3:s3.amazonaws.com/backup/federated-repo"}))))
(testing "non-federated"
(is (= {:apiVersion "v1",
:kind "ConfigMap",
:metadata
{:name "backup-config",
:labels
#:app.kubernetes.io{:name "backup", :part-of "forgejo"}},
:data {:restic-repository "s3:s3.amazonaws.com/backup/repo"}}
(cut/generate-config
{:restic-repository "s3:s3.amazonaws.com/backup/repo"})))))

View file

@ -51,61 +51,62 @@
:service-domain-whitelist "test.com,test.net" :service-domain-whitelist "test.com,test.net"
:service-noreply-address "noreply@test.com"}))))) :service-noreply-address "noreply@test.com"})))))
(deftest should-generate-deployment (deftest should-generate-non-federated-deployment
(testing "non-federated" (is (= {:apiVersion "apps/v1",
(is (= {:apiVersion "apps/v1", :kind "Deployment",
:kind "Deployment", :metadata {:name "forgejo", :namespace "default", :labels {:app "forgejo"}},
:metadata {:name "forgejo", :namespace "default", :labels {:app "forgejo"}}, :spec
{:replicas 1,
:selector {:matchLabels {:app "forgejo"}},
:template
{:metadata {:name "forgejo", :labels {:app "forgejo"}},
:spec :spec
{:replicas 1, {:containers
:selector {:matchLabels {:app "forgejo"}}, [{:name "forgejo",
:template :image "codeberg.org/forgejo/forgejo:1.19",
{:metadata {:name "forgejo", :labels {:app "forgejo"}}, :imagePullPolicy "IfNotPresent",
:spec :envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}],
{:containers :volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}],
[{:name "forgejo", :ports [{:containerPort 22, :name "git-ssh"} {:containerPort 3000, :name "forgejo"}]}],
:image "codeberg.org/forgejo/forgejo:1.19", :volumes [{:name "forgejo-data-volume", :persistentVolumeClaim {:claimName "forgejo-data-pvc"}}]}}}}
:imagePullPolicy "IfNotPresent", (cut/generate-deployment
:envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}], {:default-app-name ""
:volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}], :deploy-federated "false"
:ports [{:containerPort 22, :name "git-ssh"} {:containerPort 3000, :name "forgejo"}]}], :fqdn "test.de"
:volumes [{:name "forgejo-data-volume", :persistentVolumeClaim {:claimName "forgejo-data-pvc"}}]}}}} :mailer-from ""
(cut/generate-deployment :mailer-host "m.t.de"
{:default-app-name "" :mailer-port "123"
:deploy-federated "false" :service-domain-whitelist "adb.de"
:fqdn "test.de" :service-noreply-address ""}
:mailer-from "" ))))
:mailer-host "m.t.de"
:mailer-port "123" (deftest should-generate-federated-deployment
:service-domain-whitelist "adb.de" (is (= {:apiVersion "apps/v1",
:service-noreply-address ""})))) :kind "Deployment",
(testing "federated-deployment" :metadata {:name "forgejo", :namespace "default", :labels {:app "forgejo"}},
(is (= {:apiVersion "apps/v1", :spec
:kind "Deployment", {:replicas 1,
:metadata {:name "forgejo", :namespace "default", :labels {:app "forgejo"}}, :selector {:matchLabels {:app "forgejo"}},
:template
{:metadata {:name "forgejo", :labels {:app "forgejo"}},
:spec :spec
{:replicas 1, {:containers
:selector {:matchLabels {:app "forgejo"}}, [{:name "forgejo",
:template :image "domaindrivenarchitecture/c4k-forgejo-federated:latest",
{:metadata {:name "forgejo", :labels {:app "forgejo"}}, :imagePullPolicy "IfNotPresent",
:spec :envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}],
{:containers :volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}],
[{:name "forgejo", :ports [{:containerPort 22, :name "git-ssh"} {:containerPort 3000, :name "forgejo"}]}],
:image "domaindrivenarchitecture/c4k-forgejo-federated:latest", :volumes [{:name "forgejo-data-volume", :persistentVolumeClaim {:claimName "forgejo-data-pvc"}}]}}}}
:imagePullPolicy "IfNotPresent", (cut/generate-deployment
:envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}], {:default-app-name ""
:volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}], :deploy-federated "true"
:ports [{:containerPort 22, :name "git-ssh"} {:containerPort 3000, :name "forgejo"}]}], :fqdn "test.de"
:volumes [{:name "forgejo-data-volume", :persistentVolumeClaim {:claimName "forgejo-data-pvc"}}]}}}} :mailer-from ""
(cut/generate-deployment :mailer-host "m.t.de"
{:default-app-name "" :mailer-port "123"
:deploy-federated "true" :service-domain-whitelist "adb.de"
:fqdn "test.de" :service-noreply-address ""}))))
:mailer-from ""
:mailer-host "m.t.de"
:mailer-port "123"
:service-domain-whitelist "adb.de"
:service-noreply-address ""})))))
(deftest should-generate-secret (deftest should-generate-secret
(is (= {:FORGEJO__database__USER-c1 "", (is (= {:FORGEJO__database__USER-c1 "",