@@ -559,36 +559,6 @@ def _get_universe_domain(
559
559
raise ValueError ("Universe Domain cannot be an empty string." )
560
560
return universe_domain
561
561
562
- @staticmethod
563
- def _compare_universes (
564
- client_universe : str , credentials : ga_credentials .Credentials
565
- ) -> bool :
566
- """Returns True iff the universe domains used by the client and credentials match.
567
-
568
- Args:
569
- client_universe (str): The universe domain configured via the client options.
570
- credentials (ga_credentials.Credentials): The credentials being used in the client.
571
-
572
- Returns:
573
- bool: True iff client_universe matches the universe in credentials.
574
-
575
- Raises:
576
- ValueError: when client_universe does not match the universe in credentials.
577
- """
578
-
579
- default_universe = FeatureOnlineStoreAdminServiceClient ._DEFAULT_UNIVERSE
580
- credentials_universe = getattr (credentials , "universe_domain" , default_universe )
581
-
582
- if client_universe != credentials_universe :
583
- raise ValueError (
584
- "The configured universe domain "
585
- f"({ client_universe } ) does not match the universe domain "
586
- f"found in the credentials ({ credentials_universe } ). "
587
- "If you haven't configured the universe domain explicitly, "
588
- f"`{ default_universe } ` is the default."
589
- )
590
- return True
591
-
592
562
def _validate_universe_domain (self ):
593
563
"""Validates client's and credentials' universe domains are consistent.
594
564
@@ -598,13 +568,9 @@ def _validate_universe_domain(self):
598
568
Raises:
599
569
ValueError: If the configured universe domain is not valid.
600
570
"""
601
- self ._is_universe_domain_valid = (
602
- self ._is_universe_domain_valid
603
- or FeatureOnlineStoreAdminServiceClient ._compare_universes (
604
- self .universe_domain , self .transport ._credentials
605
- )
606
- )
607
- return self ._is_universe_domain_valid
571
+
572
+ # NOTE (b/349488459): universe validation is disabled until further notice.
573
+ return True
608
574
609
575
@property
610
576
def api_endpoint (self ):
0 commit comments