Skip to content
This repository was archived by the owner on Sep 12, 2025. It is now read-only.

Commit ea4c1f4

Browse files
gcf-owl-bot[bot]Linchin
gcf-owl-bot[bot]
and
Linchin
authored
fix: Resolve AttributeError 'Credentials' object has no attribute 'universe_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 <lingqing.gan@gmail.com>
1 parent 04efdbd commit ea4c1f4

File tree

8 files changed

+500
-532
lines changed

8 files changed

+500
-532
lines changed

‎google/cloud/bigquery_storage_v1/services/big_query_read/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ def _read_environment_variables():
430430
)
431431
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
432432

433+
@staticmethod
433434
def _get_client_cert_source(provided_cert_source, use_cert_flag):
434435
"""Return the client cert source to be used by the client.
435436
@@ -448,6 +449,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
448449
client_cert_source = mtls.default_client_cert_source()
449450
return client_cert_source
450451

452+
@staticmethod
451453
def _get_api_endpoint(
452454
api_override, client_cert_source, universe_domain, use_mtls_endpoint
453455
):
@@ -522,17 +524,18 @@ def _compare_universes(
522524
Raises:
523525
ValueError: when client_universe does not match the universe in credentials.
524526
"""
525-
if credentials:
526-
credentials_universe = credentials.universe_domain
527-
if client_universe != credentials_universe:
528-
default_universe = BigQueryReadClient._DEFAULT_UNIVERSE
529-
raise ValueError(
530-
"The configured universe domain "
531-
f"({client_universe}) does not match the universe domain "
532-
f"found in the credentials ({credentials_universe}). "
533-
"If you haven't configured the universe domain explicitly, "
534-
f"`{default_universe}` is the default."
535-
)
527+
528+
default_universe = BigQueryReadClient._DEFAULT_UNIVERSE
529+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
530+
531+
if client_universe != credentials_universe:
532+
raise ValueError(
533+
"The configured universe domain "
534+
f"({client_universe}) does not match the universe domain "
535+
f"found in the credentials ({credentials_universe}). "
536+
"If you haven't configured the universe domain explicitly, "
537+
f"`{default_universe}` is the default."
538+
)
536539
return True
537540

538541
def _validate_universe_domain(self):

‎google/cloud/bigquery_storage_v1/services/big_query_write/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ def _read_environment_variables():
413413
)
414414
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
415415

416+
@staticmethod
416417
def _get_client_cert_source(provided_cert_source, use_cert_flag):
417418
"""Return the client cert source to be used by the client.
418419
@@ -431,6 +432,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
431432
client_cert_source = mtls.default_client_cert_source()
432433
return client_cert_source
433434

435+
@staticmethod
434436
def _get_api_endpoint(
435437
api_override, client_cert_source, universe_domain, use_mtls_endpoint
436438
):
@@ -505,17 +507,18 @@ def _compare_universes(
505507
Raises:
506508
ValueError: when client_universe does not match the universe in credentials.
507509
"""
508-
if credentials:
509-
credentials_universe = credentials.universe_domain
510-
if client_universe != credentials_universe:
511-
default_universe = BigQueryWriteClient._DEFAULT_UNIVERSE
512-
raise ValueError(
513-
"The configured universe domain "
514-
f"({client_universe}) does not match the universe domain "
515-
f"found in the credentials ({credentials_universe}). "
516-
"If you haven't configured the universe domain explicitly, "
517-
f"`{default_universe}` is the default."
518-
)
510+
511+
default_universe = BigQueryWriteClient._DEFAULT_UNIVERSE
512+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
513+
514+
if client_universe != credentials_universe:
515+
raise ValueError(
516+
"The configured universe domain "
517+
f"({client_universe}) does not match the universe domain "
518+
f"found in the credentials ({credentials_universe}). "
519+
"If you haven't configured the universe domain explicitly, "
520+
f"`{default_universe}` is the default."
521+
)
519522
return True
520523

521524
def _validate_universe_domain(self):

‎google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ def _read_environment_variables():
433433
)
434434
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
435435

436+
@staticmethod
436437
def _get_client_cert_source(provided_cert_source, use_cert_flag):
437438
"""Return the client cert source to be used by the client.
438439
@@ -451,6 +452,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
451452
client_cert_source = mtls.default_client_cert_source()
452453
return client_cert_source
453454

455+
@staticmethod
454456
def _get_api_endpoint(
455457
api_override, client_cert_source, universe_domain, use_mtls_endpoint
456458
):
@@ -525,17 +527,18 @@ def _compare_universes(
525527
Raises:
526528
ValueError: when client_universe does not match the universe in credentials.
527529
"""
528-
if credentials:
529-
credentials_universe = credentials.universe_domain
530-
if client_universe != credentials_universe:
531-
default_universe = BigQueryReadClient._DEFAULT_UNIVERSE
532-
raise ValueError(
533-
"The configured universe domain "
534-
f"({client_universe}) does not match the universe domain "
535-
f"found in the credentials ({credentials_universe}). "
536-
"If you haven't configured the universe domain explicitly, "
537-
f"`{default_universe}` is the default."
538-
)
530+
531+
default_universe = BigQueryReadClient._DEFAULT_UNIVERSE
532+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
533+
534+
if client_universe != credentials_universe:
535+
raise ValueError(
536+
"The configured universe domain "
537+
f"({client_universe}) does not match the universe domain "
538+
f"found in the credentials ({credentials_universe}). "
539+
"If you haven't configured the universe domain explicitly, "
540+
f"`{default_universe}` is the default."
541+
)
539542
return True
540543

541544
def _validate_universe_domain(self):

‎google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ def _read_environment_variables():
414414
)
415415
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
416416

417+
@staticmethod
417418
def _get_client_cert_source(provided_cert_source, use_cert_flag):
418419
"""Return the client cert source to be used by the client.
419420
@@ -432,6 +433,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
432433
client_cert_source = mtls.default_client_cert_source()
433434
return client_cert_source
434435

436+
@staticmethod
435437
def _get_api_endpoint(
436438
api_override, client_cert_source, universe_domain, use_mtls_endpoint
437439
):
@@ -506,17 +508,18 @@ def _compare_universes(
506508
Raises:
507509
ValueError: when client_universe does not match the universe in credentials.
508510
"""
509-
if credentials:
510-
credentials_universe = credentials.universe_domain
511-
if client_universe != credentials_universe:
512-
default_universe = BigQueryWriteClient._DEFAULT_UNIVERSE
513-
raise ValueError(
514-
"The configured universe domain "
515-
f"({client_universe}) does not match the universe domain "
516-
f"found in the credentials ({credentials_universe}). "
517-
"If you haven't configured the universe domain explicitly, "
518-
f"`{default_universe}` is the default."
519-
)
511+
512+
default_universe = BigQueryWriteClient._DEFAULT_UNIVERSE
513+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
514+
515+
if client_universe != credentials_universe:
516+
raise ValueError(
517+
"The configured universe domain "
518+
f"({client_universe}) does not match the universe domain "
519+
f"found in the credentials ({credentials_universe}). "
520+
"If you haven't configured the universe domain explicitly, "
521+
f"`{default_universe}` is the default."
522+
)
520523
return True
521524

522525
def _validate_universe_domain(self):

0 commit comments

Comments
 (0)