Skip to content

Unset envvar subs dont overwrite with nils #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddillinger wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Unset envvar subs dont overwrite with nils #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecf55c5
Unit test: missing envvar returns configured default.
Nov 22, 2016
95a391c
Missing envvar returns configured default.
Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/carica/middleware.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,6 @@
(fn [f]
(fn [resources]
(let [cfg-map (f resources)]
(assoc-in cfg-map keyseq env-val))))))
(if-not (nil? env-val)
(assoc-in cfg-map keyseq env-val)
cfg-map))))))
13 changes: 10 additions & 3 deletions test/carica/test/middleware.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
(is (nil? (env-config :extra))))))))

(deftest test-env-substitute-config
(with-redefs [getenv (constantly "Now.")]
(testing "the envvar value is in the location"
(testing "the envvar value is in the location"
(with-redefs [getenv (constantly "Now.")]
(let [env-config (configurer
(resources "config.clj")
[(env-substitute-config "NOOP" :magic-word)
Expand All @@ -92,4 +92,11 @@
(is (= "Now." (env-config :magic-word))
"Should see our overridden value.")
(is (= "Now." (env-config :i-totally :dont-exist))
"Nested key paths should work, even if they aren't defined.")))))
"Nested key paths should work, even if they aren't defined."))))
(testing "a missing envvar returns the configured default"
(with-redefs [getenv (constantly nil)]
(let [env-config (configurer
(resources "config.clj")
[(env-substitute-config "NOOP" :magic-word)])]
(is (= "mellon" (env-config :magic-word))
"Should see our configured default value.")))))