chore: use gapic-generator-python 0.53.4 (#211)

- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

google/cloud/gaming_v1/services/game_server_clusters_service/async_client.py

@@ -19,13 +19,15 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-import google.api_core.client_options as ClientOptions  # type: ignore
+from google.api_core.client_options import ClientOptions  # type: ignore
 from google.api_core import exceptions as core_exceptions  # type: ignore
 from google.api_core import gapic_v1  # type: ignore
 from google.api_core import retry as retries  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.gaming_v1.services.game_server_clusters_service import pagers
@@ -182,18 +184,18 @@ def __init__(
 
     async def list_game_server_clusters(
         self,
-        request: game_server_clusters.ListGameServerClustersRequest = None,
+        request: Union[game_server_clusters.ListGameServerClustersRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListGameServerClustersAsyncPager:
         r"""Lists game server clusters in a given project and
         location.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.ListGameServerClustersRequest`):
+            request (Union[google.cloud.gaming_v1.types.ListGameServerClustersRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.ListGameServerClusters.
             parent (:class:`str`):
@@ -273,17 +275,17 @@ async def list_game_server_clusters(
 
     async def get_game_server_cluster(
         self,
-        request: game_server_clusters.GetGameServerClusterRequest = None,
+        request: Union[game_server_clusters.GetGameServerClusterRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.GameServerCluster:
         r"""Gets details of a single game server cluster.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.GetGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.GetGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.GetGameServerCluster.
             name (:class:`str`):
@@ -352,20 +354,22 @@ async def get_game_server_cluster(
 
     async def create_game_server_cluster(
         self,
-        request: game_server_clusters.CreateGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.CreateGameServerClusterRequest, dict
+        ] = None,
         *,
         parent: str = None,
         game_server_cluster: game_server_clusters.GameServerCluster = None,
         game_server_cluster_id: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Creates a new game server cluster in a given project
         and location.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.CreateGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.CreateGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.CreateGameServerCluster.
             parent (:class:`str`):
@@ -458,17 +462,19 @@ async def create_game_server_cluster(
 
     async def preview_create_game_server_cluster(
         self,
-        request: game_server_clusters.PreviewCreateGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.PreviewCreateGameServerClusterRequest, dict
+        ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewCreateGameServerClusterResponse:
         r"""Previews creation of a new game server cluster in a
         given project and location.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.PreviewCreateGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.PreviewCreateGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.PreviewCreateGameServerCluster.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -517,17 +523,19 @@ async def preview_create_game_server_cluster(
 
     async def delete_game_server_cluster(
         self,
-        request: game_server_clusters.DeleteGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.DeleteGameServerClusterRequest, dict
+        ] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a single game server cluster.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.DeleteGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.DeleteGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.DeleteGameServerCluster.
             name (:class:`str`):
@@ -610,16 +618,18 @@ async def delete_game_server_cluster(
 
     async def preview_delete_game_server_cluster(
         self,
-        request: game_server_clusters.PreviewDeleteGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.PreviewDeleteGameServerClusterRequest, dict
+        ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewDeleteGameServerClusterResponse:
         r"""Previews deletion of a single game server cluster.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.PreviewDeleteGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.PreviewDeleteGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.PreviewDeleteGameServerCluster.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -668,18 +678,20 @@ async def preview_delete_game_server_cluster(
 
     async def update_game_server_cluster(
         self,
-        request: game_server_clusters.UpdateGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.UpdateGameServerClusterRequest, dict
+        ] = None,
         *,
         game_server_cluster: game_server_clusters.GameServerCluster = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Patches a single game server cluster.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.UpdateGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.UpdateGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.UpdateGameServerCluster.
             game_server_cluster (:class:`google.cloud.gaming_v1.types.GameServerCluster`):
@@ -764,16 +776,18 @@ async def update_game_server_cluster(
 
     async def preview_update_game_server_cluster(
         self,
-        request: game_server_clusters.PreviewUpdateGameServerClusterRequest = None,
+        request: Union[
+            game_server_clusters.PreviewUpdateGameServerClusterRequest, dict
+        ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewUpdateGameServerClusterResponse:
         r"""Previews updating a GameServerCluster.
 
         Args:
-            request (:class:`google.cloud.gaming_v1.types.PreviewUpdateGameServerClusterRequest`):
+            request (Union[google.cloud.gaming_v1.types.PreviewUpdateGameServerClusterRequest, dict]):
                 The request object. Request message for
                 GameServerClustersService.UpdateGameServerCluster.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,

google/cloud/gaming_v1/services/game_server_clusters_service/client.py

@@ -30,6 +30,8 @@
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.gaming_v1.services.game_server_clusters_service import pagers
@@ -364,7 +366,7 @@ def list_game_server_clusters(
         request: Union[game_server_clusters.ListGameServerClustersRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListGameServerClustersPager:
@@ -448,7 +450,7 @@ def get_game_server_cluster(
         request: Union[game_server_clusters.GetGameServerClusterRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.GameServerCluster:
@@ -522,7 +524,7 @@ def create_game_server_cluster(
         parent: str = None,
         game_server_cluster: game_server_clusters.GameServerCluster = None,
         game_server_cluster_id: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -629,7 +631,7 @@ def preview_create_game_server_cluster(
             game_server_clusters.PreviewCreateGameServerClusterRequest, dict
         ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewCreateGameServerClusterResponse:
@@ -689,7 +691,7 @@ def delete_game_server_cluster(
         ] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -785,7 +787,7 @@ def preview_delete_game_server_cluster(
             game_server_clusters.PreviewDeleteGameServerClusterRequest, dict
         ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewDeleteGameServerClusterResponse:
@@ -845,7 +847,7 @@ def update_game_server_cluster(
         *,
         game_server_cluster: game_server_clusters.GameServerCluster = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -943,7 +945,7 @@ def preview_update_game_server_cluster(
             game_server_clusters.PreviewUpdateGameServerClusterRequest, dict
         ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> game_server_clusters.PreviewUpdateGameServerClusterResponse:

google/cloud/gaming_v1/services/game_server_clusters_service/transports/base.py

@@ -15,7 +15,6 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth  # type: ignore
@@ -39,15 +38,6 @@
 except pkg_resources.DistributionNotFound:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
 
-try:
-    # google.auth.__version__ was added in 1.26.0
-    _GOOGLE_AUTH_VERSION = google.auth.__version__
-except AttributeError:
-    try:  # try pkg_resources if it is available
-        _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
-    except pkg_resources.DistributionNotFound:  # pragma: NO COVER
-        _GOOGLE_AUTH_VERSION = None
-
 
 class GameServerClustersServiceTransport(abc.ABC):
     """Abstract transport class for GameServerClustersService."""
@@ -97,7 +87,7 @@ def __init__(
             host += ":443"
         self._host = host
 
-        scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
+        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
         # Save the scopes.
         self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
         # Save the credentials.
         self._credentials = credentials
 
-    # TODO(busunkim): This method is in the base transport
-    # to avoid duplicating code across the transport classes. These functions
-    # should be deleted once the minimum required versions of google-auth is increased.
-
-    # TODO: Remove this function once google-auth >= 1.25.0 is required
-    @classmethod
-    def _get_scopes_kwargs(
-        cls, host: str, scopes: Optional[Sequence[str]]
-    ) -> Dict[str, Optional[Sequence[str]]]:
-        """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
-
-        scopes_kwargs = {}
-
-        if _GOOGLE_AUTH_VERSION and (
-            packaging.version.parse(_GOOGLE_AUTH_VERSION)
-            >= packaging.version.parse("1.25.0")
-        ):
-            scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
-        else:
-            scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
-
-        return scopes_kwargs
-
     def _prep_wrapped_messages(self, client_info):
         # Precompute the wrapped methods.
         self._wrapped_methods = {
@@ -253,7 +220,7 @@ def close(self):
         raise NotImplementedError()
 
     @property
-    def operations_client(self) -> operations_v1.OperationsClient:
+    def operations_client(self):
         """Return the client designed to process long-running operations."""
         raise NotImplementedError()
 

google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc.py

@@ -113,7 +113,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc_asyncio.py

@@ -21,7 +21,6 @@
 from google.api_core import operations_v1  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-import packaging.version
 
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore
@@ -160,7 +159,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)