Proper handling of null as default value to the env resolver

Fixes omry#230
odelalleau · Feb 10, 2021 · 1e51bba · 1e51bba
1 parent f0ccb16
commit 1e51bba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/news/230.bugfix b/news/230.bugfix
@@ -0,0 +1 @@
+`${env:MYVAR,null}` now properly returns `None` if the environment variable MYVAR is undefined
diff --git a/tests/test_interpolation.py b/tests/test_interpolation.py
@@ -349,6 +349,12 @@ def test_env_node_interpolation(monkeypatch: Any) -> None:
         c.my_key
 
 
+def test_env_default_none(monkeypatch: Any) -> None:
+    monkeypatch.delenv("my_key", raising=False)
+    c = OmegaConf.create({"my_key": "${env:my_key, null}"})
+    assert c.my_key is None
+
+
 def test_register_resolver_twice_error(restore_resolvers: Any) -> None:
     def foo(_: Any) -> int:
         return 10
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		`${env:MYVAR,null}` now properly returns `None` if the environment variable MYVAR is undefined