diff --git a/google/cloud/gaming_v1/services/game_server_clusters_service/async_client.py b/google/cloud/gaming_v1/services/game_server_clusters_service/async_client.py index 4282052b..89e43760 100644 --- a/google/cloud/gaming_v1/services/game_server_clusters_service/async_client.py +++ b/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,10 +184,10 @@ 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: @@ -193,7 +195,7 @@ async def list_game_server_clusters( 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,12 +354,14 @@ 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: @@ -365,7 +369,7 @@ async def create_game_server_cluster( 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,9 +462,11 @@ 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: @@ -468,7 +474,7 @@ async def preview_create_game_server_cluster( 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, diff --git a/google/cloud/gaming_v1/services/game_server_clusters_service/client.py b/google/cloud/gaming_v1/services/game_server_clusters_service/client.py index e7b1175d..7669852a 100644 --- a/google/cloud/gaming_v1/services/game_server_clusters_service/client.py +++ b/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: diff --git a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/base.py b/google/cloud/gaming_v1/services/game_server_clusters_service/transports/base.py index f83bb4be..195a98ca 100644 --- a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/base.py +++ b/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() diff --git a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc.py b/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc.py index b73e715d..4f97f68c 100644 --- a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc.py +++ b/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) diff --git a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc_asyncio.py index ea0bb2b0..e26737e0 100644 --- a/google/cloud/gaming_v1/services/game_server_clusters_service/transports/grpc_asyncio.py +++ b/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) diff --git a/google/cloud/gaming_v1/services/game_server_configs_service/async_client.py b/google/cloud/gaming_v1/services/game_server_configs_service/async_client.py index cf25cf17..e485091c 100644 --- a/google/cloud/gaming_v1/services/game_server_configs_service/async_client.py +++ b/google/cloud/gaming_v1/services/game_server_configs_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_configs_service import pagers @@ -179,10 +181,10 @@ def __init__( async def list_game_server_configs( self, - request: game_server_configs.ListGameServerConfigsRequest = None, + request: Union[game_server_configs.ListGameServerConfigsRequest, 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.ListGameServerConfigsAsyncPager: @@ -190,7 +192,7 @@ async def list_game_server_configs( location, and game server deployment. Args: - request (:class:`google.cloud.gaming_v1.types.ListGameServerConfigsRequest`): + request (Union[google.cloud.gaming_v1.types.ListGameServerConfigsRequest, dict]): The request object. Request message for GameServerConfigsService.ListGameServerConfigs. parent (:class:`str`): @@ -270,17 +272,17 @@ async def list_game_server_configs( async def get_game_server_config( self, - request: game_server_configs.GetGameServerConfigRequest = None, + request: Union[game_server_configs.GetGameServerConfigRequest, 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_configs.GameServerConfig: r"""Gets details of a single game server config. Args: - request (:class:`google.cloud.gaming_v1.types.GetGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1.types.GetGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.GetGameServerConfig. name (:class:`str`): @@ -349,11 +351,11 @@ async def get_game_server_config( async def create_game_server_config( self, - request: game_server_configs.CreateGameServerConfigRequest = None, + request: Union[game_server_configs.CreateGameServerConfigRequest, dict] = None, *, parent: str = None, game_server_config: game_server_configs.GameServerConfig = 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: @@ -364,7 +366,7 @@ async def create_game_server_config( resource. Args: - request (:class:`google.cloud.gaming_v1.types.CreateGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1.types.CreateGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.CreateGameServerConfig. parent (:class:`str`): @@ -446,10 +448,10 @@ async def create_game_server_config( async def delete_game_server_config( self, - request: game_server_configs.DeleteGameServerConfigRequest = None, + request: Union[game_server_configs.DeleteGameServerConfigRequest, 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: @@ -458,7 +460,7 @@ async def delete_game_server_config( game server deployment rollout. Args: - request (:class:`google.cloud.gaming_v1.types.DeleteGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1.types.DeleteGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.DeleteGameServerConfig. name (:class:`str`): diff --git a/google/cloud/gaming_v1/services/game_server_configs_service/client.py b/google/cloud/gaming_v1/services/game_server_configs_service/client.py index 4bc512f8..dcd81328 100644 --- a/google/cloud/gaming_v1/services/game_server_configs_service/client.py +++ b/google/cloud/gaming_v1/services/game_server_configs_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_configs_service import pagers @@ -363,7 +365,7 @@ def list_game_server_configs( request: Union[game_server_configs.ListGameServerConfigsRequest, 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.ListGameServerConfigsPager: @@ -445,7 +447,7 @@ def get_game_server_config( request: Union[game_server_configs.GetGameServerConfigRequest, 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_configs.GameServerConfig: @@ -516,7 +518,7 @@ def create_game_server_config( *, parent: str = None, game_server_config: game_server_configs.GameServerConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -614,7 +616,7 @@ def delete_game_server_config( request: Union[game_server_configs.DeleteGameServerConfigRequest, 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.Operation: diff --git a/google/cloud/gaming_v1/services/game_server_configs_service/transports/base.py b/google/cloud/gaming_v1/services/game_server_configs_service/transports/base.py index 3cb91675..6f622f35 100644 --- a/google/cloud/gaming_v1/services/game_server_configs_service/transports/base.py +++ b/google/cloud/gaming_v1/services/game_server_configs_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 GameServerConfigsServiceTransport(abc.ABC): """Abstract transport class for GameServerConfigsService.""" @@ -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 = { @@ -206,7 +173,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() diff --git a/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc.py b/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc.py index 7898507c..2699ce35 100644 --- a/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc.py +++ b/google/cloud/gaming_v1/services/game_server_configs_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) diff --git a/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc_asyncio.py index 411ba868..acbab8ea 100644 --- a/google/cloud/gaming_v1/services/game_server_configs_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1/services/game_server_configs_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) diff --git a/google/cloud/gaming_v1/services/game_server_deployments_service/async_client.py b/google/cloud/gaming_v1/services/game_server_deployments_service/async_client.py index 30a0c2de..213001c6 100644 --- a/google/cloud/gaming_v1/services/game_server_deployments_service/async_client.py +++ b/google/cloud/gaming_v1/services/game_server_deployments_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_deployments_service import pagers @@ -188,10 +190,12 @@ def __init__( async def list_game_server_deployments( self, - request: game_server_deployments.ListGameServerDeploymentsRequest = None, + request: Union[ + game_server_deployments.ListGameServerDeploymentsRequest, 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.ListGameServerDeploymentsAsyncPager: @@ -199,7 +203,7 @@ async def list_game_server_deployments( location. Args: - request (:class:`google.cloud.gaming_v1.types.ListGameServerDeploymentsRequest`): + request (Union[google.cloud.gaming_v1.types.ListGameServerDeploymentsRequest, dict]): The request object. Request message for GameServerDeploymentsService.ListGameServerDeployments. parent (:class:`str`): @@ -278,17 +282,19 @@ async def list_game_server_deployments( async def get_game_server_deployment( self, - request: game_server_deployments.GetGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.GetGameServerDeploymentRequest, 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_deployments.GameServerDeployment: r"""Gets details of a single game server deployment. Args: - request (:class:`google.cloud.gaming_v1.types.GetGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1.types.GetGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.GetGameServerDeployment. name (:class:`str`): @@ -357,11 +363,13 @@ async def get_game_server_deployment( async def create_game_server_deployment( self, - request: game_server_deployments.CreateGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.CreateGameServerDeploymentRequest, dict + ] = None, *, parent: str = None, game_server_deployment: game_server_deployments.GameServerDeployment = 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: @@ -369,7 +377,7 @@ async def create_game_server_deployment( project and location. Args: - request (:class:`google.cloud.gaming_v1.types.CreateGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1.types.CreateGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.CreateGameServerDeployment. parent (:class:`str`): @@ -450,17 +458,19 @@ async def create_game_server_deployment( async def delete_game_server_deployment( self, - request: game_server_deployments.DeleteGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.DeleteGameServerDeploymentRequest, 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 deployment. Args: - request (:class:`google.cloud.gaming_v1.types.DeleteGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1.types.DeleteGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.DeleteGameServerDeployment. name (:class:`str`): @@ -543,18 +553,20 @@ async def delete_game_server_deployment( async def update_game_server_deployment( self, - request: game_server_deployments.UpdateGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.UpdateGameServerDeploymentRequest, dict + ] = None, *, game_server_deployment: game_server_deployments.GameServerDeployment = 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 game server deployment. Args: - request (:class:`google.cloud.gaming_v1.types.UpdateGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1.types.UpdateGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.UpdateGameServerDeployment. Only allows updates for labels. @@ -640,17 +652,19 @@ async def update_game_server_deployment( async def get_game_server_deployment_rollout( self, - request: game_server_deployments.GetGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.GetGameServerDeploymentRolloutRequest, 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_deployments.GameServerDeploymentRollout: r"""Gets details a single game server deployment rollout. Args: - request (:class:`google.cloud.gaming_v1.types.GetGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1.types.GetGameServerDeploymentRolloutRequest, dict]): The request object. Request message for GameServerDeploymentsService.GetGameServerDeploymentRollout. name (:class:`str`): @@ -722,11 +736,13 @@ async def get_game_server_deployment_rollout( async def update_game_server_deployment_rollout( self, - request: game_server_deployments.UpdateGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.UpdateGameServerDeploymentRolloutRequest, dict + ] = None, *, rollout: game_server_deployments.GameServerDeploymentRollout = 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: @@ -739,7 +755,7 @@ async def update_game_server_deployment_rollout( an error. Args: - request (:class:`google.cloud.gaming_v1.types.UpdateGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1.types.UpdateGameServerDeploymentRolloutRequest, dict]): The request object. Request message for GameServerDeploymentsService.UpdateGameServerRolloutDeployment. rollout (:class:`google.cloud.gaming_v1.types.GameServerDeploymentRollout`): @@ -827,9 +843,11 @@ async def update_game_server_deployment_rollout( async def preview_game_server_deployment_rollout( self, - request: game_server_deployments.PreviewGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.PreviewGameServerDeploymentRolloutRequest, 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_deployments.PreviewGameServerDeploymentRolloutResponse: @@ -837,7 +855,7 @@ async def preview_game_server_deployment_rollout( does not mutate the rollout resource. Args: - request (:class:`google.cloud.gaming_v1.types.PreviewGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1.types.PreviewGameServerDeploymentRolloutRequest, dict]): The request object. Request message for PreviewGameServerDeploymentRollout. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -892,9 +910,11 @@ async def preview_game_server_deployment_rollout( async def fetch_deployment_state( self, - request: game_server_deployments.FetchDeploymentStateRequest = None, + request: Union[ + game_server_deployments.FetchDeploymentStateRequest, 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_deployments.FetchDeploymentStateResponse: @@ -904,7 +924,7 @@ async def fetch_deployment_state( older version of the game server deployment. Args: - request (:class:`google.cloud.gaming_v1.types.FetchDeploymentStateRequest`): + request (Union[google.cloud.gaming_v1.types.FetchDeploymentStateRequest, dict]): The request object. Request message for GameServerDeploymentsService.FetchDeploymentState. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/gaming_v1/services/game_server_deployments_service/client.py b/google/cloud/gaming_v1/services/game_server_deployments_service/client.py index 309e176d..9e202457 100644 --- a/google/cloud/gaming_v1/services/game_server_deployments_service/client.py +++ b/google/cloud/gaming_v1/services/game_server_deployments_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_deployments_service import pagers @@ -388,7 +390,7 @@ def list_game_server_deployments( ] = 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.ListGameServerDeploymentsPager: @@ -475,7 +477,7 @@ def get_game_server_deployment( ] = 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_deployments.GameServerDeployment: @@ -552,7 +554,7 @@ def create_game_server_deployment( *, parent: str = None, game_server_deployment: game_server_deployments.GameServerDeployment = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -650,7 +652,7 @@ def delete_game_server_deployment( ] = 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: @@ -750,7 +752,7 @@ def update_game_server_deployment( *, game_server_deployment: game_server_deployments.GameServerDeployment = 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: @@ -852,7 +854,7 @@ def get_game_server_deployment_rollout( ] = 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_deployments.GameServerDeploymentRollout: @@ -934,7 +936,7 @@ def update_game_server_deployment_rollout( *, rollout: game_server_deployments.GameServerDeploymentRollout = 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: @@ -1043,7 +1045,7 @@ def preview_game_server_deployment_rollout( game_server_deployments.PreviewGameServerDeploymentRolloutRequest, 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_deployments.PreviewGameServerDeploymentRolloutResponse: @@ -1106,7 +1108,7 @@ def fetch_deployment_state( game_server_deployments.FetchDeploymentStateRequest, 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_deployments.FetchDeploymentStateResponse: diff --git a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/base.py b/google/cloud/gaming_v1/services/game_server_deployments_service/transports/base.py index c02361ea..90e5733e 100644 --- a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/base.py +++ b/google/cloud/gaming_v1/services/game_server_deployments_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 GameServerDeploymentsServiceTransport(abc.ABC): """Abstract transport class for GameServerDeploymentsService.""" @@ -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 = { @@ -258,7 +225,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() diff --git a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc.py b/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc.py index 0662ae62..bf6a4d74 100644 --- a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc.py +++ b/google/cloud/gaming_v1/services/game_server_deployments_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) diff --git a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc_asyncio.py index 6087a2a1..c10b515f 100644 --- a/google/cloud/gaming_v1/services/game_server_deployments_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1/services/game_server_deployments_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 @@ -162,7 +161,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) diff --git a/google/cloud/gaming_v1/services/realms_service/async_client.py b/google/cloud/gaming_v1/services/realms_service/async_client.py index 7b884c05..2e743916 100644 --- a/google/cloud/gaming_v1/services/realms_service/async_client.py +++ b/google/cloud/gaming_v1/services/realms_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.realms_service import pagers @@ -171,17 +173,17 @@ def __init__( async def list_realms( self, - request: realms.ListRealmsRequest = None, + request: Union[realms.ListRealmsRequest, 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.ListRealmsAsyncPager: r"""Lists realms in a given project and location. Args: - request (:class:`google.cloud.gaming_v1.types.ListRealmsRequest`): + request (Union[google.cloud.gaming_v1.types.ListRealmsRequest, dict]): The request object. Request message for RealmsService.ListRealms. parent (:class:`str`): @@ -260,17 +262,17 @@ async def list_realms( async def get_realm( self, - request: realms.GetRealmRequest = None, + request: Union[realms.GetRealmRequest, 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]] = (), ) -> realms.Realm: r"""Gets details of a single realm. Args: - request (:class:`google.cloud.gaming_v1.types.GetRealmRequest`): + request (Union[google.cloud.gaming_v1.types.GetRealmRequest, dict]): The request object. Request message for RealmsService.GetRealm. name (:class:`str`): @@ -339,19 +341,19 @@ async def get_realm( async def create_realm( self, - request: realms.CreateRealmRequest = None, + request: Union[realms.CreateRealmRequest, dict] = None, *, parent: str = None, realm: realms.Realm = None, realm_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 realm in a given project and location. Args: - request (:class:`google.cloud.gaming_v1.types.CreateRealmRequest`): + request (Union[google.cloud.gaming_v1.types.CreateRealmRequest, dict]): The request object. Request message for RealmsService.CreateRealm. parent (:class:`str`): @@ -441,17 +443,17 @@ async def create_realm( async def delete_realm( self, - request: realms.DeleteRealmRequest = None, + request: Union[realms.DeleteRealmRequest, 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 realm. Args: - request (:class:`google.cloud.gaming_v1.types.DeleteRealmRequest`): + request (Union[google.cloud.gaming_v1.types.DeleteRealmRequest, dict]): The request object. Request message for RealmsService.DeleteRealm. name (:class:`str`): @@ -534,18 +536,18 @@ async def delete_realm( async def update_realm( self, - request: realms.UpdateRealmRequest = None, + request: Union[realms.UpdateRealmRequest, dict] = None, *, realm: realms.Realm = 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 realm. Args: - request (:class:`google.cloud.gaming_v1.types.UpdateRealmRequest`): + request (Union[google.cloud.gaming_v1.types.UpdateRealmRequest, dict]): The request object. Request message for RealmsService.UpdateRealm. realm (:class:`google.cloud.gaming_v1.types.Realm`): @@ -629,16 +631,16 @@ async def update_realm( async def preview_realm_update( self, - request: realms.PreviewRealmUpdateRequest = None, + request: Union[realms.PreviewRealmUpdateRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> realms.PreviewRealmUpdateResponse: r"""Previews patches to a single realm. Args: - request (:class:`google.cloud.gaming_v1.types.PreviewRealmUpdateRequest`): + request (Union[google.cloud.gaming_v1.types.PreviewRealmUpdateRequest, dict]): The request object. Request message for RealmsService.PreviewRealmUpdate. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/gaming_v1/services/realms_service/client.py b/google/cloud/gaming_v1/services/realms_service/client.py index 0f06249b..34442945 100644 --- a/google/cloud/gaming_v1/services/realms_service/client.py +++ b/google/cloud/gaming_v1/services/realms_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.realms_service import pagers @@ -358,7 +360,7 @@ def list_realms( request: Union[realms.ListRealmsRequest, 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.ListRealmsPager: @@ -438,7 +440,7 @@ def get_realm( request: Union[realms.GetRealmRequest, 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]] = (), ) -> realms.Realm: @@ -510,7 +512,7 @@ def create_realm( parent: str = None, realm: realms.Realm = None, realm_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: @@ -610,7 +612,7 @@ def delete_realm( request: Union[realms.DeleteRealmRequest, 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.Operation: @@ -704,7 +706,7 @@ def update_realm( *, realm: realms.Realm = 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: @@ -797,7 +799,7 @@ def preview_realm_update( self, request: Union[realms.PreviewRealmUpdateRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> realms.PreviewRealmUpdateResponse: diff --git a/google/cloud/gaming_v1/services/realms_service/transports/base.py b/google/cloud/gaming_v1/services/realms_service/transports/base.py index 0248c879..32fae566 100644 --- a/google/cloud/gaming_v1/services/realms_service/transports/base.py +++ b/google/cloud/gaming_v1/services/realms_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 RealmsServiceTransport(abc.ABC): """Abstract transport class for RealmsService.""" @@ -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 = { @@ -219,7 +186,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() diff --git a/google/cloud/gaming_v1/services/realms_service/transports/grpc.py b/google/cloud/gaming_v1/services/realms_service/transports/grpc.py index 05bd693e..f3cf4f5f 100644 --- a/google/cloud/gaming_v1/services/realms_service/transports/grpc.py +++ b/google/cloud/gaming_v1/services/realms_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) diff --git a/google/cloud/gaming_v1/services/realms_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1/services/realms_service/transports/grpc_asyncio.py index c4a14fbd..9c40508b 100644 --- a/google/cloud/gaming_v1/services/realms_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1/services/realms_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) diff --git a/google/cloud/gaming_v1/types/game_server_clusters.py b/google/cloud/gaming_v1/types/game_server_clusters.py index de5641d8..c75f137e 100644 --- a/google/cloud/gaming_v1/types/game_server_clusters.py +++ b/google/cloud/gaming_v1/types/game_server_clusters.py @@ -342,10 +342,13 @@ class PreviewUpdateGameServerClusterResponse(proto.Message): class GameServerClusterConnectionInfo(proto.Message): r"""The game server cluster connection information. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: gke_cluster_reference (google.cloud.gaming_v1.types.GkeClusterReference): Reference to the GKE cluster where the game servers are installed. + This field is a member of `oneof`_ ``cluster_reference``. namespace (str): Namespace designated on the game server cluster where the Agones game server instances diff --git a/google/cloud/gaming_v1/types/game_server_deployments.py b/google/cloud/gaming_v1/types/game_server_deployments.py index 085a8d4f..269cde73 100644 --- a/google/cloud/gaming_v1/types/game_server_deployments.py +++ b/google/cloud/gaming_v1/types/game_server_deployments.py @@ -299,11 +299,15 @@ class GameServerDeployment(proto.Message): class GameServerConfigOverride(proto.Message): r"""A game server config override. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: realms_selector (google.cloud.gaming_v1.types.RealmSelector): Selector for choosing applicable realms. + This field is a member of `oneof`_ ``selector``. config_version (str): The game server config for this override. + This field is a member of `oneof`_ ``change``. """ realms_selector = proto.Field( diff --git a/google/cloud/gaming_v1beta/services/game_server_clusters_service/async_client.py b/google/cloud/gaming_v1beta/services/game_server_clusters_service/async_client.py index cfd7e429..b8aa12e8 100644 --- a/google/cloud/gaming_v1beta/services/game_server_clusters_service/async_client.py +++ b/google/cloud/gaming_v1beta/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_v1beta.services.game_server_clusters_service import pagers @@ -182,10 +184,10 @@ 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: @@ -193,7 +195,7 @@ async def list_game_server_clusters( location. Args: - request (:class:`google.cloud.gaming_v1beta.types.ListGameServerClustersRequest`): + request (Union[google.cloud.gaming_v1beta.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_v1beta.types.GetGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.types.GetGameServerClusterRequest, dict]): The request object. Request message for GameServerClustersService.GetGameServerCluster. name (:class:`str`): @@ -353,12 +355,14 @@ 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: @@ -366,7 +370,7 @@ async def create_game_server_cluster( and location. Args: - request (:class:`google.cloud.gaming_v1beta.types.CreateGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.types.CreateGameServerClusterRequest, dict]): The request object. Request message for GameServerClustersService.CreateGameServerCluster. parent (:class:`str`): @@ -458,9 +462,11 @@ 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: @@ -468,7 +474,7 @@ async def preview_create_game_server_cluster( given project and location. Args: - request (:class:`google.cloud.gaming_v1beta.types.PreviewCreateGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.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_v1beta.types.DeleteGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.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_v1beta.types.PreviewDeleteGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.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_v1beta.types.UpdateGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.types.UpdateGameServerClusterRequest, dict]): The request object. Request message for GameServerClustersService.UpdateGameServerCluster. game_server_cluster (:class:`google.cloud.gaming_v1beta.types.GameServerCluster`): @@ -766,16 +778,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_v1beta.types.PreviewUpdateGameServerClusterRequest`): + request (Union[google.cloud.gaming_v1beta.types.PreviewUpdateGameServerClusterRequest, dict]): The request object. Request message for GameServerClustersService.UpdateGameServerCluster. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/gaming_v1beta/services/game_server_clusters_service/client.py b/google/cloud/gaming_v1beta/services/game_server_clusters_service/client.py index e0d636ef..96683f32 100644 --- a/google/cloud/gaming_v1beta/services/game_server_clusters_service/client.py +++ b/google/cloud/gaming_v1beta/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_v1beta.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: @@ -523,7 +525,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: @@ -945,7 +947,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: diff --git a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/base.py b/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/base.py index e1a21044..f21f8298 100644 --- a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/base.py +++ b/google/cloud/gaming_v1beta/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() diff --git a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc.py b/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc.py index 47346003..8d37c968 100644 --- a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc.py +++ b/google/cloud/gaming_v1beta/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) diff --git a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc_asyncio.py index e8b6597c..5b2dc612 100644 --- a/google/cloud/gaming_v1beta/services/game_server_clusters_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1beta/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) diff --git a/google/cloud/gaming_v1beta/services/game_server_configs_service/async_client.py b/google/cloud/gaming_v1beta/services/game_server_configs_service/async_client.py index 765abce7..0483f781 100644 --- a/google/cloud/gaming_v1beta/services/game_server_configs_service/async_client.py +++ b/google/cloud/gaming_v1beta/services/game_server_configs_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_v1beta.services.game_server_configs_service import pagers @@ -179,10 +181,10 @@ def __init__( async def list_game_server_configs( self, - request: game_server_configs.ListGameServerConfigsRequest = None, + request: Union[game_server_configs.ListGameServerConfigsRequest, 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.ListGameServerConfigsAsyncPager: @@ -190,7 +192,7 @@ async def list_game_server_configs( location, and game server deployment. Args: - request (:class:`google.cloud.gaming_v1beta.types.ListGameServerConfigsRequest`): + request (Union[google.cloud.gaming_v1beta.types.ListGameServerConfigsRequest, dict]): The request object. Request message for GameServerConfigsService.ListGameServerConfigs. parent (:class:`str`): @@ -270,17 +272,17 @@ async def list_game_server_configs( async def get_game_server_config( self, - request: game_server_configs.GetGameServerConfigRequest = None, + request: Union[game_server_configs.GetGameServerConfigRequest, 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_configs.GameServerConfig: r"""Gets details of a single game server config. Args: - request (:class:`google.cloud.gaming_v1beta.types.GetGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1beta.types.GetGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.GetGameServerConfig. name (:class:`str`): @@ -350,11 +352,11 @@ async def get_game_server_config( async def create_game_server_config( self, - request: game_server_configs.CreateGameServerConfigRequest = None, + request: Union[game_server_configs.CreateGameServerConfigRequest, dict] = None, *, parent: str = None, game_server_config: game_server_configs.GameServerConfig = 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: @@ -365,7 +367,7 @@ async def create_game_server_config( resource. Args: - request (:class:`google.cloud.gaming_v1beta.types.CreateGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1beta.types.CreateGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.CreateGameServerConfig. parent (:class:`str`): @@ -447,10 +449,10 @@ async def create_game_server_config( async def delete_game_server_config( self, - request: game_server_configs.DeleteGameServerConfigRequest = None, + request: Union[game_server_configs.DeleteGameServerConfigRequest, 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: @@ -459,7 +461,7 @@ async def delete_game_server_config( game server deployment rollout. Args: - request (:class:`google.cloud.gaming_v1beta.types.DeleteGameServerConfigRequest`): + request (Union[google.cloud.gaming_v1beta.types.DeleteGameServerConfigRequest, dict]): The request object. Request message for GameServerConfigsService.DeleteGameServerConfig. name (:class:`str`): diff --git a/google/cloud/gaming_v1beta/services/game_server_configs_service/client.py b/google/cloud/gaming_v1beta/services/game_server_configs_service/client.py index f65e2c5e..1cf77f30 100644 --- a/google/cloud/gaming_v1beta/services/game_server_configs_service/client.py +++ b/google/cloud/gaming_v1beta/services/game_server_configs_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_v1beta.services.game_server_configs_service import pagers @@ -363,7 +365,7 @@ def list_game_server_configs( request: Union[game_server_configs.ListGameServerConfigsRequest, 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.ListGameServerConfigsPager: @@ -445,7 +447,7 @@ def get_game_server_config( request: Union[game_server_configs.GetGameServerConfigRequest, 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_configs.GameServerConfig: @@ -517,7 +519,7 @@ def create_game_server_config( *, parent: str = None, game_server_config: game_server_configs.GameServerConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -615,7 +617,7 @@ def delete_game_server_config( request: Union[game_server_configs.DeleteGameServerConfigRequest, 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.Operation: diff --git a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/base.py b/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/base.py index 066a833e..96da97fd 100644 --- a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/base.py +++ b/google/cloud/gaming_v1beta/services/game_server_configs_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 GameServerConfigsServiceTransport(abc.ABC): """Abstract transport class for GameServerConfigsService.""" @@ -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 = { @@ -206,7 +173,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() diff --git a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc.py b/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc.py index 7f44d287..b8b9e062 100644 --- a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc.py +++ b/google/cloud/gaming_v1beta/services/game_server_configs_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) diff --git a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc_asyncio.py index 0e3c54ae..2fc8c0fe 100644 --- a/google/cloud/gaming_v1beta/services/game_server_configs_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1beta/services/game_server_configs_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) diff --git a/google/cloud/gaming_v1beta/services/game_server_deployments_service/async_client.py b/google/cloud/gaming_v1beta/services/game_server_deployments_service/async_client.py index b384b50d..a1abf289 100644 --- a/google/cloud/gaming_v1beta/services/game_server_deployments_service/async_client.py +++ b/google/cloud/gaming_v1beta/services/game_server_deployments_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_v1beta.services.game_server_deployments_service import pagers @@ -188,10 +190,12 @@ def __init__( async def list_game_server_deployments( self, - request: game_server_deployments.ListGameServerDeploymentsRequest = None, + request: Union[ + game_server_deployments.ListGameServerDeploymentsRequest, 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.ListGameServerDeploymentsAsyncPager: @@ -199,7 +203,7 @@ async def list_game_server_deployments( location. Args: - request (:class:`google.cloud.gaming_v1beta.types.ListGameServerDeploymentsRequest`): + request (Union[google.cloud.gaming_v1beta.types.ListGameServerDeploymentsRequest, dict]): The request object. Request message for GameServerDeploymentsService.ListGameServerDeployments. parent (:class:`str`): @@ -278,17 +282,19 @@ async def list_game_server_deployments( async def get_game_server_deployment( self, - request: game_server_deployments.GetGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.GetGameServerDeploymentRequest, 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_deployments.GameServerDeployment: r"""Gets details of a single game server deployment. Args: - request (:class:`google.cloud.gaming_v1beta.types.GetGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1beta.types.GetGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.GetGameServerDeployment. name (:class:`str`): @@ -358,11 +364,13 @@ async def get_game_server_deployment( async def create_game_server_deployment( self, - request: game_server_deployments.CreateGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.CreateGameServerDeploymentRequest, dict + ] = None, *, parent: str = None, game_server_deployment: game_server_deployments.GameServerDeployment = 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: @@ -370,7 +378,7 @@ async def create_game_server_deployment( project and location. Args: - request (:class:`google.cloud.gaming_v1beta.types.CreateGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1beta.types.CreateGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.CreateGameServerDeployment. parent (:class:`str`): @@ -451,17 +459,19 @@ async def create_game_server_deployment( async def delete_game_server_deployment( self, - request: game_server_deployments.DeleteGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.DeleteGameServerDeploymentRequest, 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 deployment. Args: - request (:class:`google.cloud.gaming_v1beta.types.DeleteGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1beta.types.DeleteGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.DeleteGameServerDeployment. name (:class:`str`): @@ -545,18 +555,20 @@ async def delete_game_server_deployment( async def update_game_server_deployment( self, - request: game_server_deployments.UpdateGameServerDeploymentRequest = None, + request: Union[ + game_server_deployments.UpdateGameServerDeploymentRequest, dict + ] = None, *, game_server_deployment: game_server_deployments.GameServerDeployment = 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 game server deployment. Args: - request (:class:`google.cloud.gaming_v1beta.types.UpdateGameServerDeploymentRequest`): + request (Union[google.cloud.gaming_v1beta.types.UpdateGameServerDeploymentRequest, dict]): The request object. Request message for GameServerDeploymentsService.UpdateGameServerDeployment. Only allows updates for labels. @@ -644,17 +656,19 @@ async def update_game_server_deployment( async def get_game_server_deployment_rollout( self, - request: game_server_deployments.GetGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.GetGameServerDeploymentRolloutRequest, 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_deployments.GameServerDeploymentRollout: r"""Gets details a single game server deployment rollout. Args: - request (:class:`google.cloud.gaming_v1beta.types.GetGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1beta.types.GetGameServerDeploymentRolloutRequest, dict]): The request object. Request message for GameServerDeploymentsService.GetGameServerDeploymentRollout. name (:class:`str`): @@ -727,11 +741,13 @@ async def get_game_server_deployment_rollout( async def update_game_server_deployment_rollout( self, - request: game_server_deployments.UpdateGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.UpdateGameServerDeploymentRolloutRequest, dict + ] = None, *, rollout: game_server_deployments.GameServerDeploymentRollout = 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: @@ -744,7 +760,7 @@ async def update_game_server_deployment_rollout( an error. Args: - request (:class:`google.cloud.gaming_v1beta.types.UpdateGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1beta.types.UpdateGameServerDeploymentRolloutRequest, dict]): The request object. Request message for GameServerDeploymentsService.UpdateGameServerRolloutDeployment. rollout (:class:`google.cloud.gaming_v1beta.types.GameServerDeploymentRollout`): @@ -834,9 +850,11 @@ async def update_game_server_deployment_rollout( async def preview_game_server_deployment_rollout( self, - request: game_server_deployments.PreviewGameServerDeploymentRolloutRequest = None, + request: Union[ + game_server_deployments.PreviewGameServerDeploymentRolloutRequest, 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_deployments.PreviewGameServerDeploymentRolloutResponse: @@ -844,7 +862,7 @@ async def preview_game_server_deployment_rollout( does not mutate the rollout resource. Args: - request (:class:`google.cloud.gaming_v1beta.types.PreviewGameServerDeploymentRolloutRequest`): + request (Union[google.cloud.gaming_v1beta.types.PreviewGameServerDeploymentRolloutRequest, dict]): The request object. Request message for PreviewGameServerDeploymentRollout. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -899,9 +917,11 @@ async def preview_game_server_deployment_rollout( async def fetch_deployment_state( self, - request: game_server_deployments.FetchDeploymentStateRequest = None, + request: Union[ + game_server_deployments.FetchDeploymentStateRequest, 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_deployments.FetchDeploymentStateResponse: @@ -911,7 +931,7 @@ async def fetch_deployment_state( older version of the game server deployment. Args: - request (:class:`google.cloud.gaming_v1beta.types.FetchDeploymentStateRequest`): + request (Union[google.cloud.gaming_v1beta.types.FetchDeploymentStateRequest, dict]): The request object. Request message for GameServerDeploymentsService.FetchDeploymentState. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/gaming_v1beta/services/game_server_deployments_service/client.py b/google/cloud/gaming_v1beta/services/game_server_deployments_service/client.py index ef9aa463..d2feb7d6 100644 --- a/google/cloud/gaming_v1beta/services/game_server_deployments_service/client.py +++ b/google/cloud/gaming_v1beta/services/game_server_deployments_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_v1beta.services.game_server_deployments_service import pagers @@ -388,7 +390,7 @@ def list_game_server_deployments( ] = 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.ListGameServerDeploymentsPager: @@ -475,7 +477,7 @@ def get_game_server_deployment( ] = 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_deployments.GameServerDeployment: @@ -553,7 +555,7 @@ def create_game_server_deployment( *, parent: str = None, game_server_deployment: game_server_deployments.GameServerDeployment = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -651,7 +653,7 @@ def delete_game_server_deployment( ] = 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: @@ -752,7 +754,7 @@ def update_game_server_deployment( *, game_server_deployment: game_server_deployments.GameServerDeployment = 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: @@ -856,7 +858,7 @@ def get_game_server_deployment_rollout( ] = 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_deployments.GameServerDeploymentRollout: @@ -939,7 +941,7 @@ def update_game_server_deployment_rollout( *, rollout: game_server_deployments.GameServerDeploymentRollout = 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: @@ -1050,7 +1052,7 @@ def preview_game_server_deployment_rollout( game_server_deployments.PreviewGameServerDeploymentRolloutRequest, 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_deployments.PreviewGameServerDeploymentRolloutResponse: @@ -1113,7 +1115,7 @@ def fetch_deployment_state( game_server_deployments.FetchDeploymentStateRequest, 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_deployments.FetchDeploymentStateResponse: diff --git a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/base.py b/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/base.py index 5b4f3e0c..add29d82 100644 --- a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/base.py +++ b/google/cloud/gaming_v1beta/services/game_server_deployments_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 GameServerDeploymentsServiceTransport(abc.ABC): """Abstract transport class for GameServerDeploymentsService.""" @@ -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 = { @@ -258,7 +225,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() diff --git a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc.py b/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc.py index 967763d5..a66f625b 100644 --- a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc.py +++ b/google/cloud/gaming_v1beta/services/game_server_deployments_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) diff --git a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc_asyncio.py index 47a23545..c6d1cbbf 100644 --- a/google/cloud/gaming_v1beta/services/game_server_deployments_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1beta/services/game_server_deployments_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 @@ -162,7 +161,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) diff --git a/google/cloud/gaming_v1beta/services/realms_service/async_client.py b/google/cloud/gaming_v1beta/services/realms_service/async_client.py index 70742642..555c1023 100644 --- a/google/cloud/gaming_v1beta/services/realms_service/async_client.py +++ b/google/cloud/gaming_v1beta/services/realms_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_v1beta.services.realms_service import pagers @@ -171,17 +173,17 @@ def __init__( async def list_realms( self, - request: realms.ListRealmsRequest = None, + request: Union[realms.ListRealmsRequest, 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.ListRealmsAsyncPager: r"""Lists realms in a given project and location. Args: - request (:class:`google.cloud.gaming_v1beta.types.ListRealmsRequest`): + request (Union[google.cloud.gaming_v1beta.types.ListRealmsRequest, dict]): The request object. Request message for RealmsService.ListRealms. parent (:class:`str`): @@ -260,17 +262,17 @@ async def list_realms( async def get_realm( self, - request: realms.GetRealmRequest = None, + request: Union[realms.GetRealmRequest, 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]] = (), ) -> realms.Realm: r"""Gets details of a single realm. Args: - request (:class:`google.cloud.gaming_v1beta.types.GetRealmRequest`): + request (Union[google.cloud.gaming_v1beta.types.GetRealmRequest, dict]): The request object. Request message for RealmsService.GetRealm. name (:class:`str`): @@ -339,19 +341,19 @@ async def get_realm( async def create_realm( self, - request: realms.CreateRealmRequest = None, + request: Union[realms.CreateRealmRequest, dict] = None, *, parent: str = None, realm: realms.Realm = None, realm_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 realm in a given project and location. Args: - request (:class:`google.cloud.gaming_v1beta.types.CreateRealmRequest`): + request (Union[google.cloud.gaming_v1beta.types.CreateRealmRequest, dict]): The request object. Request message for RealmsService.CreateRealm. parent (:class:`str`): @@ -441,17 +443,17 @@ async def create_realm( async def delete_realm( self, - request: realms.DeleteRealmRequest = None, + request: Union[realms.DeleteRealmRequest, 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 realm. Args: - request (:class:`google.cloud.gaming_v1beta.types.DeleteRealmRequest`): + request (Union[google.cloud.gaming_v1beta.types.DeleteRealmRequest, dict]): The request object. Request message for RealmsService.DeleteRealm. name (:class:`str`): @@ -534,18 +536,18 @@ async def delete_realm( async def update_realm( self, - request: realms.UpdateRealmRequest = None, + request: Union[realms.UpdateRealmRequest, dict] = None, *, realm: realms.Realm = 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 realm. Args: - request (:class:`google.cloud.gaming_v1beta.types.UpdateRealmRequest`): + request (Union[google.cloud.gaming_v1beta.types.UpdateRealmRequest, dict]): The request object. Request message for RealmsService.UpdateRealm. realm (:class:`google.cloud.gaming_v1beta.types.Realm`): @@ -631,16 +633,16 @@ async def update_realm( async def preview_realm_update( self, - request: realms.PreviewRealmUpdateRequest = None, + request: Union[realms.PreviewRealmUpdateRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> realms.PreviewRealmUpdateResponse: r"""Previews patches to a single realm. Args: - request (:class:`google.cloud.gaming_v1beta.types.PreviewRealmUpdateRequest`): + request (Union[google.cloud.gaming_v1beta.types.PreviewRealmUpdateRequest, dict]): The request object. Request message for RealmsService.PreviewRealmUpdate. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/gaming_v1beta/services/realms_service/client.py b/google/cloud/gaming_v1beta/services/realms_service/client.py index 7bf17a3b..77c43a70 100644 --- a/google/cloud/gaming_v1beta/services/realms_service/client.py +++ b/google/cloud/gaming_v1beta/services/realms_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_v1beta.services.realms_service import pagers @@ -358,7 +360,7 @@ def list_realms( request: Union[realms.ListRealmsRequest, 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.ListRealmsPager: @@ -438,7 +440,7 @@ def get_realm( request: Union[realms.GetRealmRequest, 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]] = (), ) -> realms.Realm: @@ -510,7 +512,7 @@ def create_realm( parent: str = None, realm: realms.Realm = None, realm_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: @@ -610,7 +612,7 @@ def delete_realm( request: Union[realms.DeleteRealmRequest, 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.Operation: @@ -704,7 +706,7 @@ def update_realm( *, realm: realms.Realm = 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: @@ -799,7 +801,7 @@ def preview_realm_update( self, request: Union[realms.PreviewRealmUpdateRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> realms.PreviewRealmUpdateResponse: diff --git a/google/cloud/gaming_v1beta/services/realms_service/transports/base.py b/google/cloud/gaming_v1beta/services/realms_service/transports/base.py index cb0b47e0..1b489d4d 100644 --- a/google/cloud/gaming_v1beta/services/realms_service/transports/base.py +++ b/google/cloud/gaming_v1beta/services/realms_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 RealmsServiceTransport(abc.ABC): """Abstract transport class for RealmsService.""" @@ -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 = { @@ -219,7 +186,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() diff --git a/google/cloud/gaming_v1beta/services/realms_service/transports/grpc.py b/google/cloud/gaming_v1beta/services/realms_service/transports/grpc.py index d475c9d1..88e4b1de 100644 --- a/google/cloud/gaming_v1beta/services/realms_service/transports/grpc.py +++ b/google/cloud/gaming_v1beta/services/realms_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) diff --git a/google/cloud/gaming_v1beta/services/realms_service/transports/grpc_asyncio.py b/google/cloud/gaming_v1beta/services/realms_service/transports/grpc_asyncio.py index b562231d..36a4158a 100644 --- a/google/cloud/gaming_v1beta/services/realms_service/transports/grpc_asyncio.py +++ b/google/cloud/gaming_v1beta/services/realms_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) diff --git a/google/cloud/gaming_v1beta/types/game_server_clusters.py b/google/cloud/gaming_v1beta/types/game_server_clusters.py index cc47d7e3..e56b9f31 100644 --- a/google/cloud/gaming_v1beta/types/game_server_clusters.py +++ b/google/cloud/gaming_v1beta/types/game_server_clusters.py @@ -309,10 +309,13 @@ class PreviewUpdateGameServerClusterResponse(proto.Message): class GameServerClusterConnectionInfo(proto.Message): r"""The game server cluster connection information. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: gke_cluster_reference (google.cloud.gaming_v1beta.types.GkeClusterReference): Reference to the GKE cluster where the game servers are installed. + This field is a member of `oneof`_ ``cluster_reference``. namespace (str): Namespace designated on the game server cluster where the Agones game server instances diff --git a/google/cloud/gaming_v1beta/types/game_server_deployments.py b/google/cloud/gaming_v1beta/types/game_server_deployments.py index 7c4ca3e2..542fa253 100644 --- a/google/cloud/gaming_v1beta/types/game_server_deployments.py +++ b/google/cloud/gaming_v1beta/types/game_server_deployments.py @@ -309,11 +309,15 @@ class GameServerDeployment(proto.Message): class GameServerConfigOverride(proto.Message): r"""A game server config override. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: realms_selector (google.cloud.gaming_v1beta.types.RealmSelector): Selector for choosing applicable realms. + This field is a member of `oneof`_ ``selector``. config_version (str): The game server config for this override. + This field is a member of `oneof`_ ``change``. """ realms_selector = proto.Field( diff --git a/setup.py b/setup.py index ca314ad8..08533810 100644 --- a/setup.py +++ b/setup.py @@ -47,9 +47,8 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "proto-plus >= 1.4.0", - "packaging >= 14.3", ), python_requires=">=3.6", setup_requires=["libcst >= 0.2.5"], diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 4fda4298..6b451bc3 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,7 +5,5 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -google-api-core==1.26.0 +google-api-core==1.28.0 proto-plus==1.4.0 -packaging==14.3 -google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 si transitively required through google-api-core diff --git a/tests/unit/gapic/gaming_v1/test_game_server_clusters_service.py b/tests/unit/gapic/gaming_v1/test_game_server_clusters_service.py index 33a08d3a..12ada403 100644 --- a/tests/unit/gapic/gaming_v1/test_game_server_clusters_service.py +++ b/tests/unit/gapic/gaming_v1/test_game_server_clusters_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.gaming_v1.services.game_server_clusters_service import pagers from google.cloud.gaming_v1.services.game_server_clusters_service import transports -from google.cloud.gaming_v1.services.game_server_clusters_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1.types import common from google.cloud.gaming_v1.types import game_server_clusters from google.longrunning import operations_pb2 @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -238,7 +220,7 @@ def test_game_server_clusters_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_game_server_clusters_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -272,7 +254,7 @@ def test_game_server_clusters_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -301,7 +283,7 @@ def test_game_server_clusters_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -370,7 +352,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -412,7 +394,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -434,7 +416,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_game_server_clusters_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -504,7 +486,7 @@ def test_game_server_clusters_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -2511,7 +2493,6 @@ def test_game_server_clusters_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2532,26 +2513,6 @@ def test_game_server_clusters_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1.services.game_server_clusters_service.transports.GameServerClustersServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerClustersServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_clusters_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -2563,7 +2524,6 @@ def test_game_server_clusters_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2576,18 +2536,6 @@ def test_game_server_clusters_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerClustersServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2595,7 +2543,6 @@ def test_game_server_clusters_service_auth_adc_old_google_auth(): transports.GameServerClustersServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2609,28 +2556,6 @@ def test_game_server_clusters_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerClustersServiceGrpcTransport, - transports.GameServerClustersServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1/test_game_server_configs_service.py b/tests/unit/gapic/gaming_v1/test_game_server_configs_service.py index 04187d89..38aa5bf5 100644 --- a/tests/unit/gapic/gaming_v1/test_game_server_configs_service.py +++ b/tests/unit/gapic/gaming_v1/test_game_server_configs_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.gaming_v1.services.game_server_configs_service import pagers from google.cloud.gaming_v1.services.game_server_configs_service import transports -from google.cloud.gaming_v1.services.game_server_configs_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1.types import common from google.cloud.gaming_v1.types import game_server_configs from google.longrunning import operations_pb2 @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -236,7 +218,7 @@ def test_game_server_configs_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -253,7 +235,7 @@ def test_game_server_configs_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -270,7 +252,7 @@ def test_game_server_configs_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -299,7 +281,7 @@ def test_game_server_configs_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -368,7 +350,7 @@ def test_game_server_configs_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -410,7 +392,7 @@ def test_game_server_configs_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -432,7 +414,7 @@ def test_game_server_configs_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -467,7 +449,7 @@ def test_game_server_configs_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -502,7 +484,7 @@ def test_game_server_configs_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1754,7 +1736,6 @@ def test_game_server_configs_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1775,26 +1756,6 @@ def test_game_server_configs_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1.services.game_server_configs_service.transports.GameServerConfigsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerConfigsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_configs_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1806,7 +1767,6 @@ def test_game_server_configs_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1819,18 +1779,6 @@ def test_game_server_configs_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerConfigsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1838,7 +1786,6 @@ def test_game_server_configs_service_auth_adc_old_google_auth(): transports.GameServerConfigsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1852,28 +1799,6 @@ def test_game_server_configs_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerConfigsServiceGrpcTransport, - transports.GameServerConfigsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1/test_game_server_deployments_service.py b/tests/unit/gapic/gaming_v1/test_game_server_deployments_service.py index b4f94b0c..ba0eeb27 100644 --- a/tests/unit/gapic/gaming_v1/test_game_server_deployments_service.py +++ b/tests/unit/gapic/gaming_v1/test_game_server_deployments_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.gaming_v1.services.game_server_deployments_service import pagers from google.cloud.gaming_v1.services.game_server_deployments_service import transports -from google.cloud.gaming_v1.services.game_server_deployments_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1.types import common from google.cloud.gaming_v1.types import game_server_deployments from google.longrunning import operations_pb2 @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -238,7 +220,7 @@ def test_game_server_deployments_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_game_server_deployments_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -272,7 +254,7 @@ def test_game_server_deployments_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -301,7 +283,7 @@ def test_game_server_deployments_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -370,7 +352,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -412,7 +394,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -434,7 +416,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_game_server_deployments_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -504,7 +486,7 @@ def test_game_server_deployments_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -2877,7 +2859,6 @@ def test_game_server_deployments_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2898,26 +2879,6 @@ def test_game_server_deployments_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1.services.game_server_deployments_service.transports.GameServerDeploymentsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerDeploymentsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_deployments_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -2929,7 +2890,6 @@ def test_game_server_deployments_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2942,18 +2902,6 @@ def test_game_server_deployments_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerDeploymentsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2961,7 +2909,6 @@ def test_game_server_deployments_service_auth_adc_old_google_auth(): transports.GameServerDeploymentsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2975,28 +2922,6 @@ def test_game_server_deployments_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerDeploymentsServiceGrpcTransport, - transports.GameServerDeploymentsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1/test_realms_service.py b/tests/unit/gapic/gaming_v1/test_realms_service.py index 58ef091a..50a5f54a 100644 --- a/tests/unit/gapic/gaming_v1/test_realms_service.py +++ b/tests/unit/gapic/gaming_v1/test_realms_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -39,9 +38,6 @@ from google.cloud.gaming_v1.services.realms_service import RealmsServiceClient from google.cloud.gaming_v1.services.realms_service import pagers from google.cloud.gaming_v1.services.realms_service import transports -from google.cloud.gaming_v1.services.realms_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1.types import common from google.cloud.gaming_v1.types import realms from google.longrunning import operations_pb2 @@ -51,20 +47,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -221,7 +203,7 @@ def test_realms_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -238,7 +220,7 @@ def test_realms_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_realms_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -284,7 +266,7 @@ def test_realms_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -343,7 +325,7 @@ def test_realms_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -385,7 +367,7 @@ def test_realms_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -407,7 +389,7 @@ def test_realms_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -438,7 +420,7 @@ def test_realms_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_realms_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1912,7 +1894,6 @@ def test_realms_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_realms_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1933,26 +1914,6 @@ def test_realms_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_realms_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1.services.realms_service.transports.RealmsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.RealmsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_realms_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1964,7 +1925,6 @@ def test_realms_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_realms_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1977,18 +1937,6 @@ def test_realms_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_realms_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - RealmsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1996,7 +1944,6 @@ def test_realms_service_auth_adc_old_google_auth(): transports.RealmsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_realms_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2010,26 +1957,6 @@ def test_realms_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.RealmsServiceGrpcTransport, - transports.RealmsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_realms_service_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1beta/test_game_server_clusters_service.py b/tests/unit/gapic/gaming_v1beta/test_game_server_clusters_service.py index 9159af89..791623c7 100644 --- a/tests/unit/gapic/gaming_v1beta/test_game_server_clusters_service.py +++ b/tests/unit/gapic/gaming_v1beta/test_game_server_clusters_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.gaming_v1beta.services.game_server_clusters_service import pagers from google.cloud.gaming_v1beta.services.game_server_clusters_service import transports -from google.cloud.gaming_v1beta.services.game_server_clusters_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1beta.types import common from google.cloud.gaming_v1beta.types import game_server_clusters from google.longrunning import operations_pb2 @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -238,7 +220,7 @@ def test_game_server_clusters_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_game_server_clusters_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -272,7 +254,7 @@ def test_game_server_clusters_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -301,7 +283,7 @@ def test_game_server_clusters_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -370,7 +352,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -412,7 +394,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -434,7 +416,7 @@ def test_game_server_clusters_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_game_server_clusters_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -504,7 +486,7 @@ def test_game_server_clusters_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -2511,7 +2493,6 @@ def test_game_server_clusters_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2532,26 +2513,6 @@ def test_game_server_clusters_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1beta.services.game_server_clusters_service.transports.GameServerClustersServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerClustersServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_clusters_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -2563,7 +2524,6 @@ def test_game_server_clusters_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2576,18 +2536,6 @@ def test_game_server_clusters_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerClustersServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2595,7 +2543,6 @@ def test_game_server_clusters_service_auth_adc_old_google_auth(): transports.GameServerClustersServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_clusters_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2609,28 +2556,6 @@ def test_game_server_clusters_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerClustersServiceGrpcTransport, - transports.GameServerClustersServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_clusters_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1beta/test_game_server_configs_service.py b/tests/unit/gapic/gaming_v1beta/test_game_server_configs_service.py index 47983627..ad028bfe 100644 --- a/tests/unit/gapic/gaming_v1beta/test_game_server_configs_service.py +++ b/tests/unit/gapic/gaming_v1beta/test_game_server_configs_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.gaming_v1beta.services.game_server_configs_service import pagers from google.cloud.gaming_v1beta.services.game_server_configs_service import transports -from google.cloud.gaming_v1beta.services.game_server_configs_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1beta.types import common from google.cloud.gaming_v1beta.types import game_server_configs from google.longrunning import operations_pb2 @@ -55,20 +51,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -236,7 +218,7 @@ def test_game_server_configs_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -253,7 +235,7 @@ def test_game_server_configs_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -270,7 +252,7 @@ def test_game_server_configs_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -299,7 +281,7 @@ def test_game_server_configs_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -368,7 +350,7 @@ def test_game_server_configs_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -410,7 +392,7 @@ def test_game_server_configs_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -432,7 +414,7 @@ def test_game_server_configs_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -467,7 +449,7 @@ def test_game_server_configs_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -502,7 +484,7 @@ def test_game_server_configs_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1754,7 +1736,6 @@ def test_game_server_configs_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1775,26 +1756,6 @@ def test_game_server_configs_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1beta.services.game_server_configs_service.transports.GameServerConfigsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerConfigsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_configs_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1806,7 +1767,6 @@ def test_game_server_configs_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1819,18 +1779,6 @@ def test_game_server_configs_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerConfigsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1838,7 +1786,6 @@ def test_game_server_configs_service_auth_adc_old_google_auth(): transports.GameServerConfigsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_configs_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1852,28 +1799,6 @@ def test_game_server_configs_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerConfigsServiceGrpcTransport, - transports.GameServerConfigsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_configs_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1beta/test_game_server_deployments_service.py b/tests/unit/gapic/gaming_v1beta/test_game_server_deployments_service.py index 2d3d3edd..045a0cae 100644 --- a/tests/unit/gapic/gaming_v1beta/test_game_server_deployments_service.py +++ b/tests/unit/gapic/gaming_v1beta/test_game_server_deployments_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -45,9 +44,6 @@ from google.cloud.gaming_v1beta.services.game_server_deployments_service import ( transports, ) -from google.cloud.gaming_v1beta.services.game_server_deployments_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1beta.types import common from google.cloud.gaming_v1beta.types import game_server_deployments from google.longrunning import operations_pb2 @@ -57,20 +53,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -240,7 +222,7 @@ def test_game_server_deployments_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -257,7 +239,7 @@ def test_game_server_deployments_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -274,7 +256,7 @@ def test_game_server_deployments_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -303,7 +285,7 @@ def test_game_server_deployments_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -372,7 +354,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -414,7 +396,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -436,7 +418,7 @@ def test_game_server_deployments_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -471,7 +453,7 @@ def test_game_server_deployments_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -506,7 +488,7 @@ def test_game_server_deployments_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -2879,7 +2861,6 @@ def test_game_server_deployments_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2900,26 +2881,6 @@ def test_game_server_deployments_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1beta.services.game_server_deployments_service.transports.GameServerDeploymentsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.GameServerDeploymentsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_game_server_deployments_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -2931,7 +2892,6 @@ def test_game_server_deployments_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2944,18 +2904,6 @@ def test_game_server_deployments_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - GameServerDeploymentsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2963,7 +2911,6 @@ def test_game_server_deployments_service_auth_adc_old_google_auth(): transports.GameServerDeploymentsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_game_server_deployments_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2977,28 +2924,6 @@ def test_game_server_deployments_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.GameServerDeploymentsServiceGrpcTransport, - transports.GameServerDeploymentsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_game_server_deployments_service_transport_auth_adc_old_google_auth( - transport_class, -): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/gaming_v1beta/test_realms_service.py b/tests/unit/gapic/gaming_v1beta/test_realms_service.py index e219f256..e5eda5b5 100644 --- a/tests/unit/gapic/gaming_v1beta/test_realms_service.py +++ b/tests/unit/gapic/gaming_v1beta/test_realms_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -39,9 +38,6 @@ from google.cloud.gaming_v1beta.services.realms_service import RealmsServiceClient from google.cloud.gaming_v1beta.services.realms_service import pagers from google.cloud.gaming_v1beta.services.realms_service import transports -from google.cloud.gaming_v1beta.services.realms_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.gaming_v1beta.types import common from google.cloud.gaming_v1beta.types import realms from google.longrunning import operations_pb2 @@ -51,20 +47,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -221,7 +203,7 @@ def test_realms_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -238,7 +220,7 @@ def test_realms_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_realms_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -284,7 +266,7 @@ def test_realms_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -343,7 +325,7 @@ def test_realms_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -385,7 +367,7 @@ def test_realms_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -407,7 +389,7 @@ def test_realms_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -438,7 +420,7 @@ def test_realms_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_realms_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1912,7 +1894,6 @@ def test_realms_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_realms_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1933,26 +1914,6 @@ def test_realms_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_realms_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gaming_v1beta.services.realms_service.transports.RealmsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.RealmsServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_realms_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1964,7 +1925,6 @@ def test_realms_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_realms_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1977,18 +1937,6 @@ def test_realms_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_realms_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - RealmsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1996,7 +1944,6 @@ def test_realms_service_auth_adc_old_google_auth(): transports.RealmsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_realms_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2010,26 +1957,6 @@ def test_realms_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.RealmsServiceGrpcTransport, - transports.RealmsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_realms_service_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [