From 2c3a03108187223419fed5b796d34a5caa7a9304 Mon Sep 17 00:00:00 2001 From: Clemens Date: Thu, 18 Jul 2024 08:55:00 +0200 Subject: [PATCH] adjust auth-objects signature --- src/main/cljc/dda/c4k_forgejo/core.cljc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/cljc/dda/c4k_forgejo/core.cljc b/src/main/cljc/dda/c4k_forgejo/core.cljc index 3a895ac..e893af2 100644 --- a/src/main/cljc/dda/c4k_forgejo/core.cljc +++ b/src/main/cljc/dda/c4k_forgejo/core.cljc @@ -65,15 +65,14 @@ (when (contains? config :mon-cfg) (mon/generate-config))))))) -; REVIEW gec: In general, how do we handle config and auth for auth-objects? -(defn auth-objects [config] ; ToDo: ADR for generate functions - vector or no vector? +(defn auth-objects [config auth] (map yaml/to-string (filter #(not (nil? %)) (cm/concat-vec (ns/generate config) - [(postgres/generate-secret config config) ; "config config" seems not right + [(postgres/generate-secret config auth) (forgejo/generate-secrets config)] (when (contains? config :restic-repository) [(backup/generate-secret config)]) (when (contains? config :mon-cfg) - (mon/generate-auth (:mon-cfg config) (:mon-auth config))))))) ; Here also "config config" seems not right + (mon/generate-auth (:mon-cfg config) (:mon-auth auth)))))))