use None as universe domain for mocked values

Author: ohmayr

googleapiclient/discovery.py

@@ -124,7 +124,7 @@
 GOOGLE_API_USE_CLIENT_CERTIFICATE = "GOOGLE_API_USE_CLIENT_CERTIFICATE"
 GOOGLE_API_USE_MTLS_ENDPOINT = "GOOGLE_API_USE_MTLS_ENDPOINT"
 GOOGLE_CLOUD_UNIVERSE_DOMAIN = "GOOGLE_CLOUD_UNIVERSE_DOMAIN"
-
+DEFAULT_UNIVERSE = "googleapis.com"
 # Parameters accepted by the stack, but not visible via discovery.
 # TODO(dhermes): Remove 'userip' in 'v2'.
 STACK_QUERY_PARAMETERS = frozenset(["trace", "pp", "userip", "strict"])
@@ -565,7 +565,8 @@ def build_from_document(
         )
         base = base.replace(universe.DEFAULT_UNIVERSE, universe_domain)
     else:
-        if client_options.universe_domain:
+        client_universe = getattr(client_options, "universe_domain", None)
+        if client_universe:
             raise APICoreVersionError
 
     audience_for_self_signed_jwt = base
@@ -606,6 +607,11 @@ def build_from_document(
                     quota_project_id=client_options.quota_project_id,
                 )
 
+            if not HAS_UNIVERSE:
+                credentials_universe = getattr(credentials, "universe_domain", None)
+                if credentials_universe and credentials_universe != DEFAULT_UNIVERSE:
+                    raise APICoreVersionError
+
             # The credentials need to be scoped.
             # If the user provided scopes via client_options don't override them
             if not client_options.scopes:
@@ -696,12 +702,6 @@ def build_from_document(
                     )
                 base = mtls_endpoint
 
-    if not HAS_UNIVERSE:
-        credentials = getattr(http, "credentials", None)
-        universe_domain = getattr(credentials, "universe_domain", None)
-        if universe_domain != "googleapis.com":
-                raise APICoreVersionError
-
     if model is None:
         features = service.get("features", [])
         model = JsonModel("dataWrapper" in features)

tests/test_discovery.py

@@ -542,7 +542,7 @@ def test_credentials_and_credentials_file_mutually_exclusive(self):
 
 class DiscoveryFromDocument(unittest.TestCase):
     MOCK_CREDENTIALS = mock.Mock(spec=google.auth.credentials.Credentials)
-
+    MOCK_CREDENTIALS.universe_domain = None
     def test_can_build_from_local_document(self):
         discovery = read_datafile("plus.json")
         plus = build_from_document(
@@ -694,6 +694,7 @@ def test_scopes_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.default_credentials") as default:
+            default.return_value.universe_domain = None
             plus = build_from_document(
                 discovery,
                 client_options={"scopes": ["1", "2"]},
@@ -705,6 +706,7 @@ def test_quota_project_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.default_credentials") as default:
+            default.return_value.universe_domain = None
             plus = build_from_document(
                 discovery,
                 client_options=google.api_core.client_options.ClientOptions(
@@ -718,6 +720,7 @@ def test_credentials_file_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.credentials_from_file") as default:
+            default.return_value.universe_domain = None
             plus = build_from_document(
                 discovery,
                 client_options=google.api_core.client_options.ClientOptions(
@@ -773,6 +776,7 @@ def test_self_signed_jwt_disabled(self):
 
 class DiscoveryFromDocumentMutualTLS(unittest.TestCase):
     MOCK_CREDENTIALS = mock.Mock(spec=google.auth.credentials.Credentials)
+    MOCK_CREDENTIALS.universe_domain = None
     ADC_CERT_PATH = "adc_cert_path"
     ADC_KEY_PATH = "adc_key_path"
     ADC_PASSPHRASE = "adc_passphrase"
@@ -1529,6 +1533,7 @@ def test_plus_resources(self):
     @unittest.skipIf(not HAS_OAUTH2CLIENT, "oauth2client unavailable.")
     def test_oauth2client_credentials(self):
         credentials = mock.Mock(spec=GoogleCredentials)
+        credentials.universe_domain = None
         credentials.create_scoped_required.return_value = False
 
         discovery = read_datafile("plus.json")
@@ -1537,6 +1542,7 @@ def test_oauth2client_credentials(self):
 
     def test_google_auth_credentials(self):
         credentials = mock.Mock(spec=google.auth.credentials.Credentials)
+        credentials.universe_domain = None
         discovery = read_datafile("plus.json")
         service = build_from_document(discovery, credentials=credentials)