Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/firebolt/common/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

def from_env(var_name: str, default: Any = None) -> Callable:
def inner() -> Any:
os.environ.get(var_name, default)
return os.environ.get(var_name, default)

return inner

Expand Down
9 changes: 7 additions & 2 deletions tests/unit/common/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,16 @@ def test_settings_auth_credentials(kwargs) -> None:
def test_no_deprecation_warning_with_env(logger_mock: Mock):
with patch.dict(
os.environ,
{"FIREBOLT_USER": "user", "FIREBOLT_PASSWORD": "password"},
{
"FIREBOLT_USER": "user",
"FIREBOLT_PASSWORD": "password",
"FIREBOLT_SERVER": "dummy.firebolt.io",
},
clear=True,
):
s = Settings(server="server", default_region="region")
s = Settings(default_region="region")
logger_mock.warning.assert_not_called()
assert s.server == "dummy.firebolt.io"
assert s.auth is not None, "Settings.auth wasn't populated from env variables"
assert s.auth.username == "user", "Invalid username in Settings.auth"
assert s.auth.password == "password", "Invalid password in Settings.auth"