refactor(api-core): import get_universe_domain from universe.py instead of local duplication

Author: hebaalazzeh

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

@@ -18,6 +18,8 @@
 
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 
+from google.api_core.universe import get_universe_domain  # noqa: F401
+
 
 def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
     """Converts api endpoint to mTLS endpoint.
@@ -106,29 +108,3 @@ def get_api_endpoint(
         return default_mtls_endpoint
     else:
         return default_endpoint_template.format(UNIVERSE_DOMAIN=universe_domain)
-
-
-def get_universe_domain(
-    *potential_universes: Optional[str],
-    default_universe: str = "googleapis.com",
-) -> 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:
-        ValueError: 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 ValueError("Universe Domain cannot be an empty string.")
-    return resolved

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

@@ -18,7 +18,6 @@
 from google.api_core.gapic_v1.client_utils import (
     get_api_endpoint,
     get_default_mtls_endpoint,
-    get_universe_domain,
 )
 
 
@@ -160,40 +159,3 @@ def test_get_api_endpoint(
             )
             == expected
         )
-
-
-def test_get_universe_domain():
-    # When universe_domain is provided
-    assert get_universe_domain("foo.com", default_universe="default.com") == "foo.com"
-    assert (
-        get_universe_domain("  foo.com  ", default_universe="default.com") == "foo.com"
-    )
-
-    # When universe_domain is None, falls back to default_universe
-    assert get_universe_domain(None, default_universe="default.com") == "default.com"
-
-    # When multiple potential universes are provided, resolves in order of preference
-    assert (
-        get_universe_domain("foo.com", "bar.com", default_universe="default.com")
-        == "foo.com"
-    )
-    assert (
-        get_universe_domain(None, "bar.com", default_universe="default.com")
-        == "bar.com"
-    )
-    assert (
-        get_universe_domain(None, None, default_universe="default.com") == "default.com"
-    )
-
-    # ValueError raised when resolved value is empty string
-    with pytest.raises(ValueError) as excinfo:
-        get_universe_domain("", default_universe="default.com")
-    assert str(excinfo.value) == "Universe Domain cannot be an empty string."
-
-    with pytest.raises(ValueError) as excinfo:
-        get_universe_domain("   ", default_universe="default.com")
-    assert str(excinfo.value) == "Universe Domain cannot be an empty string."
-
-    with pytest.raises(ValueError) as excinfo:
-        get_universe_domain(None, "", default_universe="default.com")
-    assert str(excinfo.value) == "Universe Domain cannot be an empty string."