scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-26 06:03:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

fix(secrets): return default_value when a secret is missing

Browse source 
get_secret only used default_value when reading raised, so a missing secret
returned None. Apply it where the environment and secret-manager paths find
nothing.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: AlSh007 <85677626+AlSh007@users.noreply.github.com>
This commit is contained in:
AlSh007 2026-10-18 05:29:50 +05:30
parent 82ca10cc2d
commit c79be9f080
No known key found for this signature in database
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
litellm/secret_managers/main.py
View file

@ -358,13 +358,15 @@ def get_secret(
return secret
except Exception:
return secret
# The secret is not set: `default_value` is what the caller asked for in that case.
return default_value
else:
secret = os.environ.get(secret_name)
secret_value_as_bool = str_to_bool(secret) if secret is not None else None
if secret_value_as_bool is not None and isinstance(secret_value_as_bool, bool):
return secret_value_as_bool
else:
return secret
return secret if secret is not None else default_value
except Exception as e:
if default_value is not None:
return default_value

37
tests/unit/secret_managers/test_main.py
View file

@ -106,6 +106,43 @@ def test_oidc_env_path():
del os.environ[env_var_name]
def test_get_secret_returns_default_value_when_the_secret_is_missing(monkeypatch):
from litellm.secret_managers.main import get_secret_bool, get_secret_str
monkeypatch.delenv("LITELLM_TEST_MISSING_SECRET", raising=False)
monkeypatch.setattr(litellm, "_key_management_system", None)
assert get_secret("LITELLM_TEST_MISSING_SECRET", default_value="dflt") == "dflt"
assert get_secret_str("LITELLM_TEST_MISSING_SECRET", default_value="dflt") == "dflt"
assert get_secret_bool("LITELLM_TEST_MISSING_SECRET", default_value=True) is True
assert get_secret_bool("LITELLM_TEST_MISSING_SECRET", default_value=False) is False
# Without a default the missing secret is still None.
assert get_secret("LITELLM_TEST_MISSING_SECRET") is None
def test_get_secret_prefers_a_set_value_over_default_value(monkeypatch):
from litellm.secret_managers.main import get_secret_bool
monkeypatch.setattr(litellm, "_key_management_system", None)
monkeypatch.setenv("LITELLM_TEST_SET_SECRET", "real")
monkeypatch.setenv("LITELLM_TEST_EMPTY_SECRET", "")
monkeypatch.setenv("LITELLM_TEST_FALSE_SECRET", "false")
assert get_secret("LITELLM_TEST_SET_SECRET", default_value="dflt") == "real"
# An empty string is a value that was set, so it is not replaced by the default.
assert get_secret("LITELLM_TEST_EMPTY_SECRET", default_value="dflt") == ""
assert get_secret_bool("LITELLM_TEST_FALSE_SECRET", default_value=True) is False
def test_get_secret_returns_default_value_when_the_secret_manager_has_no_secret(monkeypatch):
monkeypatch.delenv("LITELLM_TEST_MISSING_SECRET", raising=False)
monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.GOOGLE_KMS)
with patch("litellm.secret_managers.main.get_secret_from_manager", return_value=None):
assert get_secret("LITELLM_TEST_MISSING_SECRET", default_value="dflt") == "dflt"
assert get_secret("LITELLM_TEST_MISSING_SECRET") is None
def test_should_read_secret_from_secret_manager():
"""
Test that _should_read_secret_from_secret_manager returns correct values based on access mode