Skip to content

Commit d72e64c

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
fix: [Many APIs] Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' (#12269)
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE fix: Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' fix: Add google-auth as a direct dependency fix: Add staticmethod decorator to _get_client_cert_source and _get_api_endpoint END_COMMIT_OVERRIDE Use gapic-generator-typescript v4.4.0. PiperOrigin-RevId: 603757799 Source-Link: googleapis/googleapis@1a45bf7 Source-Link: googleapis/googleapis-gen@19ca4b4 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpYWxvZ2Zsb3ctY3gvLk93bEJvdC55YW1sIiwiaCI6IjE5Y2E0YjQ1YTUzZDAwY2I3YmRkOTRiNDQyYjYwYmQyMzdkZmUxMjMifQ== --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent 780c5f1 commit d72e64c

File tree

36 files changed

+4257
-4405
lines changed

36 files changed

+4257
-4405
lines changed

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ def _read_environment_variables():
534534
)
535535
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
536536

537+
@staticmethod
537538
def _get_client_cert_source(provided_cert_source, use_cert_flag):
538539
"""Return the client cert source to be used by the client.
539540
@@ -552,6 +553,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
552553
client_cert_source = mtls.default_client_cert_source()
553554
return client_cert_source
554555

556+
@staticmethod
555557
def _get_api_endpoint(
556558
api_override, client_cert_source, universe_domain, use_mtls_endpoint
557559
):
@@ -626,17 +628,18 @@ def _compare_universes(
626628
Raises:
627629
ValueError: when client_universe does not match the universe in credentials.
628630
"""
629-
if credentials:
630-
credentials_universe = credentials.universe_domain
631-
if client_universe != credentials_universe:
632-
default_universe = AgentsClient._DEFAULT_UNIVERSE
633-
raise ValueError(
634-
"The configured universe domain "
635-
f"({client_universe}) does not match the universe domain "
636-
f"found in the credentials ({credentials_universe}). "
637-
"If you haven't configured the universe domain explicitly, "
638-
f"`{default_universe}` is the default."
639-
)
631+
632+
default_universe = AgentsClient._DEFAULT_UNIVERSE
633+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
634+
635+
if client_universe != credentials_universe:
636+
raise ValueError(
637+
"The configured universe domain "
638+
f"({client_universe}) does not match the universe domain "
639+
f"found in the credentials ({credentials_universe}). "
640+
"If you haven't configured the universe domain explicitly, "
641+
f"`{default_universe}` is the default."
642+
)
640643
return True
641644

642645
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ def _read_environment_variables():
388388
)
389389
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
390390

391+
@staticmethod
391392
def _get_client_cert_source(provided_cert_source, use_cert_flag):
392393
"""Return the client cert source to be used by the client.
393394
@@ -406,6 +407,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
406407
client_cert_source = mtls.default_client_cert_source()
407408
return client_cert_source
408409

410+
@staticmethod
409411
def _get_api_endpoint(
410412
api_override, client_cert_source, universe_domain, use_mtls_endpoint
411413
):
@@ -480,17 +482,18 @@ def _compare_universes(
480482
Raises:
481483
ValueError: when client_universe does not match the universe in credentials.
482484
"""
483-
if credentials:
484-
credentials_universe = credentials.universe_domain
485-
if client_universe != credentials_universe:
486-
default_universe = ChangelogsClient._DEFAULT_UNIVERSE
487-
raise ValueError(
488-
"The configured universe domain "
489-
f"({client_universe}) does not match the universe domain "
490-
f"found in the credentials ({credentials_universe}). "
491-
"If you haven't configured the universe domain explicitly, "
492-
f"`{default_universe}` is the default."
493-
)
485+
486+
default_universe = ChangelogsClient._DEFAULT_UNIVERSE
487+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
488+
489+
if client_universe != credentials_universe:
490+
raise ValueError(
491+
"The configured universe domain "
492+
f"({client_universe}) does not match the universe domain "
493+
f"found in the credentials ({credentials_universe}). "
494+
"If you haven't configured the universe domain explicitly, "
495+
f"`{default_universe}` is the default."
496+
)
494497
return True
495498

496499
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ def _read_environment_variables():
468468
)
469469
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
470470

