From 9d99de13eb82ce315c0dcbf3d9e70bbabf6b063d Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 7 Jun 2023 12:15:48 +0200 Subject: [PATCH] Use deploy-federated key with custom pred --- src/main/cljc/dda/c4k_forgejo/forgejo.cljc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc index 0150326..5d411b7 100644 --- a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc +++ b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc @@ -20,9 +20,15 @@ (st/blank? input) (pred/string-of-separated-by? pred/fqdn-string? #"," input))) +(defn boolean-string? + [input] + (and + (string? input) + (boolean? (Boolean/valueOf input)))) + (s/def ::default-app-name string?) -(s/def ::forgejo-image-name string?) (s/def ::fqdn pred/fqdn-string?) +(s/def ::deploy-federated boolean-string?) (s/def ::mailer-from pred/bash-env-string?) (s/def ::mailer-host pred/bash-env-string?) (s/def ::mailer-port pred/bash-env-string?) @@ -35,8 +41,7 @@ (def config-defaults {:issuer "staging"}) -(def config? (s/keys :req-un [::fqdn - ::forgejo-image-name +(def config? (s/keys :req-un [::fqdn ::mailer-from ::mailer-host ::mailer-port