diff --git a/scripts/client-post-processing/unique-grafeas-client.yaml b/scripts/client-post-processing/unique-grafeas-client.yaml index ef2efd5dab6f..7e4a3403eec4 100644 --- a/scripts/client-post-processing/unique-grafeas-client.yaml +++ b/scripts/client-post-processing/unique-grafeas-client.yaml @@ -581,86 +581,6 @@ replacements: assert str\(excinfo.value\) == "Universe Domain cannot be an empty string." - @pytest.mark.parametrize\( - "client_class,transport_class,transport_name", - \[ - \(GrafeasClient, transports.GrafeasGrpcTransport, "grpc"\), - \(GrafeasClient, transports.GrafeasRestTransport, "rest"\), - \], - \) - def test__validate_universe_domain\(client_class, transport_class, transport_name\): - client = client_class\( - transport=transport_class\(credentials=ga_credentials.AnonymousCredentials\(\)\) - \) - assert client._validate_universe_domain\(\) == True - - # Test the case when universe is already validated. - assert client._validate_universe_domain\(\) == True - - if transport_name == "grpc": - # Test the case where credentials are provided by the - # `local_channel_credentials`. The default universes in both match. - channel = grpc.secure_channel\( - "http://localhost/", grpc.local_channel_credentials\(\) - \) - client = client_class\(transport=transport_class\(channel=channel\)\) - assert client._validate_universe_domain\(\) == True - - # Test the case where credentials do not exist: e.g. a transport is provided - # with no credentials. Validation should still succeed because there is no - # mismatch with non-existent credentials. - channel = grpc.secure_channel\( - "http://localhost/", grpc.local_channel_credentials\(\) - \) - transport = transport_class\(channel=channel\) - transport._credentials = None - client = client_class\(transport=transport\) - assert client._validate_universe_domain\(\) == True - - # TODO: This is needed to cater for older versions of google-auth - # Make this test unconditional once the minimum supported version of - # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor = \[ - int\(part\) for part in google.auth.__version__.split\("."\)\[0:2\] - \] - if google_auth_major > 2 or \(google_auth_major == 2 and google_auth_minor >= 23\): - credentials = ga_credentials.AnonymousCredentials\(\) - credentials._universe_domain = "foo.com" - # Test the case when there is a universe mismatch from the credentials. - client = client_class\(transport=transport_class\(credentials=credentials\)\) - with pytest.raises\(ValueError\) as excinfo: - client._validate_universe_domain\(\) - assert \( - str\(excinfo.value\) - == "The configured universe domain \(googleapis.com\) does not match the universe domain found in the credentials \(foo.com\). If you haven't configured the universe domain explicitly, `googleapis.com` is the default." - \) - - # Test the case when there is a universe mismatch from the client. - # - # TODO: Make this test unconditional once the minimum supported version of - # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor = \[ - int\(part\) for part in api_core_version.__version__.split\("."\)\[0:2\] - \] - if api_core_major > 2 or \(api_core_major == 2 and api_core_minor >= 15\): - client = client_class\( - client_options={"universe_domain": "bar.com"}, - transport=transport_class\( - credentials=ga_credentials.AnonymousCredentials\(\), - \), - \) - with pytest.raises\(ValueError\) as excinfo: - client._validate_universe_domain\(\) - assert \( - str\(excinfo.value\) - == "The configured universe domain \(bar.com\) does not match the universe domain found in the credentials \(googleapis.com\). If you haven't configured the universe domain explicitly, `googleapis.com` is the default." - \) - - # Test that ValueError is raised if universe_domain is provided via client options and credentials is None - with pytest.raises\(ValueError\): - client._compare_universes\("foo.bar", None\) - - @pytest.mark.parametrize\( "client_class,transport_name", \[ @@ -1565,36 +1485,6 @@ replacements: \ raise ValueError\("Universe Domain cannot be an empty string."\) \ return universe_domain \ - \ @staticmethod - \ def _compare_universes\( - \ client_universe: str, credentials: ga_credentials.Credentials - \ \) -> bool: - \ """Returns True iff the universe domains used by the client and credentials match. - \ - \ Args: - \ client_universe \(str\): The universe domain configured via the client options. - \ credentials \(ga_credentials.Credentials\): The credentials being used in the client. - \ - \ Returns: - \ bool: True iff client_universe matches the universe in credentials. - \ - \ Raises: - \ ValueError: when client_universe does not match the universe in credentials. - \ """ - \ - \ default_universe = GrafeasClient._DEFAULT_UNIVERSE - \ credentials_universe = getattr\(credentials, "universe_domain", default_universe\) - \ - \ if client_universe != credentials_universe: - \ raise ValueError\( - \ "The configured universe domain " - \ f"\({client_universe}\) does not match the universe domain " - \ f"found in the credentials \({credentials_universe}\). " - \ "If you haven't configured the universe domain explicitly, " - \ f"`{default_universe}` is the default." - \ \) - \ return True - \ \ def _validate_universe_domain\(self\): \ """Validates client's and credentials' universe domains are consistent. \ @@ -1604,13 +1494,9 @@ replacements: \ Raises: \ ValueError: If the configured universe domain is not valid. \ """ - \ self._is_universe_domain_valid = \( - \ self._is_universe_domain_valid - \ or GrafeasClient._compare_universes\( - \ self.universe_domain, self.transport._credentials - \ \) - \ \) - \ return self._is_universe_domain_valid + \ + \ # NOTE \(b\/349488459\): universe validation is disabled until further notice. + \ return True \ \ @property \ def api_endpoint\(self\):