From ddf46faab34fee5c5e23578f9fcdd5f038f8708a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 15:14:12 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#82) - [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: https://github.com/googleapis/googleapis/commit/83d81b0c8fc22291a13398d6d77f02dc97a5b6f4 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9 --- .../api_gateway_service/async_client.py | 94 ++++++++++--------- .../services/api_gateway_service/client.py | 32 ++++--- .../api_gateway_service/transports/base.py | 37 +------- .../api_gateway_service/transports/grpc.py | 2 +- .../transports/grpc_asyncio.py | 3 +- setup.py | 3 +- testing/constraints-3.6.txt | 3 +- .../apigateway_v1/test_api_gateway_service.py | 91 ++---------------- 8 files changed, 80 insertions(+), 185 deletions(-) diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py b/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py index 6681cf5..6a4b7d6 100644 --- a/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py +++ b/google/cloud/apigateway_v1/services/api_gateway_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.apigateway_v1.services.api_gateway_service import pagers @@ -184,17 +186,17 @@ def __init__( async def list_gateways( self, - request: apigateway.ListGatewaysRequest = None, + request: Union[apigateway.ListGatewaysRequest, 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.ListGatewaysAsyncPager: r"""Lists Gateways in a given project and location. Args: - request (:class:`google.cloud.apigateway_v1.types.ListGatewaysRequest`): + request (Union[google.cloud.apigateway_v1.types.ListGatewaysRequest, dict]): The request object. Request message for ApiGatewayService.ListGateways parent (:class:`str`): @@ -264,17 +266,17 @@ async def list_gateways( async def get_gateway( self, - request: apigateway.GetGatewayRequest = None, + request: Union[apigateway.GetGatewayRequest, 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]] = (), ) -> apigateway.Gateway: r"""Gets details of a single Gateway. Args: - request (:class:`google.cloud.apigateway_v1.types.GetGatewayRequest`): + request (Union[google.cloud.apigateway_v1.types.GetGatewayRequest, dict]): The request object. Request message for ApiGatewayService.GetGateway name (:class:`str`): @@ -339,12 +341,12 @@ async def get_gateway( async def create_gateway( self, - request: apigateway.CreateGatewayRequest = None, + request: Union[apigateway.CreateGatewayRequest, dict] = None, *, parent: str = None, gateway: apigateway.Gateway = None, gateway_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: @@ -352,7 +354,7 @@ async def create_gateway( location. Args: - request (:class:`google.cloud.apigateway_v1.types.CreateGatewayRequest`): + request (Union[google.cloud.apigateway_v1.types.CreateGatewayRequest, dict]): The request object. Request message for ApiGatewayService.CreateGateway parent (:class:`str`): @@ -451,18 +453,18 @@ async def create_gateway( async def update_gateway( self, - request: apigateway.UpdateGatewayRequest = None, + request: Union[apigateway.UpdateGatewayRequest, dict] = None, *, gateway: apigateway.Gateway = 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"""Updates the parameters of a single Gateway. Args: - request (:class:`google.cloud.apigateway_v1.types.UpdateGatewayRequest`): + request (Union[google.cloud.apigateway_v1.types.UpdateGatewayRequest, dict]): The request object. Request message for ApiGatewayService.UpdateGateway gateway (:class:`google.cloud.apigateway_v1.types.Gateway`): @@ -557,17 +559,17 @@ async def update_gateway( async def delete_gateway( self, - request: apigateway.DeleteGatewayRequest = None, + request: Union[apigateway.DeleteGatewayRequest, 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 Gateway. Args: - request (:class:`google.cloud.apigateway_v1.types.DeleteGatewayRequest`): + request (Union[google.cloud.apigateway_v1.types.DeleteGatewayRequest, dict]): The request object. Request message for ApiGatewayService.DeleteGateway name (:class:`str`): @@ -658,17 +660,17 @@ async def delete_gateway( async def list_apis( self, - request: apigateway.ListApisRequest = None, + request: Union[apigateway.ListApisRequest, 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.ListApisAsyncPager: r"""Lists Apis in a given project and location. Args: - request (:class:`google.cloud.apigateway_v1.types.ListApisRequest`): + request (Union[google.cloud.apigateway_v1.types.ListApisRequest, dict]): The request object. Request message for ApiGatewayService.ListApis parent (:class:`str`): @@ -738,17 +740,17 @@ async def list_apis( async def get_api( self, - request: apigateway.GetApiRequest = None, + request: Union[apigateway.GetApiRequest, 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]] = (), ) -> apigateway.Api: r"""Gets details of a single Api. Args: - request (:class:`google.cloud.apigateway_v1.types.GetApiRequest`): + request (Union[google.cloud.apigateway_v1.types.GetApiRequest, dict]): The request object. Request message for ApiGatewayService.GetApi name (:class:`str`): @@ -809,19 +811,19 @@ async def get_api( async def create_api( self, - request: apigateway.CreateApiRequest = None, + request: Union[apigateway.CreateApiRequest, dict] = None, *, parent: str = None, api: apigateway.Api = None, api_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 Api in a given project and location. Args: - request (:class:`google.cloud.apigateway_v1.types.CreateApiRequest`): + request (Union[google.cloud.apigateway_v1.types.CreateApiRequest, dict]): The request object. Request message for ApiGatewayService.CreateApi parent (:class:`str`): @@ -919,18 +921,18 @@ async def create_api( async def update_api( self, - request: apigateway.UpdateApiRequest = None, + request: Union[apigateway.UpdateApiRequest, dict] = None, *, api: apigateway.Api = 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"""Updates the parameters of a single Api. Args: - request (:class:`google.cloud.apigateway_v1.types.UpdateApiRequest`): + request (Union[google.cloud.apigateway_v1.types.UpdateApiRequest, dict]): The request object. Request message for ApiGatewayService.UpdateApi api (:class:`google.cloud.apigateway_v1.types.Api`): @@ -1022,17 +1024,17 @@ async def update_api( async def delete_api( self, - request: apigateway.DeleteApiRequest = None, + request: Union[apigateway.DeleteApiRequest, 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 Api. Args: - request (:class:`google.cloud.apigateway_v1.types.DeleteApiRequest`): + request (Union[google.cloud.apigateway_v1.types.DeleteApiRequest, dict]): The request object. Request message for ApiGatewayService.DeleteApi name (:class:`str`): @@ -1123,17 +1125,17 @@ async def delete_api( async def list_api_configs( self, - request: apigateway.ListApiConfigsRequest = None, + request: Union[apigateway.ListApiConfigsRequest, 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.ListApiConfigsAsyncPager: r"""Lists ApiConfigs in a given project and location. Args: - request (:class:`google.cloud.apigateway_v1.types.ListApiConfigsRequest`): + request (Union[google.cloud.apigateway_v1.types.ListApiConfigsRequest, dict]): The request object. Request message for ApiGatewayService.ListApiConfigs parent (:class:`str`): @@ -1203,17 +1205,17 @@ async def list_api_configs( async def get_api_config( self, - request: apigateway.GetApiConfigRequest = None, + request: Union[apigateway.GetApiConfigRequest, 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]] = (), ) -> apigateway.ApiConfig: r"""Gets details of a single ApiConfig. Args: - request (:class:`google.cloud.apigateway_v1.types.GetApiConfigRequest`): + request (Union[google.cloud.apigateway_v1.types.GetApiConfigRequest, dict]): The request object. Request message for ApiGatewayService.GetApiConfig name (:class:`str`): @@ -1275,12 +1277,12 @@ async def get_api_config( async def create_api_config( self, - request: apigateway.CreateApiConfigRequest = None, + request: Union[apigateway.CreateApiConfigRequest, dict] = None, *, parent: str = None, api_config: apigateway.ApiConfig = None, api_config_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: @@ -1288,7 +1290,7 @@ async def create_api_config( location. Args: - request (:class:`google.cloud.apigateway_v1.types.CreateApiConfigRequest`): + request (Union[google.cloud.apigateway_v1.types.CreateApiConfigRequest, dict]): The request object. Request message for ApiGatewayService.CreateApiConfig parent (:class:`str`): @@ -1385,18 +1387,18 @@ async def create_api_config( async def update_api_config( self, - request: apigateway.UpdateApiConfigRequest = None, + request: Union[apigateway.UpdateApiConfigRequest, dict] = None, *, api_config: apigateway.ApiConfig = 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"""Updates the parameters of a single ApiConfig. Args: - request (:class:`google.cloud.apigateway_v1.types.UpdateApiConfigRequest`): + request (Union[google.cloud.apigateway_v1.types.UpdateApiConfigRequest, dict]): The request object. Request message for ApiGatewayService.UpdateApiConfig api_config (:class:`google.cloud.apigateway_v1.types.ApiConfig`): @@ -1489,17 +1491,17 @@ async def update_api_config( async def delete_api_config( self, - request: apigateway.DeleteApiConfigRequest = None, + request: Union[apigateway.DeleteApiConfigRequest, 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 ApiConfig. Args: - request (:class:`google.cloud.apigateway_v1.types.DeleteApiConfigRequest`): + request (Union[google.cloud.apigateway_v1.types.DeleteApiConfigRequest, dict]): The request object. Request message for ApiGatewayService.DeleteApiConfig name (:class:`str`): diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/client.py b/google/cloud/apigateway_v1/services/api_gateway_service/client.py index 142a3b7..d9e3718 100644 --- a/google/cloud/apigateway_v1/services/api_gateway_service/client.py +++ b/google/cloud/apigateway_v1/services/api_gateway_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.apigateway_v1.services.api_gateway_service import pagers @@ -432,7 +434,7 @@ def list_gateways( request: Union[apigateway.ListGatewaysRequest, 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.ListGatewaysPager: @@ -512,7 +514,7 @@ def get_gateway( request: Union[apigateway.GetGatewayRequest, 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]] = (), ) -> apigateway.Gateway: @@ -589,7 +591,7 @@ def create_gateway( parent: str = None, gateway: apigateway.Gateway = None, gateway_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: @@ -691,7 +693,7 @@ def update_gateway( *, gateway: apigateway.Gateway = 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: @@ -787,7 +789,7 @@ def delete_gateway( request: Union[apigateway.DeleteGatewayRequest, 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: @@ -879,7 +881,7 @@ def list_apis( request: Union[apigateway.ListApisRequest, 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.ListApisPager: @@ -959,7 +961,7 @@ def get_api( request: Union[apigateway.GetApiRequest, 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]] = (), ) -> apigateway.Api: @@ -1032,7 +1034,7 @@ def create_api( parent: str = None, api: apigateway.Api = None, api_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: @@ -1132,7 +1134,7 @@ def update_api( *, api: apigateway.Api = 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: @@ -1225,7 +1227,7 @@ def delete_api( request: Union[apigateway.DeleteApiRequest, 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: @@ -1317,7 +1319,7 @@ def list_api_configs( request: Union[apigateway.ListApiConfigsRequest, 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.ListApiConfigsPager: @@ -1397,7 +1399,7 @@ def get_api_config( request: Union[apigateway.GetApiConfigRequest, 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]] = (), ) -> apigateway.ApiConfig: @@ -1471,7 +1473,7 @@ def create_api_config( parent: str = None, api_config: apigateway.ApiConfig = None, api_config_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: @@ -1571,7 +1573,7 @@ def update_api_config( *, api_config: apigateway.ApiConfig = 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: @@ -1665,7 +1667,7 @@ def delete_api_config( request: Union[apigateway.DeleteApiConfigRequest, 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/apigateway_v1/services/api_gateway_service/transports/base.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py index 542deea..59add0d 100644 --- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py +++ b/google/cloud/apigateway_v1/services/api_gateway_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 ApiGatewayServiceTransport(abc.ABC): """Abstract transport class for ApiGatewayService.""" @@ -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 = { @@ -312,7 +279,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/apigateway_v1/services/api_gateway_service/transports/grpc.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py index d000a8e..1cbfae4 100644 --- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py +++ b/google/cloud/apigateway_v1/services/api_gateway_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/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py index f62b1e3..96369b7 100644 --- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py +++ b/google/cloud/apigateway_v1/services/api_gateway_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/setup.py b/setup.py index d23a7c5..372f030 100644 --- a/setup.py +++ b/setup.py @@ -28,9 +28,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", ] package_root = os.path.abspath(os.path.dirname(__file__)) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 2955fcf..8fad4fc 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -19,6 +19,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 diff --git a/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py b/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py index c7d1897..b179947 100644 --- a/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py +++ b/tests/unit/gapic/apigateway_v1/test_api_gateway_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.apigateway_v1.services.api_gateway_service import pagers from google.cloud.apigateway_v1.services.api_gateway_service import transports -from google.cloud.apigateway_v1.services.api_gateway_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.apigateway_v1.types import apigateway from google.longrunning import operations_pb2 from google.oauth2 import service_account @@ -54,20 +50,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" @@ -225,7 +207,7 @@ def test_api_gateway_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, @@ -242,7 +224,7 @@ def test_api_gateway_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, @@ -259,7 +241,7 @@ def test_api_gateway_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, @@ -288,7 +270,7 @@ def test_api_gateway_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, @@ -357,7 +339,7 @@ def test_api_gateway_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 @@ -399,7 +381,7 @@ def test_api_gateway_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, @@ -421,7 +403,7 @@ def test_api_gateway_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, @@ -452,7 +434,7 @@ def test_api_gateway_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, @@ -483,7 +465,7 @@ def test_api_gateway_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", @@ -4258,7 +4240,6 @@ def test_api_gateway_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_api_gateway_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -4279,26 +4260,6 @@ def test_api_gateway_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_api_gateway_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.apigateway_v1.services.api_gateway_service.transports.ApiGatewayServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.ApiGatewayServiceTransport( - 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_api_gateway_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( @@ -4310,7 +4271,6 @@ def test_api_gateway_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_api_gateway_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -4323,18 +4283,6 @@ def test_api_gateway_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_api_gateway_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) - ApiGatewayServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -4342,7 +4290,6 @@ def test_api_gateway_service_auth_adc_old_google_auth(): transports.ApiGatewayServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_api_gateway_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -4356,26 +4303,6 @@ def test_api_gateway_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.ApiGatewayServiceGrpcTransport, - transports.ApiGatewayServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_api_gateway_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", [