fix: restore auth_token initialization for secret and parameter manager clients

src/google/adk/integrations/parameter_manager/parameter_client.py

@@ -19,10 +19,9 @@
 from typing import Optional
 
 from google.api_core.gapic_v1 import client_info
-import google.auth
 from google.auth import default as default_service_credential
-import google.auth.transport.requests
 from google.cloud import parametermanager_v1
+from google.oauth2 import credentials as user_credentials
 from google.oauth2 import service_account
 
 from ... import version
@@ -81,15 +80,7 @@ def __init__(
       except json.JSONDecodeError as e:
         raise ValueError(f"Invalid service account JSON: {e}") from e
     elif auth_token:
-      credentials = google.auth.credentials.Credentials(
-          token=auth_token,
-          refresh_token=None,
-          token_uri=None,
-          client_id=None,
-          client_secret=None,
-      )
-      request = google.auth.transport.requests.Request()
-      credentials.refresh(request)
+      credentials = user_credentials.Credentials(token=auth_token)
     else:
       try:
         credentials, _ = default_service_credential(

src/google/adk/integrations/secret_manager/secret_client.py

@@ -19,10 +19,9 @@
 from typing import Optional
 
 from google.api_core.gapic_v1 import client_info
-import google.auth
 from google.auth import default as default_service_credential
-import google.auth.transport.requests
 from google.cloud import secretmanager
+from google.oauth2 import credentials as user_credentials
 from google.oauth2 import service_account
 
 from ... import version
@@ -65,6 +64,12 @@ def __init__(
             is not valid JSON.
         google.auth.exceptions.GoogleAuthError: If authentication fails.
     """
+    if service_account_json and auth_token:
+      raise ValueError(
+          "Must provide either 'service_account_json' or 'auth_token', not"
+          " both."
+      )
+
     if service_account_json:
       try:
         credentials = service_account.Credentials.from_service_account_info(
@@ -73,15 +78,7 @@ def __init__(
       except json.JSONDecodeError as e:
         raise ValueError(f"Invalid service account JSON: {e}") from e
     elif auth_token:
-      credentials = google.auth.credentials.Credentials(
-          token=auth_token,
-          refresh_token=None,
-          token_uri=None,
-          client_id=None,
-          client_secret=None,
-      )
-      request = google.auth.transport.requests.Request()
-      credentials.refresh(request)
+      credentials = user_credentials.Credentials(token=auth_token)
     else:
       try:
         credentials, _ = default_service_credential(

tests/unittests/integrations/parameter_manager/test_parameter_client.py

@@ -21,6 +21,7 @@
 from google.adk.integrations.parameter_manager.parameter_client import ParameterManagerClient
 from google.adk.integrations.parameter_manager.parameter_client import USER_AGENT
 from google.api_core.gapic_v1 import client_info
+from google.oauth2.credentials import Credentials
 import pytest
 
 
@@ -92,28 +93,19 @@ def test_init_with_service_account_json(
   @patch("google.cloud.parametermanager_v1.ParameterManagerClient")
   def test_init_with_auth_token(self, mock_pm_client_class):
     """Test initialization with auth token."""
-    # Setup
     auth_token = "test-token"
-    mock_credentials = MagicMock()
 
-    with (
-        patch("google.auth.credentials.Credentials") as mock_credentials_class,
-        patch("google.auth.transport.requests.Request") as mock_request,
-    ):
-      mock_credentials_class.return_value = mock_credentials
-
-      # Execute
-      client = ParameterManagerClient(auth_token=auth_token)
-
-      # Verify
-      mock_credentials.refresh.assert_called_once()
-      mock_pm_client_class.assert_called_once()
-      call_kwargs = mock_pm_client_class.call_args.kwargs
-      assert call_kwargs["credentials"] == mock_credentials
-      assert call_kwargs["client_options"] is None
-      assert call_kwargs["client_info"].user_agent == USER_AGENT
-      assert client._credentials == mock_credentials
-      assert client._client == mock_pm_client_class.return_value
+    client = ParameterManagerClient(auth_token=auth_token)
+
+    mock_pm_client_class.assert_called_once()
+    call_kwargs = mock_pm_client_class.call_args.kwargs
+    assert isinstance(call_kwargs["credentials"], Credentials)
+    assert call_kwargs["credentials"].token == auth_token
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
+    assert isinstance(client._credentials, Credentials)
+    assert client._credentials.token == auth_token
+    assert client._client == mock_pm_client_class.return_value
 
   @patch("google.cloud.parametermanager_v1.ParameterManagerClient")
   @patch(

tests/unittests/integrations/secret_manager/test_secret_client.py

@@ -21,6 +21,7 @@
 from google.adk.integrations.secret_manager.secret_client import SecretManagerClient
 from google.adk.integrations.secret_manager.secret_client import USER_AGENT
 from google.api_core.gapic_v1 import client_info
+from google.oauth2.credentials import Credentials
 import pytest
 
 import google
@@ -94,30 +95,19 @@ def test_init_with_service_account_json(
   @patch("google.cloud.secretmanager.SecretManagerServiceClient")
   def test_init_with_auth_token(self, mock_secret_manager_client):
     """Test initialization with auth token."""
-    # Setup
     auth_token = "test-token"
-    mock_credentials = MagicMock()
 
-    # Mock the entire credentials creation process
-    with (
-        patch("google.auth.credentials.Credentials") as mock_credentials_class,
-        patch("google.auth.transport.requests.Request") as mock_request,
-    ):
-      # Configure the mock to return our mock_credentials when instantiated
-      mock_credentials_class.return_value = mock_credentials
-
-      # Execute
-      client = SecretManagerClient(auth_token=auth_token)
-
-      # Verify
-      mock_credentials.refresh.assert_called_once()
-      mock_secret_manager_client.assert_called_once()
-      call_kwargs = mock_secret_manager_client.call_args.kwargs
-      assert call_kwargs["credentials"] == mock_credentials
-      assert call_kwargs["client_options"] is None
-      assert call_kwargs["client_info"].user_agent == USER_AGENT
-      assert client._credentials == mock_credentials
-      assert client._client == mock_secret_manager_client.return_value
+    client = SecretManagerClient(auth_token=auth_token)
+
+    mock_secret_manager_client.assert_called_once()
+    call_kwargs = mock_secret_manager_client.call_args.kwargs
+    assert isinstance(call_kwargs["credentials"], Credentials)
+    assert call_kwargs["credentials"].token == auth_token
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
+    assert isinstance(client._credentials, Credentials)
+    assert client._credentials.token == auth_token
+    assert client._client == mock_secret_manager_client.return_value
 
   @patch("google.cloud.secretmanager.SecretManagerServiceClient")
   @patch(
@@ -170,6 +160,20 @@ def test_init_with_invalid_service_account_json(self):
     with pytest.raises(ValueError, match="Invalid service account JSON"):
       SecretManagerClient(service_account_json="invalid-json")
 
+  def test_init_with_both_service_account_json_and_auth_token(self):
+    """Test initialization rejects conflicting credential inputs."""
+    with pytest.raises(
+        ValueError,
+        match=(
+            "Must provide either 'service_account_json' or 'auth_token', not"
+            " both."
+        ),
+    ):
+      SecretManagerClient(
+          service_account_json=json.dumps({"type": "service_account"}),
+          auth_token="test-token",
+      )
+
   @patch("google.cloud.secretmanager.SecretManagerServiceClient")
   @patch(
       "google.adk.integrations.secret_manager.secret_client.default_service_credential"