Skip to content

Commit 3f817f4

Browse files
gcf-owl-bot[bot]copybara-github
gcf-owl-bot[bot]
authored and
copybara-github
committed
Copybara import of the project:
-- a002f7f by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 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 -- 5f1540a by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md COPYBARA_INTEGRATE_REVIEW=#3269 from googleapis:owl-bot-copy 5f1540a PiperOrigin-RevId: 604303617
1 parent c205224 commit 3f817f4

File tree

94 files changed

+12258
-12698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+12258
-12698
lines changed

‎google/cloud/aiplatform_v1/services/dataset_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ def _read_environment_variables():
523523
)
524524
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
525525

526+
@staticmethod
526527
def _get_client_cert_source(provided_cert_source, use_cert_flag):
527528
"""Return the client cert source to be used by the client.
528529
@@ -541,6 +542,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
541542
client_cert_source = mtls.default_client_cert_source()
542543
return client_cert_source
543544

545+
@staticmethod
544546
def _get_api_endpoint(
545547
api_override, client_cert_source, universe_domain, use_mtls_endpoint
546548
):
@@ -615,17 +617,18 @@ def _compare_universes(
615617
Raises:
616618
ValueError: when client_universe does not match the universe in credentials.
617619
"""
618-
if credentials:
619-
credentials_universe = credentials.universe_domain
620-
if client_universe != credentials_universe:
621-
default_universe = DatasetServiceClient._DEFAULT_UNIVERSE
622-
raise ValueError(
623-
"The configured universe domain "
624-
f"({client_universe}) does not match the universe domain "
625-
f"found in the credentials ({credentials_universe}). "
626-
"If you haven't configured the universe domain explicitly, "
627-
f"`{default_universe}` is the default."
628-
)
620+
621+
default_universe = DatasetServiceClient._DEFAULT_UNIVERSE
622+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
623+
624+
if client_universe != credentials_universe:
625+
raise ValueError(
626+
"The configured universe domain "
627+
f"({client_universe}) does not match the universe domain "
628+
f"found in the credentials ({credentials_universe}). "
629+
"If you haven't configured the universe domain explicitly, "
630+
f"`{default_universe}` is the default."
631+
)
629632
return True
630633

631634
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/deployment_resource_pool_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ def _read_environment_variables():
442442
)
443443
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
444444

445+
@staticmethod
445446
def _get_client_cert_source(provided_cert_source, use_cert_flag):
446447
"""Return the client cert source to be used by the client.
447448
@@ -460,6 +461,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
460461
client_cert_source = mtls.default_client_cert_source()
461462
return client_cert_source
462463

464+
@staticmethod
463465
def _get_api_endpoint(
464466
api_override, client_cert_source, universe_domain, use_mtls_endpoint
465467
):
@@ -536,17 +538,18 @@ def _compare_universes(
536538
Raises:
537539
ValueError: when client_universe does not match the universe in credentials.
538540
"""
539-
if credentials:
540-
credentials_universe = credentials.universe_domain
541-
if client_universe != credentials_universe:
542-
default_universe = DeploymentResourcePoolServiceClient._DEFAULT_UNIVERSE
543-
raise ValueError(
544-
"The configured universe domain "
545-
f"({client_universe}) does not match the universe domain "
546-
f"found in the credentials ({credentials_universe}). "
547-
"If you haven't configured the universe domain explicitly, "
548-
f"`{default_universe}` is the default."
549-
)
541+
542+
default_universe = DeploymentResourcePoolServiceClient._DEFAULT_UNIVERSE
543+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
544+
545+
if client_universe != credentials_universe:
546+
raise ValueError(
547+
"The configured universe domain "
548+
f"({client_universe}) does not match the universe domain "
549+
f"found in the credentials ({credentials_universe}). "
550+
"If you haven't configured the universe domain explicitly, "
551+
f"`{default_universe}` is the default."
552+
)
550553
return True
551554

552555
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/endpoint_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ def _read_environment_variables():
477477
)
478478
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
479479

