me/c4k-forgejo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update spec for browser

Browse source
This commit is contained in:
bom 2022-07-22 12:00:55 +02:00
parent 6e0646ab6c
commit 16e096af1a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/cljc/dda/c4k_gitea/gitea.cljc
View file

@ -2,9 +2,12 @@
(:require (:require
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[clojure.string :as str] [clojure.string :as str]
[clojure.core :as c]
#?(:cljs [shadow.resource :as rc]) #?(: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.base64 :as b64] [dda.c4k-common.base64 :as b64]
@ -19,10 +22,10 @@
(and (= (count split-string) 2) (and (= (count split-string) 2)
(pred/fqdn-string? (first split-string)) (pred/fqdn-string? (first split-string))
; TODO: Move this to pred/port-number? ; TODO: Move this to pred/port-number?
(let [snd (second split-string)] (let [snd (edn/read-string (second split-string))]
(and (integer? snd) (and (integer? snd)
(> 0 snd) (> snd 0)
(<= 65535 snd)))))) (<= snd 65535))))))
;TODO: Maybe move to pred/comma-separated-fqdn-list? ;TODO: Maybe move to pred/comma-separated-fqdn-list?
(s/def ::service-domain-whitelist #(every? true? (map pred/fqdn-string? (str/split % #",")))) (s/def ::service-domain-whitelist #(every? true? (map pred/fqdn-string? (str/split % #","))))
(s/def ::service-noreply-address pred/fqdn-string?) (s/def ::service-noreply-address pred/fqdn-string?)
@ -40,7 +43,6 @@
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :gitea [resource-name] (defmethod yaml/load-resource :gitea [resource-name]
(case resource-name (case resource-name
"gitea/appini-configmap.yaml" (rc/inline "gitea/appini-configmap.yaml")
"gitea/appini-env-configmap.yaml" (rc/inline "gitea/appini-env-configmap.yaml") "gitea/appini-env-configmap.yaml" (rc/inline "gitea/appini-env-configmap.yaml")
"gitea/deployment.yaml" (rc/inline "gitea/deployment.yaml") "gitea/deployment.yaml" (rc/inline "gitea/deployment.yaml")
"gitea/certificate.yaml" (rc/inline "gitea/certificate.yaml") "gitea/certificate.yaml" (rc/inline "gitea/certificate.yaml")