fix: disable universe-domain validation (#13243)

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 693215877 Source-Link: googleapis/googleapis@bb6b53e Source-Link: googleapis/googleapis-gen@db8b5a9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWZpbGVzdG9yZS8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWZ1bmN0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdkY2hhcmR3YXJlbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1iYWNrdXAvLk93bEJvdC55YW1sIiwiaCI6ImRiOGI1YTkzNDg0YWQ0NDA1NWIyYmFjYzRjN2NmODdlOTcwZmUwZWQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1jb25uZWN0LWdhdGV3YXkvLk93bEJvdC55YW1sIiwiaCI6ImRiOGI1YTkzNDg0YWQ0NDA1NWIyYmFjYzRjN2NmODdlOTcwZmUwZWQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1odWIvLk93bEJvdC55YW1sIiwiaCI6ImRiOGI1YTkzNDg0YWQ0NDA1NWIyYmFjYzRjN2NmODdlOTcwZmUwZWQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1tdWx0aWNsb3VkLy5Pd2xCb3QueWFtbCIsImgiOiJkYjhiNWE5MzQ4NGFkNDQwNTViMmJhY2M0YzdjZjg3ZTk3MGZlMGVkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdzdWl0ZWFkZG9ucy8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhbS8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhcC8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlkcy8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy1pbnZlbnRvcnkvLk93bEJvdC55YW1sIiwiaCI6ImRiOGI1YTkzNDg0YWQ0NDA1NWIyYmFjYzRjN2NmODdlOTcwZmUwZWQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxhbmd1YWdlLy5Pd2xCb3QueWFtbCIsImgiOiJkYjhiNWE5MzQ4NGFkNDQwNTViMmJhY2M0YzdjZjg3ZTk3MGZlMGVkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxpZmUtc2NpZW5jZXMvLk93bEJvdC55YW1sIiwiaCI6ImRiOGI1YTkzNDg0YWQ0NDA1NWIyYmFjYzRjN2NmODdlOTcwZmUwZWQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1hbmFnZWQtaWRlbnRpdGllcy8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1hbmFnZWRrYWZrYS8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lZGlhLXRyYW5zbGF0aW9uLy5Pd2xCb3QueWFtbCIsImgiOiJkYjhiNWE5MzQ4NGFkNDQwNTViMmJhY2M0YzdjZjg3ZTk3MGZlMGVkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lbWNhY2hlLy5Pd2xCb3QueWFtbCIsImgiOiJkYjhiNWE5MzQ4NGFkNDQwNTViMmJhY2M0YzdjZjg3ZTk3MGZlMGVkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1pZ3JhdGlvbmNlbnRlci8uT3dsQm90LnlhbWwiLCJoIjoiZGI4YjVhOTM0ODRhZDQ0MDU1YjJiYWNjNGM3Y2Y4N2U5NzBmZTBlZCJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Victor Chudnovsky <vchudnov@google.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-filestore/google/cloud/filestore/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.10.0" # {x-release-please-version}
+__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-filestore/google/cloud/filestore_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.10.0" # {x-release-please-version}
+__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py

@@ -542,36 +542,6 @@ def _get_universe_domain(
  raise ValueError("Universe Domain cannot be an empty string.")
  return universe_domain
 
- @staticmethod
- def _compare_universes(
- client_universe: str, credentials: ga_credentials.Credentials
- ) -> bool:
- """Returns True iff the universe domains used by the client and credentials match.
-
- Args:
- client_universe (str): The universe domain configured via the client options.
- credentials (ga_credentials.Credentials): The credentials being used in the client.
-
- Returns:
- bool: True iff client_universe matches the universe in credentials.
-
- Raises:
- ValueError: when client_universe does not match the universe in credentials.
- """
-
- default_universe = CloudFilestoreManagerClient._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):
  """Validates client's and credentials' universe domains are consistent.
 
@@ -581,13 +551,9 @@ def _validate_universe_domain(self):
  Raises:
  ValueError: If the configured universe domain is not valid.
  """
- self._is_universe_domain_valid = (
- self._is_universe_domain_valid
- or CloudFilestoreManagerClient._compare_universes(
- self.universe_domain, self.transport._credentials
- )
- )
- return self._is_universe_domain_valid
+
+ # NOTE (b/349488459): universe validation is disabled until further notice.
+ return True
 
  @property
  def api_endpoint(self):

packages/google-cloud-filestore/samples/generated_samples/snippet_metadata_google.cloud.filestore.v1.json

@@ -8,7 +8,7 @@
  ],
  "language": "PYTHON",
  "name": "google-cloud-filestore",