480+
@staticmethod
480481
def _get_client_cert_source(provided_cert_source, use_cert_flag):
481482
"""Return the client cert source to be used by the client.
482483
@@ -495,6 +496,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
495496
client_cert_source = mtls.default_client_cert_source()
496497
return client_cert_source
497498

499+
@staticmethod
498500
def _get_api_endpoint(
499501
api_override, client_cert_source, universe_domain, use_mtls_endpoint
500502
):
@@ -569,17 +571,18 @@ def _compare_universes(
569571
Raises:
570572
ValueError: when client_universe does not match the universe in credentials.
571573
"""
572-
if credentials:
573-
credentials_universe = credentials.universe_domain
574-
if client_universe != credentials_universe:
575-
default_universe = EndpointServiceClient._DEFAULT_UNIVERSE
576-
raise ValueError(
577-
"The configured universe domain "
578-
f"({client_universe}) does not match the universe domain "
579-
f"found in the credentials ({credentials_universe}). "
580-
"If you haven't configured the universe domain explicitly, "
581-
f"`{default_universe}` is the default."
582-
)
574+
575+
default_universe = EndpointServiceClient._DEFAULT_UNIVERSE
576+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
577+
578+
if client_universe != credentials_universe:
579+
raise ValueError(
580+
"The configured universe domain "
581+
f"({client_universe}) does not match the universe domain "
582+
f"found in the credentials ({credentials_universe}). "
583+
"If you haven't configured the universe domain explicitly, "
584+
f"`{default_universe}` is the default."
585+
)
583586
return True
584587

585588
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/feature_online_store_admin_service/client.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ def _read_environment_variables():
457457
)
458458
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
459459

460+
@staticmethod
460461
def _get_client_cert_source(provided_cert_source, use_cert_flag):
461462
"""Return the client cert source to be used by the client.
462463
@@ -475,6 +476,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
475476
client_cert_source = mtls.default_client_cert_source()
476477
return client_cert_source
477478

479+
@staticmethod
478480
def _get_api_endpoint(
479481
api_override, client_cert_source, universe_domain, use_mtls_endpoint
480482
):
@@ -551,19 +553,18 @@ def _compare_universes(
551553
Raises:
552554
ValueError: when client_universe does not match the universe in credentials.
553555
"""
554-
if credentials:
555-
credentials_universe = credentials.universe_domain
556-
if client_universe != credentials_universe:
557-
default_universe = (
558-
FeatureOnlineStoreAdminServiceClient._DEFAULT_UNIVERSE
559-
)
560-
raise ValueError(
561-
"The configured universe domain "
562-
f"({client_universe}) does not match the universe domain "
563-
f"found in the credentials ({credentials_universe}). "
564-
"If you haven't configured the universe domain explicitly, "
565-
f"`{default_universe}` is the default."
566-
)
556+
557+
default_universe = FeatureOnlineStoreAdminServiceClient._DEFAULT_UNIVERSE
558+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
559+
560+
if client_universe != credentials_universe:
561+
raise ValueError(
562+
"The configured universe domain "
563+
f"({client_universe}) does not match the universe domain "
564+
f"found in the credentials ({credentials_universe}). "
565+
"If you haven't configured the universe domain explicitly, "
566+
f"`{default_universe}` is the default."
567+
)
567568
return True
568569

569570
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/feature_online_store_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ def _read_environment_variables():
385385
)
386386
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
387387

388+
@staticmethod
388389
def _get_client_cert_source(provided_cert_source, use_cert_flag):
389390
"""Return the client cert source to be used by the client.
390391
@@ -403,6 +404,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
403404
client_cert_source = mtls.default_client_cert_source()
404405
return client_cert_source
405406

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

495498
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/feature_registry_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ def _read_environment_variables():
422422
)
423423
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
424424

425+
@staticmethod
425426
def _get_client_cert_source(provided_cert_source, use_cert_flag):
426427
"""Return the client cert source to be used by the client.
427428
@@ -440,6 +441,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
440441
client_cert_source = mtls.default_client_cert_source()
441442
return client_cert_source
442443