471+
@staticmethod
471472
def _get_client_cert_source(provided_cert_source, use_cert_flag):
472473
"""Return the client cert source to be used by the client.
473474
@@ -486,6 +487,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
486487
client_cert_source = mtls.default_client_cert_source()
487488
return client_cert_source
488489

490+
@staticmethod
489491
def _get_api_endpoint(
490492
api_override, client_cert_source, universe_domain, use_mtls_endpoint
491493
):
@@ -560,17 +562,18 @@ def _compare_universes(
560562
Raises:
561563
ValueError: when client_universe does not match the universe in credentials.
562564
"""
563-
if credentials:
564-
credentials_universe = credentials.universe_domain
565-
if client_universe != credentials_universe:
566-
default_universe = DeploymentsClient._DEFAULT_UNIVERSE
567-
raise ValueError(
568-
"The configured universe domain "
569-
f"({client_universe}) does not match the universe domain "
570-
f"found in the credentials ({credentials_universe}). "
571-
"If you haven't configured the universe domain explicitly, "
572-
f"`{default_universe}` is the default."
573-
)
565+
566+
default_universe = DeploymentsClient._DEFAULT_UNIVERSE
567+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
568+
569+
if client_universe != credentials_universe:
570+
raise ValueError(
571+
"The configured universe domain "
572+
f"({client_universe}) does not match the universe domain "
573+
f"found in the credentials ({credentials_universe}). "
574+
"If you haven't configured the universe domain explicitly, "
575+
f"`{default_universe}` is the default."
576+
)
574577
return True
575578

576579
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ def _read_environment_variables():
389389
)
390390
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
391391

392+
@staticmethod
392393
def _get_client_cert_source(provided_cert_source, use_cert_flag):
393394
"""Return the client cert source to be used by the client.
394395
@@ -407,6 +408,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
407408
client_cert_source = mtls.default_client_cert_source()
408409
return client_cert_source
409410

411+
@staticmethod
410412
def _get_api_endpoint(
411413
api_override, client_cert_source, universe_domain, use_mtls_endpoint
412414
):
@@ -481,17 +483,18 @@ def _compare_universes(
481483
Raises:
482484
ValueError: when client_universe does not match the universe in credentials.
483485
"""
484-
if credentials:
485-
credentials_universe = credentials.universe_domain
486-
if client_universe != credentials_universe:
487-
default_universe = EntityTypesClient._DEFAULT_UNIVERSE
488-
raise ValueError(
489-
"The configured universe domain "
490-
f"({client_universe}) does not match the universe domain "
491-
f"found in the credentials ({credentials_universe}). "
492-
"If you haven't configured the universe domain explicitly, "
493-
f"`{default_universe}` is the default."
494-
)
486+
487+
default_universe = EntityTypesClient._DEFAULT_UNIVERSE
488+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
489+
490+
if client_universe != credentials_universe:
491+
raise ValueError(
492+
"The configured universe domain "
493+
f"({client_universe}) does not match the universe domain "
494+
f"found in the credentials ({credentials_universe}). "
495+
"If you haven't configured the universe domain explicitly, "
496+
f"`{default_universe}` is the default."
497+
)
495498
return True
496499

497500
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _read_environment_variables():
543543
)
544544
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
545545

546+
@staticmethod
546547
def _get_client_cert_source(provided_cert_source, use_cert_flag):
547548
"""Return the client cert source to be used by the client.
548549
@@ -561,6 +562,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
561562
client_cert_source = mtls.default_client_cert_source()
562563
return client_cert_source
563564

565+
@staticmethod
564566
def _get_api_endpoint(
565567
api_override, client_cert_source, universe_domain, use_mtls_endpoint
566568
):
@@ -635,17 +637,18 @@ def _compare_universes(
635637
Raises:
636638
ValueError: when client_universe does not match the universe in credentials.
637639
"""
638-
if credentials:
639-
credentials_universe = credentials.universe_domain
640-
if client_universe != credentials_universe:
641-
default_universe = EnvironmentsClient._DEFAULT_UNIVERSE
642-
raise ValueError(
643-
"The configured universe domain "
644-
f"({client_universe}) does not match the universe domain "
645-
f"found in the credentials ({credentials_universe}). "
646-
"If you haven't configured the universe domain explicitly, "
647-
f"`{default_universe}` is the default."
648-
)
640+
641+
default_universe = EnvironmentsClient._DEFAULT_UNIVERSE
642+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
643+
644+
if client_universe != credentials_universe:
645+
raise ValueError(
646+
"The configured universe domain "
647+
f"({client_universe}) does not match the universe domain "
648+
f"found in the credentials ({credentials_universe}). "
649+
"If you haven't configured the universe domain explicitly, "
650+
f"`{default_universe}` is the default."
651+
)
649652
return True
650653

651654
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ def _read_environment_variables():
419419
)
420420
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
421421