- "version": "1.10.0"
+ "version": "0.1.0"
  },
  "snippets": [
  {

packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py

@@ -351,94 +351,6 @@ def test__get_universe_domain():
  assert str(excinfo.value) == "Universe Domain cannot be an empty string."
 
 
-@pytest.mark.parametrize(
- "client_class,transport_class,transport_name",
- [
- (
- CloudFilestoreManagerClient,
- transports.CloudFilestoreManagerGrpcTransport,
- "grpc",
- ),
- (
- CloudFilestoreManagerClient,
- transports.CloudFilestoreManagerRestTransport,
- "rest",
- ),
- ],
-)
-def test__validate_universe_domain(client_class, transport_class, transport_name):
- client = client_class(
- transport=transport_class(credentials=ga_credentials.AnonymousCredentials())
- )
- assert client._validate_universe_domain() == True
-
- # Test the case when universe is already validated.
- assert client._validate_universe_domain() == True
-
- if transport_name == "grpc":
- # Test the case where credentials are provided by the
- # `local_channel_credentials`. The default universes in both match.
- channel = grpc.secure_channel(
- "http://localhost/", grpc.local_channel_credentials()
- )
- client = client_class(transport=transport_class(channel=channel))
- assert client._validate_universe_domain() == True
-
- # Test the case where credentials do not exist: e.g. a transport is provided
- # with no credentials. Validation should still succeed because there is no
- # mismatch with non-existent credentials.
- channel = grpc.secure_channel(
- "http://localhost/", grpc.local_channel_credentials()
- )
- transport = transport_class(channel=channel)
- transport._credentials = None
- client = client_class(transport=transport)
- assert client._validate_universe_domain() == True
-
- # TODO: This is needed to cater for older versions of google-auth
- # Make this test unconditional once the minimum supported version of
- # google-auth becomes 2.23.0 or higher.
- google_auth_major, google_auth_minor = [
- int(part) for part in google.auth.__version__.split(".")[0:2]
- ]
- if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23):
- credentials = ga_credentials.AnonymousCredentials()
- credentials._universe_domain = "foo.com"
- # Test the case when there is a universe mismatch from the credentials.
- client = client_class(transport=transport_class(credentials=credentials))
- with pytest.raises(ValueError) as excinfo:
- client._validate_universe_domain()
- assert (
- str(excinfo.value)
- == "The configured universe domain (googleapis.com) does not match the universe domain found in the credentials (foo.com). If you haven't configured the universe domain explicitly, `googleapis.com` is the default."
- )
-
- # Test the case when there is a universe mismatch from the client.
- #
- # TODO: Make this test unconditional once the minimum supported version of
- # google-api-core becomes 2.15.0 or higher.
- api_core_major, api_core_minor = [
- int(part) for part in api_core_version.__version__.split(".")[0:2]
- ]
- if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15):
- client = client_class(
- client_options={"universe_domain": "bar.com"},
- transport=transport_class(
- credentials=ga_credentials.AnonymousCredentials(),
- ),
- )
- with pytest.raises(ValueError) as excinfo:
- client._validate_universe_domain()
- assert (
- str(excinfo.value)
- == "The configured universe domain (bar.com) does not match the universe domain found in the credentials (googleapis.com). If you haven't configured the universe domain explicitly, `googleapis.com` is the default."
- )
-
- # Test that ValueError is raised if universe_domain is provided via client options and credentials is None
- with pytest.raises(ValueError):
- client._compare_universes("foo.bar", None)
-
-
 @pytest.mark.parametrize(
  "client_class,transport_name",
  [

packages/google-cloud-functions/google/cloud/functions/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.18.0" # {x-release-please-version}
+__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-functions/google/cloud/functions_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.18.0" # {x-release-please-version}
+__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py

@@ -523,36 +523,6 @@ def _get_universe_domain(
  raise ValueError("Universe Domain cannot be an empty string.")
  return universe_domain
 
- @staticmethod
- def _compare_universes(
- client_universe: str, credentials: ga_credentials.Credentials
- ) -> bool:
- """Returns True iff the universe domains used by the client and credentials match.
-
- Args:
- client_universe (str): The universe domain configured via the client options.
- credentials (ga_credentials.Credentials): The credentials being used in the client.
-
- Returns:
- bool: True iff client_universe matches the universe in credentials.
-
- Raises:
- ValueError: when client_universe does not match the universe in credentials.
- """
-
- default_universe = CloudFunctionsServiceClient._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):
  """Validates client's and credentials' universe domains are consistent.
 
@@ -562,13 +532,9 @@ def _validate_universe_domain(self):
  Raises:
  ValueError: If the configured universe domain is not valid.
  """
- self._is_universe_domain_valid = (
- self._is_universe_domain_valid
- or CloudFunctionsServiceClient._compare_universes(
- self.universe_domain, self.transport._credentials
- )
- )
- return self._is_universe_domain_valid
+
+ # NOTE (b/349488459): universe validation is disabled until further notice.
+ return True
 
  @property
  def api_endpoint(self):

packages/google-cloud-functions/google/cloud/functions_v2/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.18.0" # {x-release-please-version}
+__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py

@@ -676,36 +676,6 @@ def _get_universe_domain(
  raise ValueError("Universe Domain cannot be an empty string.")
  return universe_domain
 
- @staticmethod
- def _compare_universes(
- client_universe: str, credentials: ga_credentials.Credentials
- ) -> bool:
- """Returns True iff the universe domains used by the client and credentials match.
-
- Args:
- client_universe (str): The universe domain configured via the client options.
- credentials (ga_credentials.Credentials): The credentials being used in the client.
-
- Returns:
- bool: True iff client_universe matches the universe in credentials.
-
- Raises:
- ValueError: when client_universe does not match the universe in credentials.
- """
-
- default_universe = FunctionServiceClient._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):
  """Validates client's and credentials' universe domains are consistent.
 
@@ -715,13 +685,9 @@ def _validate_universe_domain(self):
  Raises:
  ValueError: If the configured universe domain is not valid.
  """
- self._is_universe_domain_valid = (
- self._is_universe_domain_valid
- or FunctionServiceClient._compare_universes(
- self.universe_domain, self.transport._credentials
- )
- )
- return self._is_universe_domain_valid
+
+ # NOTE (b/349488459): universe validation is disabled until further notice.
+ return True
 
  @property
  def api_endpoint(self):