fix: Resolve AttributeError 'Credentials' object has no attribute 'un…

…iverse_domain' (#739) * fix: Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' fix: Add google-auth as a direct dependency fix: Add staticmethod decorator to methods added in v1.14.0 chore: Update gapic-generator-python to v1.14.1 PiperOrigin-RevId: 603728206 Source-Link: googleapis/googleapis@9063da8 Source-Link: googleapis/googleapis-gen@891c67d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Lingqing Gan <[email protected]>
googleapis · Feb 5, 2024 · ea4c1f4 · ea4c1f4
1 parent 04efdbd
commit ea4c1f4
Show file tree

Hide file tree

Showing 8 changed files with 500 additions and 532 deletions.
diff --git a/google/cloud/bigquery_storage_v1/services/big_query_read/client.py b/google/cloud/bigquery_storage_v1/services/big_query_read/client.py
@@ -430,6 +430,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -448,6 +449,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -522,17 +524,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = BigQueryReadClient._DEFAULT_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."
-                )
+
+        default_universe = BigQueryReadClient._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):

diff --git a/google/cloud/bigquery_storage_v1/services/big_query_write/client.py b/google/cloud/bigquery_storage_v1/services/big_query_write/client.py
@@ -413,6 +413,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -431,6 +432,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -505,17 +507,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = BigQueryWriteClient._DEFAULT_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."
-                )
+
+        default_universe = BigQueryWriteClient._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):

diff --git a/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py b/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py
@@ -433,6 +433,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -451,6 +452,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -525,17 +527,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = BigQueryReadClient._DEFAULT_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."
-                )
+
+        default_universe = BigQueryReadClient._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):

diff --git a/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py b/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py
@@ -414,6 +414,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -432,6 +433,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -506,17 +508,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = BigQueryWriteClient._DEFAULT_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."
-                )
+
+        default_universe = BigQueryWriteClient._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):