422+
@staticmethod
422423
def _get_client_cert_source(provided_cert_source, use_cert_flag):
423424
"""Return the client cert source to be used by the client.
424425
@@ -437,6 +438,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
437438
client_cert_source = mtls.default_client_cert_source()
438439
return client_cert_source
439440

441+
@staticmethod
440442
def _get_api_endpoint(
441443
api_override, client_cert_source, universe_domain, use_mtls_endpoint
442444
):
@@ -511,17 +513,18 @@ def _compare_universes(
511513
Raises:
512514
ValueError: when client_universe does not match the universe in credentials.
513515
"""
514-
if credentials:
515-
credentials_universe = credentials.universe_domain
516-
if client_universe != credentials_universe:
517-
default_universe = ExperimentsClient._DEFAULT_UNIVERSE
518-
raise ValueError(
519-
"The configured universe domain "
520-
f"({client_universe}) does not match the universe domain "
521-
f"found in the credentials ({credentials_universe}). "
522-
"If you haven't configured the universe domain explicitly, "
523-
f"`{default_universe}` is the default."
524-
)
516+
517+
default_universe = ExperimentsClient._DEFAULT_UNIVERSE
518+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
519+
520+
if client_universe != credentials_universe:
521+
raise ValueError(
522+
"The configured universe domain "
523+
f"({client_universe}) does not match the universe domain "
524+
f"found in the credentials ({credentials_universe}). "
525+
"If you haven't configured the universe domain explicitly, "
526+
f"`{default_universe}` is the default."
527+
)
525528
return True
526529

527530
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ def _read_environment_variables():
518518
)
519519
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
520520

521+
@staticmethod
521522
def _get_client_cert_source(provided_cert_source, use_cert_flag):
522523
"""Return the client cert source to be used by the client.
523524
@@ -536,6 +537,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
536537
client_cert_source = mtls.default_client_cert_source()
537538
return client_cert_source
538539

540+
@staticmethod
539541
def _get_api_endpoint(
540542
api_override, client_cert_source, universe_domain, use_mtls_endpoint
541543
):
@@ -610,17 +612,18 @@ def _compare_universes(
610612
Raises:
611613
ValueError: when client_universe does not match the universe in credentials.
612614
"""
613-
if credentials:
614-
credentials_universe = credentials.universe_domain
615-
if client_universe != credentials_universe:
616-
default_universe = FlowsClient._DEFAULT_UNIVERSE
617-
raise ValueError(
618-
"The configured universe domain "
619-
f"({client_universe}) does not match the universe domain "
620-
f"found in the credentials ({credentials_universe}). "
621-
"If you haven't configured the universe domain explicitly, "
622-
f"`{default_universe}` is the default."
623-
)
615+
616+
default_universe = FlowsClient._DEFAULT_UNIVERSE
617+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
618+
619+
if client_universe != credentials_universe:
620+
raise ValueError(
621+
"The configured universe domain "
622+
f"({client_universe}) does not match the universe domain "
623+
f"found in the credentials ({credentials_universe}). "
624+
"If you haven't configured the universe domain explicitly, "
625+
f"`{default_universe}` is the default."
626+
)
624627
return True
625628

626629
def _validate_universe_domain(self):

‎packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ def _read_environment_variables():
389389
)
390390
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
391391

392+
@staticmethod
392393
def _get_client_cert_source(provided_cert_source, use_cert_flag):
393394
"""Return the client cert source to be used by the client.
394395
@@ -407,6 +408,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
407408
client_cert_source = mtls.default_client_cert_source()
408409
return client_cert_source
409410

411+
@staticmethod
410412
def _get_api_endpoint(
411413
api_override, client_cert_source, universe_domain, use_mtls_endpoint
412414
):
@@ -481,17 +483,18 @@ def _compare_universes(
481483
Raises:
482484
ValueError: when client_universe does not match the universe in credentials.
483485
"""
484-
if credentials:
485-
credentials_universe = credentials.universe_domain
486-
if client_universe != credentials_universe:
487-
default_universe = GeneratorsClient._DEFAULT_UNIVERSE
488-
raise ValueError(
489-
"The configured universe domain "
490-
f"({client_universe}) does not match the universe domain "
491-
f"found in the credentials ({credentials_universe}). "
492-
"If you haven't configured the universe domain explicitly, "
493-
f"`{default_universe}` is the default."
494-
)
486+
487+
default_universe = GeneratorsClient._DEFAULT_UNIVERSE
488+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
489+
490+
if client_universe != credentials_universe:
491+
raise ValueError(
492+
"The configured universe domain "
493+
f"({client_universe}) does not match the universe domain "
494+
f"found in the credentials ({credentials_universe}). "
495+
"If you haven't configured the universe domain explicitly, "
496+
f"`{default_universe}` is the default."
497+
)
495498
return True
496499

497500
def _validate_universe_domain(self):

0 commit comments

Comments
 (0)