google-cloud-container 2.53.0__tar.gz → 2.54.0__tar.gz

{google_cloud_container-2.53.0/google_cloud_container.egg-info → google_cloud_container-2.54.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-container
-Version: 2.53.0
+Version: 2.54.0
 Summary: Google Cloud Container API client library
 Home-page: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container
 Author: Google LLC

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container/__init__.py

@@ -64,6 +64,7 @@ from google.cloud.container_v1.types.cluster_service import (
     DefaultSnatStatus,
     DeleteClusterRequest,
     DeleteNodePoolRequest,
+    DesiredEnterpriseConfig,
     DnsCacheConfig,
     DNSConfig,
     EnterpriseConfig,
@@ -193,6 +194,7 @@ from google.cloud.container_v1.types.cluster_service import (
     UpdateNodePoolRequest,
     UpgradeAvailableEvent,
     UpgradeEvent,
+    UpgradeInfoEvent,
     UpgradeResourceType,
     UsableSubnetwork,
     UsableSubnetworkSecondaryRange,
@@ -246,6 +248,7 @@ __all__ = (
     "DefaultSnatStatus",
     "DeleteClusterRequest",
     "DeleteNodePoolRequest",
+    "DesiredEnterpriseConfig",
     "DnsCacheConfig",
     "DNSConfig",
     "EnterpriseConfig",
@@ -370,6 +373,7 @@ __all__ = (
     "UpdateNodePoolRequest",
     "UpgradeAvailableEvent",
     "UpgradeEvent",
+    "UpgradeInfoEvent",
     "UsableSubnetwork",
     "UsableSubnetworkSecondaryRange",
     "UserManagedKeysConfig",

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container/gapic_version.py

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

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container_v1/__init__.py

@@ -59,6 +59,7 @@ from .types.cluster_service import (
     DefaultSnatStatus,
     DeleteClusterRequest,
     DeleteNodePoolRequest,
+    DesiredEnterpriseConfig,
     DnsCacheConfig,
     DNSConfig,
     EnterpriseConfig,
@@ -188,6 +189,7 @@ from .types.cluster_service import (
     UpdateNodePoolRequest,
     UpgradeAvailableEvent,
     UpgradeEvent,
+    UpgradeInfoEvent,
     UpgradeResourceType,
     UsableSubnetwork,
     UsableSubnetworkSecondaryRange,
@@ -243,6 +245,7 @@ __all__ = (
     "DefaultSnatStatus",
     "DeleteClusterRequest",
     "DeleteNodePoolRequest",
+    "DesiredEnterpriseConfig",
     "DnsCacheConfig",
     "EnterpriseConfig",
     "EphemeralStorageLocalSsdConfig",
@@ -371,6 +374,7 @@ __all__ = (
     "UpdateNodePoolRequest",
     "UpgradeAvailableEvent",
     "UpgradeEvent",
+    "UpgradeInfoEvent",
     "UpgradeResourceType",
     "UsableSubnetwork",
     "UsableSubnetworkSecondaryRange",

{google_cloud_container-2.53.0/google/cloud/container_v1beta1 → google_cloud_container-2.54.0/google/cloud/container_v1}/gapic_version.py

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

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container_v1/services/cluster_manager/client.py

@@ -506,36 +506,6 @@ class ClusterManagerClient(metaclass=ClusterManagerClientMeta):
             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 = ClusterManagerClient._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.
 
@@ -545,13 +515,9 @@ class ClusterManagerClient(metaclass=ClusterManagerClientMeta):
         Raises:
             ValueError: If the configured universe domain is not valid.
         """
-        self._is_universe_domain_valid = (
-            self._is_universe_domain_valid
-            or ClusterManagerClient._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):

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container_v1/types/__init__.py

@@ -53,6 +53,7 @@ from .cluster_service import (
     DefaultSnatStatus,
     DeleteClusterRequest,
     DeleteNodePoolRequest,
+    DesiredEnterpriseConfig,
     DnsCacheConfig,
     DNSConfig,
     EnterpriseConfig,
@@ -182,6 +183,7 @@ from .cluster_service import (
     UpdateNodePoolRequest,
     UpgradeAvailableEvent,
     UpgradeEvent,
+    UpgradeInfoEvent,
     UpgradeResourceType,
     UsableSubnetwork,
     UsableSubnetworkSecondaryRange,
@@ -233,6 +235,7 @@ __all__ = (
     "DefaultSnatStatus",
     "DeleteClusterRequest",
     "DeleteNodePoolRequest",
+    "DesiredEnterpriseConfig",
     "DnsCacheConfig",
     "DNSConfig",
     "EnterpriseConfig",
@@ -357,6 +360,7 @@ __all__ = (
     "UpdateNodePoolRequest",
     "UpgradeAvailableEvent",
     "UpgradeEvent",
+    "UpgradeInfoEvent",
     "UsableSubnetwork",
     "UsableSubnetworkSecondaryRange",
     "UserManagedKeysConfig",

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container_v1/types/cluster_service.py

@@ -91,6 +91,7 @@ __protobuf__ = proto.module(
         "ClusterUpdate",
         "AdditionalPodRangesConfig",
         "RangeInfo",
+        "DesiredEnterpriseConfig",
         "Operation",
         "OperationProgress",
         "CreateClusterRequest",
@@ -182,6 +183,7 @@ __protobuf__ = proto.module(
         "NotificationConfig",
         "ConfidentialNodes",
         "UpgradeEvent",
+        "UpgradeInfoEvent",
         "UpgradeAvailableEvent",
         "SecurityBulletinEvent",
         "Autopilot",
@@ -359,7 +361,8 @@ class LinuxNodeConfig(proto.Message):
             net.core.netdev_max_backlog net.core.rmem_max
             net.core.wmem_default net.core.wmem_max net.core.optmem_max
             net.core.somaxconn net.ipv4.tcp_rmem net.ipv4.tcp_wmem
-            net.ipv4.tcp_tw_reuse
+            net.ipv4.tcp_tw_reuse kernel.shmmni kernel.shmmax
+            kernel.shmall
         cgroup_mode (google.cloud.container_v1.types.LinuxNodeConfig.CgroupMode):
             cgroup_mode specifies the cgroup mode to be used on the
             node.
@@ -780,6 +783,11 @@ class NodeConfig(proto.Message):
             Secondary boot disk update strategy.
 
             This field is a member of `oneof`_ ``_secondary_boot_disk_update_strategy``.
+        local_ssd_encryption_mode (google.cloud.container_v1.types.NodeConfig.LocalSsdEncryptionMode):
+            Specifies which method should be used for
+            encrypting the Local SSDs attahced to the node.
+
+            This field is a member of `oneof`_ ``_local_ssd_encryption_mode``.
         effective_cgroup_mode (google.cloud.container_v1.types.NodeConfig.EffectiveCgroupMode):
             Output only. effective_cgroup_mode is the cgroup mode
             actually used by the node pool. It is determined by the
@@ -787,6 +795,29 @@ class NodeConfig(proto.Message):
             cgroup mode based on the cluster creation version.
     """
 
+    class LocalSsdEncryptionMode(proto.Enum):
+        r"""LocalSsdEncryptionMode specifies the method used for
+        encrypting the Local SSDs attached to the node.
+
+        Values:
+            LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED (0):
+                The given node will be encrypted using keys
+                managed by Google infrastructure and the keys
+                will be deleted when the node is deleted.
+            STANDARD_ENCRYPTION (1):
+                The given node will be encrypted using keys
+                managed by Google infrastructure and the keys
+                will be deleted when the node is deleted.
+            EPHEMERAL_KEY_ENCRYPTION (2):
+                The given node will opt-in for using
+                ephemeral key for encryption of Local SSDs.
+                The Local SSDs will not be able to recover data
+                in case of node crash.
+        """
+        LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0
+        STANDARD_ENCRYPTION = 1
+        EPHEMERAL_KEY_ENCRYPTION = 2
+
     class EffectiveCgroupMode(proto.Enum):
         r"""Possible effective cgroup modes for the node.
 
@@ -995,6 +1026,12 @@ class NodeConfig(proto.Message):
             message="SecondaryBootDiskUpdateStrategy",
         )
     )
+    local_ssd_encryption_mode: LocalSsdEncryptionMode = proto.Field(
+        proto.ENUM,
+        number=54,
+        optional=True,
+        enum=LocalSsdEncryptionMode,
+    )
     effective_cgroup_mode: EffectiveCgroupMode = proto.Field(
         proto.ENUM,
         number=55,
@@ -3750,6 +3787,9 @@ class NodePoolAutoConfig(proto.Message):
 
             Currently only ``insecure_kubelet_readonly_port_enabled``
             can be set here.
+        linux_node_config (google.cloud.container_v1.types.LinuxNodeConfig):
+            Output only. Configuration options for Linux
+            nodes.
     """
 
     network_tags: "NetworkTags" = proto.Field(
@@ -3767,6 +3807,11 @@ class NodePoolAutoConfig(proto.Message):
         number=3,
         message="NodeKubeletConfig",
     )
+    linux_node_config: "LinuxNodeConfig" = proto.Field(
+        proto.MESSAGE,
+        number=4,
+        message="LinuxNodeConfig",
+    )
 
 
 class NodePoolDefaults(proto.Message):
@@ -4119,6 +4164,15 @@ class ClusterUpdate(proto.Message):
             created.
 
             This field is a member of `oneof`_ ``_desired_rbac_binding_config``.
+        desired_enterprise_config (google.cloud.container_v1.types.DesiredEnterpriseConfig):
+            The desired enterprise configuration for the
+            cluster.
+        desired_node_pool_auto_config_linux_node_config (google.cloud.container_v1.types.LinuxNodeConfig):
+            The desired Linux node config for all auto-provisioned node
+            pools in autopilot clusters and node auto-provisioning
+            enabled clusters.
+
+            Currently only ``cgroup_mode`` can be set here.
     """
 
     desired_node_version: str = proto.Field(
@@ -4431,6 +4485,16 @@ class ClusterUpdate(proto.Message):
         optional=True,
         message="RBACBindingConfig",
     )
+    desired_enterprise_config: "DesiredEnterpriseConfig" = proto.Field(
+        proto.MESSAGE,
+        number=147,
+        message="DesiredEnterpriseConfig",
+    )
+    desired_node_pool_auto_config_linux_node_config: "LinuxNodeConfig" = proto.Field(
+        proto.MESSAGE,
+        number=150,
+        message="LinuxNodeConfig",
+    )
 
 
 class AdditionalPodRangesConfig(proto.Message):
@@ -4478,6 +4542,22 @@ class RangeInfo(proto.Message):
     )
 
 
+class DesiredEnterpriseConfig(proto.Message):
+    r"""DesiredEnterpriseConfig is a wrapper used for updating
+    enterprise_config.
+
+    Attributes:
+        desired_tier (google.cloud.container_v1.types.EnterpriseConfig.ClusterTier):
+            desired_tier specifies the desired tier of the cluster.
+    """
+
+    desired_tier: "EnterpriseConfig.ClusterTier" = proto.Field(
+        proto.ENUM,
+        number=1,
+        enum="EnterpriseConfig.ClusterTier",
+    )
+
+
 class Operation(proto.Message):
     r"""This operation resource represents operations that may have
     happened or are happening on the cluster. All fields are output
@@ -7624,10 +7704,11 @@ class NodePoolAutoscaling(proto.Message):
         enabled (bool):
             Is autoscaling enabled for this node pool.
         min_node_count (int):
-            Minimum number of nodes for one location in the NodePool.
-            Must be >= 1 and <= max_node_count.
+            Minimum number of nodes for one location in the node pool.
+            Must be greater than or equal to 0 and less than or equal to
+            max_node_count.
         max_node_count (int):
-            Maximum number of nodes for one location in the NodePool.
+            Maximum number of nodes for one location in the node pool.
             Must be >= min_node_count. There has to be enough quota to
             scale up the cluster.
         autoprovisioned (bool):
@@ -7637,14 +7718,14 @@ class NodePoolAutoscaling(proto.Message):
             nodepool.
         total_min_node_count (int):
             Minimum number of nodes in the node pool. Must be greater
-            than 1 less than total_max_node_count. The
-            total_*_node_count fields are mutually exclusive with the
-            \*_node_count fields.
+            than or equal to 0 and less than or equal to
+            total_max_node_count. The total_*_node_count fields are
+            mutually exclusive with the \*_node_count fields.
         total_max_node_count (int):
             Maximum number of nodes in the node pool. Must be greater
-            than total_min_node_count. There has to be enough quota to
-            scale up the cluster. The total_*_node_count fields are
-            mutually exclusive with the \*_node_count fields.
+            than or equal to total_min_node_count. There has to be
+            enough quota to scale up the cluster. The total_*_node_count
+            fields are mutually exclusive with the \*_node_count fields.
     """
 
     class LocationPolicy(proto.Enum):
@@ -9636,6 +9717,98 @@ class UpgradeEvent(proto.Message):
     )
 
 
+class UpgradeInfoEvent(proto.Message):
+    r"""UpgradeInfoEvent is a notification sent to customers about
+    the upgrade information of a resource.
+
+    Attributes:
+        resource_type (google.cloud.container_v1.types.UpgradeResourceType):
+            The resource type associated with the
+            upgrade.
+        operation (str):
+            The operation associated with this upgrade.
+        start_time (google.protobuf.timestamp_pb2.Timestamp):
+            The time when the operation was started.
+        end_time (google.protobuf.timestamp_pb2.Timestamp):
+            The time when the operation ended.
+        current_version (str):
+            The current version before the upgrade.
+        target_version (str):
+            The target version for the upgrade.
+        resource (str):
+            Optional relative path to the resource. For
+            example in node pool upgrades, the relative path
+            of the node pool.
+        state (google.cloud.container_v1.types.UpgradeInfoEvent.State):
+            Output only. The state of the upgrade.
+        description (str):
+            A brief description of the event.
+    """
+
+    class State(proto.Enum):
+        r"""The state of the upgrade.
+
+        Values:
+            STATE_UNSPECIFIED (0):
+                STATE_UNSPECIFIED indicates the state is unspecified.
+            STARTED (3):
+                STARTED indicates the upgrade has started.
+            SUCCEEDED (4):
+                SUCCEEDED indicates the upgrade has completed
+                successfully.
+            FAILED (5):
+                FAILED indicates the upgrade has failed.
+            CANCELED (6):
+                CANCELED indicates the upgrade has canceled.
+        """
+        STATE_UNSPECIFIED = 0
+        STARTED = 3
+        SUCCEEDED = 4
+        FAILED = 5
+        CANCELED = 6
+
+    resource_type: "UpgradeResourceType" = proto.Field(
+        proto.ENUM,
+        number=1,
+        enum="UpgradeResourceType",
+    )
+    operation: str = proto.Field(
+        proto.STRING,
+        number=2,
+    )
+    start_time: timestamp_pb2.Timestamp = proto.Field(
+        proto.MESSAGE,
+        number=3,
+        message=timestamp_pb2.Timestamp,
+    )
+    end_time: timestamp_pb2.Timestamp = proto.Field(
+        proto.MESSAGE,
+        number=4,
+        message=timestamp_pb2.Timestamp,
+    )
+    current_version: str = proto.Field(
+        proto.STRING,
+        number=5,
+    )
+    target_version: str = proto.Field(
+        proto.STRING,
+        number=6,
+    )
+    resource: str = proto.Field(
+        proto.STRING,
+        number=7,
+    )
+    state: State = proto.Field(
+        proto.ENUM,
+        number=8,
+        enum=State,
+    )
+    description: str = proto.Field(
+        proto.STRING,
+        number=11,
+    )
+
+
 class UpgradeAvailableEvent(proto.Message):
     r"""UpgradeAvailableEvent is a notification sent to customers
     when a new available version is released.
@@ -10375,6 +10548,8 @@ class EnterpriseConfig(proto.Message):
         cluster_tier (google.cloud.container_v1.types.EnterpriseConfig.ClusterTier):
             Output only. cluster_tier indicates the effective tier of
             the cluster.
+        desired_tier (google.cloud.container_v1.types.EnterpriseConfig.ClusterTier):
+            desired_tier specifies the desired tier of the cluster.
     """
 
     class ClusterTier(proto.Enum):
@@ -10398,6 +10573,11 @@ class EnterpriseConfig(proto.Message):
         number=1,
         enum=ClusterTier,
     )
+    desired_tier: ClusterTier = proto.Field(
+        proto.ENUM,
+        number=2,
+        enum=ClusterTier,
+    )
 
 
 class SecretManagerConfig(proto.Message):

{google_cloud_container-2.53.0/google/cloud/container_v1 → google_cloud_container-2.54.0/google/cloud/container_v1beta1}/gapic_version.py

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

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/google/cloud/container_v1beta1/services/cluster_manager/client.py

@@ -456,36 +456,6 @@ class ClusterManagerClient(metaclass=ClusterManagerClientMeta):
             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 = ClusterManagerClient._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.
 
@@ -495,13 +465,9 @@ class ClusterManagerClient(metaclass=ClusterManagerClientMeta):
         Raises:
             ValueError: If the configured universe domain is not valid.
         """
-        self._is_universe_domain_valid = (
-            self._is_universe_domain_valid
-            or ClusterManagerClient._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):

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0/google_cloud_container.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-container
-Version: 2.53.0
+Version: 2.54.0
 Summary: Google Cloud Container API client library
 Home-page: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container
 Author: Google LLC

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/tests/unit/gapic/container_v1/test_cluster_manager.py

@@ -323,86 +323,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",
-    [
-        (ClusterManagerClient, transports.ClusterManagerGrpcTransport, "grpc"),
-        (ClusterManagerClient, transports.ClusterManagerRestTransport, "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",
     [

{google_cloud_container-2.53.0 → google_cloud_container-2.54.0}/tests/unit/gapic/container_v1beta1/test_cluster_manager.py

@@ -318,85 +318,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",
-    [
-        (ClusterManagerClient, transports.ClusterManagerGrpcTransport, "grpc"),
-    ],
-)
-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",
     [