ADK changes

PiperOrigin-RevId: 886119834

Author: google-genai-bot

src/google/adk/auth/auth_schemes.py

@@ -26,7 +26,6 @@
 from fastapi.openapi.models import SecuritySchemeType
 from pydantic import Field
 
-from ..integrations._iam_connectors.gcp_iam_connector_auth import GcpIamConnectorAuth
 from ..utils.feature_decorator import experimental
 
 
@@ -43,9 +42,8 @@ class OpenIdConnectWithConfig(SecurityBase):
   scopes: Optional[List[str]] = None
 
 
-# AuthSchemes contains SecuritySchemes from OpenAPI 3.0, an extra flattened
-# OpenIdConnectWithConfig, and GCP managed auth.
-AuthScheme = Union[SecurityScheme, OpenIdConnectWithConfig, GcpIamConnectorAuth]
+# AuthSchemes contains SecuritySchemes from OpenAPI 3.0 and an extra flattened OpenIdConnectWithConfig.
+AuthScheme = Union[SecurityScheme, OpenIdConnectWithConfig]
 
 
 class OAuthGrantType(str, Enum):

src/google/adk/auth/credential_manager.py

@@ -20,10 +20,6 @@
 from fastapi.openapi.models import OAuth2
 
 from ..agents.callback_context import CallbackContext
-from ..features import FeatureName
-from ..features import is_feature_enabled
-from ..integrations._iam_connectors.gcp_auth_provider import GcpAuthProvider
-from ..integrations._iam_connectors.gcp_iam_connector_auth import GcpIamConnectorAuth
 from ..tools.openapi_tool.auth.credential_exchangers.service_account_exchanger import ServiceAccountCredentialExchanger
 from ..utils.feature_decorator import experimental
 from .auth_credential import AuthCredential
@@ -91,12 +87,6 @@ def __init__(
     self._refresher_registry = CredentialRefresherRegistry()
     self._discovery_manager = OAuth2DiscoveryManager()
 
-    # Register auth providers
-    if is_feature_enabled(FeatureName.GCP_IAM_CONNECTOR_AUTH):
-      self._auth_provider_registry.register(
-          GcpIamConnectorAuth, GcpAuthProvider()
-      )
-
     # Register default exchangers and refreshers
     from .exchanger.oauth2_credential_exchanger import OAuth2CredentialExchanger
     from .refresher.oauth2_credential_refresher import OAuth2CredentialRefresher

src/google/adk/features/_feature_registry.py

@@ -38,7 +38,6 @@ class FeatureName(str, Enum):
   DATA_AGENT_TOOL_CONFIG = "DATA_AGENT_TOOL_CONFIG"
   DATA_AGENT_TOOLSET = "DATA_AGENT_TOOLSET"
   ENVIRONMENT_SIMULATION = "ENVIRONMENT_SIMULATION"
-  GCP_IAM_CONNECTOR_AUTH = "GCP_IAM_CONNECTOR_AUTH"
   GOOGLE_CREDENTIALS_CONFIG = "GOOGLE_CREDENTIALS_CONFIG"
   GOOGLE_TOOL = "GOOGLE_TOOL"
   JSON_SCHEMA_FOR_FUNC_DECL = "JSON_SCHEMA_FOR_FUNC_DECL"
@@ -127,9 +126,6 @@ class FeatureConfig:
     FeatureName.GOOGLE_TOOL: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
-    FeatureName.GCP_IAM_CONNECTOR_AUTH: FeatureConfig(
-        FeatureStage.EXPERIMENTAL, default_on=False
-    ),
     FeatureName.JSON_SCHEMA_FOR_FUNC_DECL: FeatureConfig(
         FeatureStage.WIP, default_on=False
     ),

src/google/adk/integrations/_iam_connectors/README.md

@@ -37,10 +37,6 @@
 from google.adk.auth.credential_manager import CredentialManager
 from google.adk.auth.credential_manager import ServiceAccountCredentialExchanger
 from google.adk.auth.oauth2_discovery import AuthorizationServerMetadata
-from google.adk.features import FeatureName
-from google.adk.features._feature_registry import temporary_feature_override
-from google.adk.integrations._iam_connectors import GcpIamConnectorAuth
-from google.adk.integrations._iam_connectors.gcp_auth_provider import GcpAuthProvider
 from google.adk.sessions.in_memory_session_service import InMemorySessionService
 from google.adk.tools.tool_context import ToolContext
 import pytest
@@ -51,28 +47,12 @@
 class TestCredentialManager:
   """Test suite for CredentialManager."""
 
-  @pytest.fixture(autouse=True)
-  def enable_gcp_iam_connector_auth(self):
-    with temporary_feature_override(FeatureName.GCP_IAM_CONNECTOR_AUTH, True):
-      yield
-
   def test_init(self):
     """Test CredentialManager initialization."""
     auth_config = Mock(spec=AuthConfig)
     manager = CredentialManager(auth_config)
     assert manager._auth_config == auth_config
 
-  def test_init_registers_gcp_auth_provider(self):
-    """Test that GcpIamConnectorAuth is registered with GcpAuthProvider."""
-    auth_config = Mock(spec=AuthConfig)
-    manager = CredentialManager(auth_config)
-
-    provider = manager._auth_provider_registry.get_provider(
-        GcpIamConnectorAuth(connector_name="test")
-    )
-
-    assert isinstance(provider, GcpAuthProvider)
-
   @pytest.mark.asyncio
   async def test_request_credential(self):
     """Test request_credential method."""