444+
@staticmethod
443445
def _get_api_endpoint(
444446
api_override, client_cert_source, universe_domain, use_mtls_endpoint
445447
):
@@ -516,17 +518,18 @@ def _compare_universes(
516518
Raises:
517519
ValueError: when client_universe does not match the universe in credentials.
518520
"""
519-
if credentials:
520-
credentials_universe = credentials.universe_domain
521-
if client_universe != credentials_universe:
522-
default_universe = FeatureRegistryServiceClient._DEFAULT_UNIVERSE
523-
raise ValueError(
524-
"The configured universe domain "
525-
f"({client_universe}) does not match the universe domain "
526-
f"found in the credentials ({credentials_universe}). "
527-
"If you haven't configured the universe domain explicitly, "
528-
f"`{default_universe}` is the default."
529-
)
521+
522+
default_universe = FeatureRegistryServiceClient._DEFAULT_UNIVERSE
523+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
524+
525+
if client_universe != credentials_universe:
526+
raise ValueError(
527+
"The configured universe domain "
528+
f"({client_universe}) does not match the universe domain "
529+
f"found in the credentials ({credentials_universe}). "
530+
"If you haven't configured the universe domain explicitly, "
531+
f"`{default_universe}` is the default."
532+
)
530533
return True
531534

532535
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/featurestore_online_serving_service/client.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ def _read_environment_variables():
394394
)
395395
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
396396

397+
@staticmethod
397398
def _get_client_cert_source(provided_cert_source, use_cert_flag):
398399
"""Return the client cert source to be used by the client.
399400
@@ -412,6 +413,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
412413
client_cert_source = mtls.default_client_cert_source()
413414
return client_cert_source
414415

416+
@staticmethod
415417
def _get_api_endpoint(
416418
api_override, client_cert_source, universe_domain, use_mtls_endpoint
417419
):
@@ -486,19 +488,18 @@ def _compare_universes(
486488
Raises:
487489
ValueError: when client_universe does not match the universe in credentials.
488490
"""
489-
if credentials:
490-
credentials_universe = credentials.universe_domain
491-
if client_universe != credentials_universe:
492-
default_universe = (
493-
FeaturestoreOnlineServingServiceClient._DEFAULT_UNIVERSE
494-
)
495-
raise ValueError(
496-
"The configured universe domain "
497-
f"({client_universe}) does not match the universe domain "
498-
f"found in the credentials ({credentials_universe}). "
499-
"If you haven't configured the universe domain explicitly, "
500-
f"`{default_universe}` is the default."
501-
)
491+
492+
default_universe = FeaturestoreOnlineServingServiceClient._DEFAULT_UNIVERSE
493+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
494+
495+
if client_universe != credentials_universe:
496+
raise ValueError(
497+
"The configured universe domain "
498+
f"({client_universe}) does not match the universe domain "
499+
f"found in the credentials ({credentials_universe}). "
500+
"If you haven't configured the universe domain explicitly, "
501+
f"`{default_universe}` is the default."
502+
)
502503
return True
503504

504505
def _validate_universe_domain(self):

‎google/cloud/aiplatform_v1/services/featurestore_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ def _read_environment_variables():
449449
)
450450
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
451451

452+
@staticmethod
452453
def _get_client_cert_source(provided_cert_source, use_cert_flag):
453454
"""Return the client cert source to be used by the client.
454455
@@ -467,6 +468,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
467468
client_cert_source = mtls.default_client_cert_source()
468469
return client_cert_source
469470

471+
@staticmethod
470472
def _get_api_endpoint(
471473
api_override, client_cert_source, universe_domain, use_mtls_endpoint
472474
):
@@ -541,17 +543,18 @@ def _compare_universes(
541543
Raises:
542544
ValueError: when client_universe does not match the universe in credentials.
543545
"""
544-
if credentials:
545-
credentials_universe = credentials.universe_domain
546-
if client_universe != credentials_universe:
547-
default_universe = FeaturestoreServiceClient._DEFAULT_UNIVERSE
548-
raise ValueError(
549-
"The configured universe domain "
550-
f"({client_universe}) does not match the universe domain "
551-
f"found in the credentials ({credentials_universe}). "
552-
"If you haven't configured the universe domain explicitly, "
553-
f"`{default_universe}` is the default."
554-
)
546+
547+
default_universe = FeaturestoreServiceClient._DEFAULT_UNIVERSE
548+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
549+
550+
if client_universe != credentials_universe:
551+
raise ValueError(
552+
"The configured universe domain "
553+
f"({client_universe}) does not match the universe domain "
554+
f"found in the credentials ({credentials_universe}). "
555+
"If you haven't configured the universe domain explicitly, "
556+
f"`{default_universe}` is the default."
557+
)
555558
return True
556559

557560
def _validate_universe_domain(self):

0 commit comments

Comments
 (0)