chore: remove api-core changes from generator routing branch

Author: hebaalazzeh

packages/google-api-core/.coveragerc

@@ -2,8 +2,11 @@
 branch = True
 
 [report]
-fail_under = 99
+fail_under = 100
 show_missing = True
+omit =
+    tests/*
+    */tests/*
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER

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

@@ -25,11 +25,10 @@
 # Older Python versions safely ignore this variable.
 __lazy_modules__: Set[str] = {
     "google.api_core.gapic_v1.client_info",
-    "google.api_core.gapic_v1.client_utils",
     "google.api_core.gapic_v1.requests",
     "google.api_core.gapic_v1.routing_header",
 }
-__all__ = ["client_info", "client_utils", "requests", "routing_header"]
+__all__ = ["client_info", "requests", "routing_header"]
 
 if _has_grpc:
     __lazy_modules__.update(
@@ -43,7 +42,6 @@
 
 from google.api_core.gapic_v1 import (  # noqa: E402
     client_info,
-    client_utils,
     requests,
     routing_header,
 )

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

@@ -21,8 +21,8 @@
 if they are not already set.
 """
 
-from typing import Union
 import uuid
+from typing import Union
 
 import google.protobuf.message
 
@@ -65,7 +65,7 @@ def setup_request_id(
                 setattr(request, field_name, str(uuid.uuid4()))
         except (AttributeError, ValueError):
             # Proto-plus messages or other objects
-            if not getattr(request, field_name, None):
+            if getattr(request, field_name, None) is None:
                 setattr(request, field_name, str(uuid.uuid4()))
     else:
         if not getattr(request, field_name, None):

packages/google-api-core/google/api_core/universe.py

@@ -15,6 +15,9 @@
 """Helpers for universe domain."""
 
 from typing import Any, Optional
+from urllib.parse import urlparse, urlunparse
+
+from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 
 DEFAULT_UNIVERSE = "googleapis.com"
 
@@ -36,6 +39,32 @@ def __init__(self, client_universe, credentials_universe):
         super().__init__(message)
 
 
+def get_universe_domain(
+    *potential_universes: Optional[str],
+    default_universe: str,
+) -> str:
+    """Return the universe domain used by the client.
+
+    Args:
+        *potential_universes (Optional[str]): Potential universe domains in order of preference.
+        default_universe (str): The default universe domain.
+
+    Returns:
+        str: The universe domain to be used by the client.
+
+    Raises:
+        EmptyUniverseError: If the resolved universe domain is an empty string.
+    """
+    resolved = next(
+        (x.strip() for x in potential_universes if x is not None),
+        default_universe,
+    )
+
+    if not resolved:
+        raise EmptyUniverseError()
+    return resolved
+
+
 def determine_domain(
     client_universe_domain: Optional[str], universe_domain_env: Optional[str]
 ) -> str:
@@ -52,14 +81,11 @@ def determine_domain(
     Raises:
         ValueError: If the universe domain is an empty string.
     """
-    universe_domain = DEFAULT_UNIVERSE
-    if client_universe_domain is not None:
-        universe_domain = client_universe_domain
-    elif universe_domain_env is not None:
-        universe_domain = universe_domain_env
-    if len(universe_domain.strip()) == 0:
-        raise EmptyUniverseError
-    return universe_domain
+    return get_universe_domain(
+        client_universe_domain,
+        universe_domain_env,
+        default_universe=DEFAULT_UNIVERSE,
+    )
 
 
 def compare_domains(client_universe: str, credentials: Any) -> bool:
@@ -80,3 +106,94 @@ def compare_domains(client_universe: str, credentials: Any) -> bool:
     if client_universe != credentials_universe:
         raise UniverseMismatchError(client_universe, credentials_universe)
     return True
+
+
+def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
+    """Converts api endpoint to mTLS endpoint.
+
+    Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to
+    "*.mtls.sandbox.googleapis.com" and "*.mtls.googleapis.com" respectively.
+    Other URLs (including those that do not match these domain suffixes or
+    already contain '.mtls.') are passed through as-is.
+
+    Args:
+        api_endpoint (Optional[str]): the api endpoint to convert.
+
+    Returns:
+        Optional[str]: converted mTLS api endpoint.
+    """
+    if not api_endpoint or ".mtls." in api_endpoint.lower():
+        return api_endpoint
+
+    has_scheme = "://" in api_endpoint
+    if not has_scheme:
+        parsed = urlparse("//" + api_endpoint)
+    else:
+        parsed = urlparse(api_endpoint)
+
+    host = parsed.hostname
+    if not host:
+        return api_endpoint
+
+    port = f":{parsed.port}" if parsed.port else ""
+
+    lowered_host = host.lower()
+    suffix_sandbox = ".sandbox.googleapis.com"
+    suffix_google = ".googleapis.com"
+    if lowered_host.endswith(suffix_sandbox):
+        new_host = host[: -len(suffix_sandbox)] + ".mtls.sandbox.googleapis.com"
+    elif lowered_host.endswith(suffix_google):
+        new_host = host[: -len(suffix_google)] + ".mtls.googleapis.com"
+    else:
+        return api_endpoint
+
+    netloc = new_host + port
+    new_parsed = parsed._replace(netloc=netloc)
+
+    if not has_scheme:
+        return urlunparse(new_parsed)[2:]
+    else:
+        return urlunparse(new_parsed)
+
+
+def get_api_endpoint(
+    api_override: Optional[str],
+    universe_domain: str,
+    default_universe: str,
+    default_mtls_endpoint: Optional[str],
+    default_endpoint_template: str,
+    use_mtls: bool,
+) -> str:
+    """Return the API endpoint used by the client.
+
+    Args:
+        api_override (Optional[str]): The API endpoint override. If specified,
+            this is always returned.
+        universe_domain (str): The universe domain used by the client.
+        default_universe (str): The default universe domain.
+        default_mtls_endpoint (Optional[str]): The default mTLS endpoint.
+        default_endpoint_template (str): The default endpoint template containing
+            a placeholder `{UNIVERSE_DOMAIN}`.
+        use_mtls (bool): Whether to use the mTLS endpoint.
+
+    Returns:
+        str: The API endpoint to be used by the client.
+
+    Raises:
+        google.auth.exceptions.MutualTLSChannelError: If mTLS is requested but
+            not supported in the configured universe domain.
+        ValueError: If mTLS is requested but no mTLS endpoint is available.
+    """
+    if api_override is not None:
+        return api_override
+
+    if use_mtls:
+        if universe_domain.lower() != default_universe.lower():
+            raise MutualTLSChannelError(
+                f"mTLS is not supported in any universe other than {default_universe}."
+            )
+        if not default_mtls_endpoint:
+            raise ValueError("mTLS endpoint is not available.")
+        return default_mtls_endpoint
+    else:
+        return default_endpoint_template.format(UNIVERSE_DOMAIN=universe_domain)

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

@@ -19,7 +19,6 @@
 
 from google.api_core.gapic_v1.requests import setup_request_id
 
-
 # --- Mock Request Helper Classes ---
 
 
@@ -28,9 +27,6 @@ def __init__(self, **kwargs):
         for k, v in kwargs.items():
             setattr(self, k, v)
 
-    def __contains__(self, key):
-        return hasattr(self, key)
-
 
 class MockProtoRequest:
     def __init__(self, **kwargs):
@@ -45,9 +41,6 @@ class MockValueErrorRequest:
     def HasField(self, key):
         raise ValueError("Mismatched field")
 
-    def __contains__(self, key):
-        return hasattr(self, key)
-
 
 # --- Parameterized Test ---
 
@@ -60,6 +53,7 @@ def __contains__(self, key):
         # MockRequest cases
         (MockRequest(), True, "uuid"),
         (MockRequest(request_id="already_set"), True, "already_set"),
+        (MockRequest(request_id=""), True, ""),
         (MockRequest(request_id=""), False, "uuid"),
         (MockRequest(request_id="already_set"), False, "already_set"),
         # MockProtoRequest cases
@@ -71,6 +65,7 @@ def __contains__(self, key):
         ({}, True, "uuid"),
         ({"request_id": None}, True, "uuid"),
         ({"request_id": "already_set"}, True, "already_set"),
+        ({"request_id": ""}, True, ""),
         ({"request_id": ""}, False, "uuid"),
         ({"request_id": None}, False, "uuid"),
         ({"request_id": "already_set"}, False, "already_set"),
@@ -80,6 +75,7 @@ def __contains__(self, key):
     ids=[
         "proto3_optional_not_in_request",
         "proto3_optional_already_in_request",
+        "proto3_optional_explicit_empty",
         "non_proto3_optional_empty",
         "non_proto3_optional_already_set",
         "proto3_optional_not_in_request_proto",
@@ -88,6 +84,7 @@ def __contains__(self, key):
         "dict_proto3_optional_not_in_request",
         "dict_proto3_optional_value_none",
         "dict_proto3_optional_already_in_request",
+        "dict_proto3_optional_explicit_empty",
         "dict_non_proto3_optional_empty",
         "dict_non_proto3_optional_value_none",
         "dict_non_proto3_optional_already_set",
@@ -111,6 +108,20 @@ def test_setup_request_id(request_obj, is_proto3_optional, expected):
     )
 
     if expected == "uuid":
-        assert re.match(UUID_REGEX, value)
+        assert re.fullmatch(UUID_REGEX, value)
     else:
         assert value == expected
+
+
+def test_setup_request_id_assertion_strictness(mocker):
+    # Mock uuid.uuid4 to return a UUID with trailing characters
+    mock_uuid = mocker.patch("uuid.uuid4")
+    mock_uuid.return_value.__str__.return_value = (
+        "12345678-1234-4123-8123-123456789012-extra"
+    )
+
+    # We expect test_setup_request_id to fail (raise AssertionError) because the UUID is invalid.
+    # If test_setup_request_id uses re.fullmatch, it will fail (raise AssertionError), so pytest.raises passes.
+    # If test_setup_request_id uses re.match, it will NOT fail, so pytest.raises fails!
+    with pytest.raises(AssertionError):
+        test_setup_request_id(MockRequest(), is_proto3_optional=True, expected="uuid")

packages/google-api-core/tests/unit/operations_v1/test_operations_client.py

@@ -100,3 +100,52 @@ def test_cancel_operation():
 
 def test_operations_client_config():
     assert operations_client_config.config["interfaces"]
+
+
+def test_operations_v1_transport_base_to_dict_protobuf_versions(monkeypatch):
+    from google.auth import credentials as ga_credentials
+    from google.longrunning import operations_pb2
+
+    from google.api_core.operations_v1.transports import base
+
+    message = operations_pb2.Operation(name="test_op")
+    transport = base.OperationsTransport(
+        credentials=ga_credentials.AnonymousCredentials()
+    )
+
+    calls = []
+
+    def mock_message_to_dict(*args, **kwargs):
+        calls.append(kwargs)
+        return {"name": "test_op"}
+
+    monkeypatch.setattr(base.json_format, "MessageToDict", mock_message_to_dict)
+
+    monkeypatch.setattr(base, "PROTOBUF_VERSION", "3.20.0")
+    res3 = transport._convert_protobuf_message_to_dict(message)
+    assert res3.get("name") == "test_op"
+    assert "including_default_value_fields" in calls[-1]
+
+    monkeypatch.setattr(base, "PROTOBUF_VERSION", "5.26.0")
+    res5 = transport._convert_protobuf_message_to_dict(message)
+    assert res5.get("name") == "test_op"
+    assert "always_print_fields_with_no_presence" in calls[-1]
+
+
+def test_operations_v1_init_import_error_fallback(monkeypatch):
+    import importlib
+
+    import google.api_core.operations_v1 as op_v1
+
+    orig_import = __import__
+
+    def mock_import(name, globals=None, locals=None, fromlist=(), level=0):
+        if "operations_rest_client_async" in name or (
+            fromlist and "AsyncOperationsRestClient" in fromlist
+        ):
+            raise ImportError("Simulated async rest import error")
+        return orig_import(name, globals, locals, fromlist, level)
+
+    monkeypatch.setattr("builtins.__import__", mock_import)
+    monkeypatch.setattr(op_v1, "_has_async_rest", True)
+    importlib.reload(op_v1)