meissa/dda-build
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix gopass & infra

Browse source
This commit is contained in:
bom 2024-10-11 15:01:20 +02:00
parent 06617d7881
commit b8eb32283f
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dda/build/gopass.clj
View file

@ -27,7 +27,7 @@
" "
[devops ::d/devops [devops ::d/devops
config ::domain/config] config ::domain/config]
(update-vals config #(run-gopass-command! devops %))) (apply merge (for [[k v] config] {(name k) (run-gopass-command! devops v)})))
(defn-spec insert-gopass! nil? (defn-spec insert-gopass! nil?
"Inserts values from the resolved auth config into the c4k auth "Inserts values from the resolved auth config into the c4k auth

2
src/dda/build/gopass/domain.clj
View file

@ -8,7 +8,7 @@
:opt-un [::field])) :opt-un [::field]))
(s/def ::config (s/map-of keyword? ::gopass-entry)) (s/def ::config (s/map-of keyword? ::gopass-entry))
(s/def ::resolved-config (s/map-of keyword? string?)) (s/def ::resolved-config (s/map-of string? string?))
(s/def ::gopass-command (s/coll-of string?)) (s/def ::gopass-command (s/coll-of string?))
(s/def ::gopass-commands (s/coll-of ::gopass-command)) (s/def ::gopass-commands (s/coll-of ::gopass-command))

3
src/dda/build/infrastructure.clj
View file

@ -19,7 +19,6 @@
(when debug (when debug
(println command)) (println command))
(when-not dry-run (when-not dry-run
(->> command (->> (t/shell command {:out :string})
(t/shell {:out :string})
:out :out
clojure.string/trim)))) clojure.string/trim))))