fix: integration tests with explicit config

Author: NicoleMGomes

src/sap_cloud_sdk/adms/client.py

@@ -58,6 +58,7 @@
 )
 from sap_cloud_sdk.adms._token_cache import TokenCache
 from sap_cloud_sdk.adms.config import AdmsConfig, _make_config_factory
+from sap_cloud_sdk.adms.exceptions import ConfigError
 
 
 # ---------------------------------------------------------------------------
@@ -171,12 +172,15 @@ def create_client(
         raise ValueError(
             "instance must not be an empty string; omit it to use 'default'"
         )
-    if config is not None:
-        token_fetcher = IasTokenFetcher(config=config, cache=token_cache)
-    else:
-        token_fetcher = IasTokenFetcher(
-            config=_make_config_factory(instance), cache=token_cache
-        )
+    try:
+        if config is not None:
+            token_fetcher = IasTokenFetcher(config=config, cache=token_cache)
+        else:
+            token_fetcher = IasTokenFetcher(
+                config=_make_config_factory(instance), cache=token_cache
+            )
+    except RuntimeError as exc:
+        raise ConfigError(str(exc)) from exc
     http = AdmsHttp(
         config=token_fetcher._config, token_fetcher=token_fetcher, user_jwt=user_jwt
     )
@@ -212,12 +216,15 @@ def create_async_client(
         raise ValueError(
             "instance must not be an empty string; omit it to use 'default'"
         )
-    if config is not None:
-        token_fetcher = IasTokenFetcher(config=config, cache=token_cache)
-    else:
-        token_fetcher = IasTokenFetcher(
-            config=_make_config_factory(instance), cache=token_cache
-        )
+    try:
+        if config is not None:
+            token_fetcher = IasTokenFetcher(config=config, cache=token_cache)
+        else:
+            token_fetcher = IasTokenFetcher(
+                config=_make_config_factory(instance), cache=token_cache
+            )
+    except RuntimeError as exc:
+        raise ConfigError(str(exc)) from exc
     http = AsyncAdmsHttp(
         config=token_fetcher._config,
         token_fetcher=token_fetcher,

tests/adms/integration/conftest.py

@@ -24,42 +24,30 @@
     AsyncAdmsClient,
     create_async_client,
 )
-from sap_cloud_sdk.adms.config import AdmsConfig, load_from_env_or_mount
 from sap_cloud_sdk.adms.exceptions import ConfigError
 
 
 # ---------------------------------------------------------------------------
-# Configuration fixture
+# Client fixtures
 # ---------------------------------------------------------------------------
 
 
 @pytest.fixture(scope="session")
-def adms_config() -> AdmsConfig:
-    """Resolve AdmsConfig from env/secret-mount.
-
-    Skips the entire integration suite when required credentials are missing.
-    """
+def adms_client() -> AdmsClient:
+    """Sync AdmsClient wired to the real ADM instance via ConfigFactory."""
     try:
-        return load_from_env_or_mount("default")
+        return create_client()
     except ConfigError as exc:
         pytest.skip(f"ADMS integration tests skipped — missing config: {exc}")
 
 
-# ---------------------------------------------------------------------------
-# Client fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(scope="session")
-def adms_client(adms_config: AdmsConfig) -> AdmsClient:
-    """Sync AdmsClient wired to the real ADM instance."""
-    return create_client(config=adms_config)
-
-
 @pytest.fixture(scope="function")
-def async_adms_client(adms_config: AdmsConfig) -> AsyncAdmsClient:
-    """Async AdmsClient wired to the real ADM instance."""
-    return create_async_client(config=adms_config)
+def async_adms_client() -> AsyncAdmsClient:
+    """Async AdmsClient wired to the real ADM instance via ConfigFactory."""
+    try:
+        return create_async_client()
+    except ConfigError as exc:
+        pytest.skip(f"ADMS integration tests skipped — missing config: {exc}")
 
 
 # ---------------------------------------------------------------------------

tests/adms/unit/test_client.py

@@ -152,19 +152,27 @@ def test_raises_config_error_on_missing_binding(self):
                 create_client(instance="nonexistent-instance")
 
     def test_unexpected_exception_propagates_as_is(self):
-        """Real bugs (e.g. ``RuntimeError`` from internal logic) must surface
-        as themselves rather than being silently wrapped — wrapping makes
-        debugging harder and previously masked SDK programming errors as
-        "client creation failed".
-        """
-        factory = MagicMock(side_effect=RuntimeError("unexpected"))
+        """Exceptions other than RuntimeError (e.g. programming errors) must
+        surface as themselves rather than being silently swallowed."""
+        factory = MagicMock(side_effect=ValueError("unexpected"))
         with patch(
             "sap_cloud_sdk.adms.client._make_config_factory",
             return_value=factory,
         ):
-            with pytest.raises(RuntimeError, match="unexpected"):
+            with pytest.raises(ValueError, match="unexpected"):
                 create_client(instance="bad-instance")
 
+    def test_runtime_error_from_secret_resolver_becomes_config_error(self):
+        """RuntimeError from ConfigFactory (missing secrets) must be wrapped as
+        ConfigError so callers only need to handle one exception type."""
+        factory = MagicMock(side_effect=RuntimeError("env var not found: CLOUD_SDK_CFG_ADMS_DEFAULT_CLIENTID"))
+        with patch(
+            "sap_cloud_sdk.adms.client._make_config_factory",
+            return_value=factory,
+        ):
+            with pytest.raises(ConfigError):
+                create_client(instance="missing")
+
     def test_returns_adms_client_on_success(self):
         mock_config = AdmsConfig(
             service_url="https://adm.example.com",

tests/objectstore/integration/conftest.py

@@ -48,7 +48,9 @@ def integration_env() -> Dict[str, str]:
             missing_vars.append(var)
 
     if missing_vars:
-        pytest.skip(f"Missing required environment variables for cloud integration tests: {missing_vars}")
+        pytest.skip(
+            f"Missing required environment variables for cloud integration tests: {missing_vars}"
+        )
 
     # Ensure SSL is enabled for cloud services
     env_vars["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SSL_ENABLED"] = os.getenv(
@@ -66,19 +68,17 @@ def integration_env() -> Dict[str, str]:
 
 @pytest.fixture(scope="session")
 def objectstore_client(integration_env):
-    """Create an ObjectStore client for cloud testing using explicit configuration."""
+    """Create an ObjectStore client via ConfigFactory (reads CLOUD_SDK_CFG_* env vars)."""
     try:
-        config = ObjectStoreBindingData(
-            host=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_HOST"],
-            access_key_id=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_ACCESS_KEY_ID"],
-            secret_access_key=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SECRET_ACCESS_KEY"],
-            bucket=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_BUCKET"],
-        )
-        disable_ssl = integration_env.get("CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SSL_ENABLED", "true").lower() in ("false", "0")
-        client = create_client("default", config=config, disable_ssl=disable_ssl)
+        disable_ssl = integration_env.get(
+            "CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SSL_ENABLED", "true"
+        ).lower() in ("false", "0")
+        client = create_client("default", disable_ssl=disable_ssl)
         return client
     except Exception as e:
-        pytest.fail(f"Failed to create ObjectStore client for cloud integration tests: {e}")
+        pytest.fail(
+            f"Failed to create ObjectStore client for cloud integration tests: {e}"
+        )
 
 
 @pytest.fixture
@@ -89,6 +89,7 @@ def test_prefix() -> str:
 
 # ===== CLEANUP INFRASTRUCTURE =====
 
+
 def cleanup_by_prefix(client, prefix: str, timeout: float = 10.0) -> bool:
     """Timeout-controlled cleanup with eventual consistency handling."""
     start_time = time.time()
@@ -103,7 +104,9 @@ def cleanup_by_prefix(client, prefix: str, timeout: float = 10.0) -> bool:
 
             # Check timeout
             if time.time() - start_time > timeout:
-                logger.warning(f"Cleanup timeout reached after {timeout}s, cleaned {cleaned_count} objects")
+                logger.warning(
+                    f"Cleanup timeout reached after {timeout}s, cleaned {cleaned_count} objects"
+                )
                 break
 
         if cleaned_count > 0:
@@ -126,8 +129,12 @@ def cleanup_all_test_objects():
         try:
             objects = objectstore_client.list_objects("sdk-python-integration-tests/")
             if objects:
-                logger.info(f"Found {len(objects)} leftover integration test objects, cleaning up...")
-                cleanup_by_prefix(objectstore_client, "sdk-python-integration-tests/", timeout=30.0)
+                logger.info(
+                    f"Found {len(objects)} leftover integration test objects, cleaning up..."
+                )
+                cleanup_by_prefix(
+                    objectstore_client, "sdk-python-integration-tests/", timeout=30.0
+                )
                 logger.info("Session cleanup completed")
         except Exception as e:
             logger.warning(f"Session cleanup failed: {e}")
@@ -166,7 +173,9 @@ def register_object(object_name: str):
 
                 # Respect timeout
                 if time.time() - start_time > 10.0:
-                    logger.warning(f"Object cleanup timeout reached, cleaned {cleaned_count}/{len(created_objects)} objects")
+                    logger.warning(
+                        f"Object cleanup timeout reached, cleaned {cleaned_count}/{len(created_objects)} objects"
+                    )
                     break
 
             except Exception as e:
@@ -182,11 +191,17 @@ def failure_simulation(integration_env):
     """Utilities for simulating various failure conditions using explicit configuration."""
     base_config = ObjectStoreBindingData(
         host=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_HOST"],
-        access_key_id=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_ACCESS_KEY_ID"],
-        secret_access_key=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SECRET_ACCESS_KEY"],
+        access_key_id=integration_env[
+            "CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_ACCESS_KEY_ID"
+        ],
+        secret_access_key=integration_env[
+            "CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SECRET_ACCESS_KEY"
+        ],
         bucket=integration_env["CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_BUCKET"],
     )
-    disable_ssl = integration_env.get("CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SSL_ENABLED", "true").lower() in ("false", "0")
+    disable_ssl = integration_env.get(
+        "CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SSL_ENABLED", "true"
+    ).lower() in ("false", "0")
 
     class FailureSimulator:
         def create_client_with_network_failure(self):
@@ -219,10 +234,7 @@ def setup_intermittent_failure(self):
 # Configure pytest markers for integration tests
 def pytest_configure(config):
     """Configure pytest markers."""
-    config.addinivalue_line(
-        "markers",
-        "integration: mark test as integration test"
-    )
+    config.addinivalue_line("markers", "integration: mark test as integration test")
 
 
 def pytest_collection_modifyitems(config, items):