(sap) fix after bot review

This commit is contained in:
Vasilisa Parshikova 2026-03-05 16:34:52 +04:00 committed by Sameer Kankute
parent 26bdc87f54
commit 7f5db2082c
No known key found for this signature in database
2 changed files with 6 additions and 1 deletions

View file

@ -62,7 +62,7 @@ def _load_json_env(var_name: str) -> Optional[Dict[str, Any]]:
return None
def _str_or_none(value) -> Optional[str]:
return str(value) if value else None
return str(value) if value is not None else None
def _load_vcap() -> Dict[str, Any]:

View file

@ -41,12 +41,14 @@ def test_sap_fetch_creds_from_env_service_key(monkeypatch):
def test_sap_fetch_creds_from_arg_service_key(monkeypatch):
monkeypatch.setattr(sap_credentials, "sap_service_key", None)
monkeypatch.delenv("AICORE_SERVICE_KEY", raising=False)
monkeypatch.setenv("AICORE_HOME", 'notexist')
creds = sap_credentials.fetch_credentials(service_key=json.dumps(mock_sap_service_key_dict))
assert creds == expected_creds
def test_fetch_creds_from_env_vcap_service(monkeypatch):
monkeypatch.setattr(sap_credentials, "sap_service_key", None)
monkeypatch.delenv("AICORE_SERVICE_KEY", raising=False)
monkeypatch.setenv("AICORE_HOME", 'notexist')
monkeypatch.setenv("VCAP_SERVICES", json.dumps(mock_sap_vcap_service_key_dict))
creds = sap_credentials.fetch_credentials()
@ -55,6 +57,8 @@ def test_fetch_creds_from_env_vcap_service(monkeypatch):
def test_fetch_creds_from_env(monkeypatch):
monkeypatch.setattr(sap_credentials, "sap_service_key", None)
monkeypatch.delenv("AICORE_SERVICE_KEY", raising=False)
monkeypatch.delenv("VCAP_SERVICES", raising=False)
monkeypatch.setenv("AICORE_HOME", 'notexist')
monkeypatch.setenv("AICORE_CLIENT_ID", "env-client-id")
monkeypatch.setenv("AICORE_CLIENT_SECRET", "env-client-secret")
@ -72,6 +76,7 @@ def test_fetch_creds_from_env(monkeypatch):
def test_creds_priority_order(monkeypatch):
monkeypatch.setattr(sap_credentials, "sap_service_key", None)
monkeypatch.delenv("AICORE_SERVICE_KEY", raising=False)
monkeypatch.setenv("AICORE_HOME", 'notexist')
monkeypatch.setenv("AICORE_CLIENT_ID", "env-client-id")
monkeypatch.setenv("AICORE_CLIENT_SECRET", "env-client-secret")