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

[Skip-CI, WIP] Refactor middleware generation

Browse source
This commit is contained in:
erik 2024-01-19 10:18:02 +01:00
parent 62fb2a37a0
commit 38183f7bf1
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/cljc/dda/c4k_forgejo/forgejo.cljc
View file

@ -42,8 +42,8 @@
(s/def ::mailer-pw pred/bash-env-string?) (s/def ::mailer-pw pred/bash-env-string?)
(s/def ::issuer pred/letsencrypt-issuer?) (s/def ::issuer pred/letsencrypt-issuer?)
(s/def ::volume-total-storage-size (partial pred/int-gt-n? 5)) (s/def ::volume-total-storage-size (partial pred/int-gt-n? 5))
(s/def ::average int?) (s/def ::max-rate int?)
(s/def ::burst int?) (s/def ::max-concurrent-requests int?)
(def config? (s/keys :req-un [::fqdn (def config? (s/keys :req-un [::fqdn
::mailer-from ::mailer-from
@ -53,9 +53,10 @@
:opt-un [::issuer :opt-un [::issuer
::deploy-federated ::deploy-federated
::default-app-name ::default-app-name
::service-domain-whitelist ::service-domain-whitelist]))
::average
::burst])) (def rate-limit-config? (s/keys :req-un [::max-rate
::max-concurrent-requests]))
(def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password ::mailer-user ::mailer-pw])) (def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password ::mailer-user ::mailer-pw]))
@ -136,12 +137,12 @@
; using :average and :burst seems sensible, :period may be interesting for fine tuning later on ; using :average and :burst seems sensible, :period may be interesting for fine tuning later on
(defn-spec generate-rate-limit-middleware pred/map-or-seq? (defn-spec generate-rate-limit-middleware pred/map-or-seq?
[config config?] [config rate-limit-config?]
(let [{:keys [average burst]} config] ; ToDo: Set defaults, don't read config ; refactor ":average" KW to smth more speaking (let [{:keys [max-rate max-concurrent-requests]} config] ; ToDo: Set defaults, don't read config ; refactor ":average" KW to smth more speaking
(-> (->
(yaml/load-as-edn "forgejo/middleware-ratelimit.yaml") (yaml/load-as-edn "forgejo/middleware-ratelimit.yaml")
(cm/replace-key-value :average average) (cm/replace-key-value :average max-rate)
(cm/replace-key-value :burst burst)))) (cm/replace-key-value :burst max-concurrent-requests))))
(defn-spec generate-data-volume pred/map-or-seq? (defn-spec generate-data-volume pred/map-or-seq?
[config vol?] [config vol?]