merge branch 'feat/gapic-centralization-api-core-routing' into feat/gapic-generator-centralization-routing

Author: hebaalazzeh

packages/google-api-core/google/api_core/gapic_v1/client_utils.py

@@ -33,14 +33,15 @@ def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
     Returns:
         Optional[str]: converted mTLS api endpoint.
     """
-    if not api_endpoint or ".mtls." in api_endpoint:
+    if not api_endpoint or ".mtls." in api_endpoint.lower():
         return api_endpoint
 
-    if api_endpoint.endswith(".sandbox.googleapis.com"):
+    lowered_endpoint = api_endpoint.lower()
+    if lowered_endpoint.endswith(".sandbox.googleapis.com"):
         # len(".sandbox.googleapis.com") == 23
         return api_endpoint[:-23] + ".mtls.sandbox.googleapis.com"
 
-    if api_endpoint.endswith(".googleapis.com"):
+    if lowered_endpoint.endswith(".googleapis.com"):
         # len(".googleapis.com") == 15
         return api_endpoint[:-15] + ".mtls.googleapis.com"
 

packages/google-api-core/tests/unit/gapic/test_client_utils.py

@@ -39,6 +39,15 @@ def test_get_default_mtls_endpoint():
         get_default_mtls_endpoint("foo.sandbox.googleapis.com")
         == "foo.mtls.sandbox.googleapis.com"
     )
+    # Test case-insensitivity
+    assert (
+        get_default_mtls_endpoint("foo.GoogleAPIs.com")
+        == "foo.mtls.googleapis.com"
+    )
+    assert (
+        get_default_mtls_endpoint("foo.Sandbox.GoogleAPIs.com")
+        == "foo.mtls.sandbox.googleapis.com"
+    )
 
     # Test endpoints that shouldn't be converted
     assert (