Merge branch 'main' into fix/2942-jinja2-instruction-templating

Author: vaibhav-patel

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

@@ -26,7 +26,7 @@
 from google.oauth2 import service_account
 
 from ... import version
-from ...utils import mtls_utils
+from ...utils import _mtls_utils
 
 USER_AGENT = f"google-adk/{version.__version__}"
 
@@ -121,7 +121,7 @@ def __init__(
     client_options = None
     if location:
       client_options = {
-          "api_endpoint": mtls_utils.get_api_endpoint(
+          "api_endpoint": _mtls_utils.get_api_endpoint(
               location,
               _DEFAULT_REGIONAL_ENDPOINT_TEMPLATE,
               _DEFAULT_MTLS_REGIONAL_ENDPOINT_TEMPLATE,

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

@@ -26,9 +26,17 @@
 from google.oauth2 import service_account
 
 from ... import version
+from ...utils import mtls_utils
 
 USER_AGENT = f"google-adk/{version.__version__}"
 
+_DEFAULT_REGIONAL_ENDPOINT_TEMPLATE = (
+    "secretmanager.{location}.rep.googleapis.com"
+)
+_DEFAULT_MTLS_REGIONAL_ENDPOINT_TEMPLATE = (
+    "secretmanager.{location}.rep.mtls.googleapis.com"
+)
+
 
 class SecretManagerClient:
   """A client for interacting with Google Cloud Secret Manager.
@@ -104,7 +112,11 @@ def __init__(
     client_options = None
     if location:
       client_options = {
-          "api_endpoint": f"secretmanager.{location}.rep.googleapis.com"
+          "api_endpoint": mtls_utils.get_api_endpoint(
+              location,
+              _DEFAULT_REGIONAL_ENDPOINT_TEMPLATE,
+              _DEFAULT_MTLS_REGIONAL_ENDPOINT_TEMPLATE,
+          )
       }
 
     self._client = secretmanager.SecretManagerServiceClient(

src/google/adk/utils/mtls_utils.py src/google/adk/utils/_mtls_utils.pysrc/google/adk/utils/mtls_utils.py renamed to src/google/adk/utils/_mtls_utils.py

@@ -123,7 +123,7 @@ def test_init_with_auth_token(self, mock_pm_client_class):
       "google.adk.integrations.parameter_manager.parameter_client.default_service_credential"
   )
   @patch(
-      "google.adk.integrations.parameter_manager.parameter_client.mtls_utils.get_api_endpoint"
+      "google.adk.integrations.parameter_manager.parameter_client._mtls_utils.get_api_endpoint"
   )
   def test_init_with_location(
       self,

tests/unittests/integrations/parameter_manager/test_parameter_client.py

@@ -123,8 +123,14 @@ def test_init_with_auth_token(self, mock_secret_manager_client):
   @patch(
       "google.adk.integrations.secret_manager.secret_client.default_service_credential"
   )
+  @patch(
+      "google.adk.integrations.secret_manager.secret_client.mtls_utils.get_api_endpoint"
+  )
   def test_init_with_location(
-      self, mock_default_service_credential, mock_secret_manager_client
+      self,
+      mock_get_api_endpoint,
+      mock_default_service_credential,
+      mock_secret_manager_client,
   ):
     """Test initialization with a specific location."""
     # Setup
@@ -134,6 +140,7 @@ def test_init_with_location(
         "test-project",
     )
     location = "us-central1"
+    mock_get_api_endpoint.return_value = "resolved-endpoint"
 
     # Execute
     SecretManagerClient(location=location)
@@ -143,9 +150,14 @@ def test_init_with_location(
     call_kwargs = mock_secret_manager_client.call_args.kwargs
     assert call_kwargs["credentials"] == mock_credentials
     assert call_kwargs["client_options"] == {
-        "api_endpoint": f"secretmanager.{location}.rep.googleapis.com"
+        "api_endpoint": "resolved-endpoint"
     }
     assert call_kwargs["client_info"].user_agent == USER_AGENT
+    mock_get_api_endpoint.assert_called_once_with(
+        location,
+        "secretmanager.{location}.rep.googleapis.com",
+        "secretmanager.{location}.rep.mtls.googleapis.com",
+    )
 
   @patch(
       "google.adk.integrations.secret_manager.secret_client.default_service_credential"

tests/unittests/integrations/secret_manager/test_secret_client.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Unit tests for mtls_utils."""
+"""Unit tests for _mtls_utils."""
 
 import os
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
-from google.adk.utils import mtls_utils
+from google.adk.utils import _mtls_utils
 import pytest
 
 _DEFAULT_TEMPLATE = "service.{location}.rep.googleapis.com"
@@ -27,22 +27,22 @@
 
 
 class TestMtlsUtils:
-  """Tests for mtls_utils functions."""
+  """Tests for _mtls_utils functions."""
 
   @patch("google.auth.transport.mtls.should_use_client_cert")
   def test_use_client_cert_effective_with_mtls_cert_true(
       self, mock_should_use_client_cert
   ):
     mock_should_use_client_cert.return_value = True
-    assert mtls_utils.use_client_cert_effective() is True
+    assert _mtls_utils.use_client_cert_effective() is True
     mock_should_use_client_cert.assert_called_once()
 
   @patch("google.auth.transport.mtls.should_use_client_cert")
   def test_use_client_cert_effective_with_mtls_cert_false(
       self, mock_should_use_client_cert
   ):
     mock_should_use_client_cert.return_value = False
-    assert mtls_utils.use_client_cert_effective() is False
+    assert _mtls_utils.use_client_cert_effective() is False
     mock_should_use_client_cert.assert_called_once()
 
   @patch("google.auth.transport.mtls.should_use_client_cert")
@@ -51,69 +51,69 @@ def test_use_client_cert_effective_fallback_true(
       self, mock_should_use_client_cert
   ):
     mock_should_use_client_cert.side_effect = AttributeError
-    assert mtls_utils.use_client_cert_effective() is True
+    assert _mtls_utils.use_client_cert_effective() is True
 
   @patch("google.auth.transport.mtls.should_use_client_cert")
   @patch.dict("os.environ", {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "false"})
   def test_use_client_cert_effective_fallback_false(
       self, mock_should_use_client_cert
   ):
     mock_should_use_client_cert.side_effect = AttributeError
-    assert mtls_utils.use_client_cert_effective() is False
+    assert _mtls_utils.use_client_cert_effective() is False
 
   @patch("google.auth.transport.mtls.should_use_client_cert")
   @patch.dict("os.environ", {}, clear=True)
   def test_use_client_cert_effective_fallback_default_false(
       self, mock_should_use_client_cert
   ):
     mock_should_use_client_cert.side_effect = AttributeError
-    assert mtls_utils.use_client_cert_effective() is False
+    assert _mtls_utils.use_client_cert_effective() is False
 
-  @patch("google.adk.utils.mtls_utils.use_client_cert_effective")
+  @patch("google.adk.utils._mtls_utils.use_client_cert_effective")
   @patch.dict("os.environ", {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"})
   def test_get_api_endpoint_always(self, mock_use_client_cert):
-    endpoint = mtls_utils.get_api_endpoint(
+    endpoint = _mtls_utils.get_api_endpoint(
         _LOCATION, _DEFAULT_TEMPLATE, _MTLS_TEMPLATE
     )
     assert endpoint == _MTLS_TEMPLATE.format(location=_LOCATION)
     mock_use_client_cert.assert_not_called()
 
-  @patch("google.adk.utils.mtls_utils.use_client_cert_effective")
+  @patch("google.adk.utils._mtls_utils.use_client_cert_effective")
   @patch.dict("os.environ", {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"})
   def test_get_api_endpoint_never(self, mock_use_client_cert):
-    endpoint = mtls_utils.get_api_endpoint(
+    endpoint = _mtls_utils.get_api_endpoint(
         _LOCATION, _DEFAULT_TEMPLATE, _MTLS_TEMPLATE
     )
     assert endpoint == _DEFAULT_TEMPLATE.format(location=_LOCATION)
     mock_use_client_cert.assert_not_called()
 
-  @patch("google.adk.utils.mtls_utils.use_client_cert_effective")
+  @patch("google.adk.utils._mtls_utils.use_client_cert_effective")
   @patch.dict("os.environ", {"GOOGLE_API_USE_MTLS_ENDPOINT": "auto"})
   def test_get_api_endpoint_auto_with_cert(self, mock_use_client_cert):
     mock_use_client_cert.return_value = True
-    endpoint = mtls_utils.get_api_endpoint(
+    endpoint = _mtls_utils.get_api_endpoint(
         _LOCATION, _DEFAULT_TEMPLATE, _MTLS_TEMPLATE
     )
     assert endpoint == _MTLS_TEMPLATE.format(location=_LOCATION)
     mock_use_client_cert.assert_called_once()
 
-  @patch("google.adk.utils.mtls_utils.use_client_cert_effective")
+  @patch("google.adk.utils._mtls_utils.use_client_cert_effective")
   @patch.dict("os.environ", {"GOOGLE_API_USE_MTLS_ENDPOINT": "auto"})
   def test_get_api_endpoint_auto_without_cert(self, mock_use_client_cert):
     mock_use_client_cert.return_value = False
-    endpoint = mtls_utils.get_api_endpoint(
+    endpoint = _mtls_utils.get_api_endpoint(
         _LOCATION, _DEFAULT_TEMPLATE, _MTLS_TEMPLATE
     )
     assert endpoint == _DEFAULT_TEMPLATE.format(location=_LOCATION)
     mock_use_client_cert.assert_called_once()
 
-  @patch("google.adk.utils.mtls_utils.use_client_cert_effective")
+  @patch("google.adk.utils._mtls_utils.use_client_cert_effective")
   @patch.dict("os.environ", {"GOOGLE_API_USE_MTLS_ENDPOINT": "invalid_value"})
   def test_get_api_endpoint_invalid_fallback_to_auto(
       self, mock_use_client_cert
   ):
     mock_use_client_cert.return_value = True
-    endpoint = mtls_utils.get_api_endpoint(
+    endpoint = _mtls_utils.get_api_endpoint(
         _LOCATION, _DEFAULT_TEMPLATE, _MTLS_TEMPLATE
     )
     assert endpoint == _MTLS_TEMPLATE.format(location=_LOCATION)