From 2bc01744f9bbc48f3e5d1de1dd196571fc1494db 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:08:13 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#103) - [ ] 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 --- .../assured_workloads_service/async_client.py | 34 +++---- .../assured_workloads_service/client.py | 12 ++- .../transports/base.py | 37 +------- .../transports/grpc.py | 2 +- .../transports/grpc_asyncio.py | 3 +- .../assured_workloads_service/async_client.py | 34 +++---- .../assured_workloads_service/client.py | 12 ++- .../transports/base.py | 37 +------- .../transports/grpc.py | 2 +- .../transports/grpc_asyncio.py | 3 +- .../types/assuredworkloads_v1beta1.py | 11 +++ ...fixup_assuredworkloads_v1beta1_keywords.py | 18 ++-- setup.py | 3 +- testing/constraints-3.6.txt | 6 +- .../test_assured_workloads_service.py | 91 ++----------------- .../test_assured_workloads_service.py | 91 ++----------------- 16 files changed, 97 insertions(+), 299 deletions(-) diff --git a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py b/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py index 0c1c4f9..325029c 100644 --- a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py +++ b/google/cloud/assuredworkloads_v1/services/assured_workloads_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.assuredworkloads_v1.services.assured_workloads_service import pagers @@ -174,18 +176,18 @@ def __init__( async def create_workload( self, - request: assuredworkloads.CreateWorkloadRequest = None, + request: Union[assuredworkloads.CreateWorkloadRequest, dict] = None, *, parent: str = None, workload: assuredworkloads.Workload = 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 Assured Workload. Args: - request (:class:`google.cloud.assuredworkloads_v1.types.CreateWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1.types.CreateWorkloadRequest, dict]): The request object. Request for creating a workload. parent (:class:`str`): Required. The resource name of the new Workload's @@ -263,11 +265,11 @@ async def create_workload( async def update_workload( self, - request: assuredworkloads.UpdateWorkloadRequest = None, + request: Union[assuredworkloads.UpdateWorkloadRequest, dict] = None, *, workload: assuredworkloads.Workload = 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]] = (), ) -> assuredworkloads.Workload: @@ -277,7 +279,7 @@ async def update_workload( workload can be in progress. Args: - request (:class:`google.cloud.assuredworkloads_v1.types.UpdateWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1.types.UpdateWorkloadRequest, dict]): The request object. Request for Updating a workload. workload (:class:`google.cloud.assuredworkloads_v1.types.Workload`): Required. The workload to update. The workload’s @@ -351,10 +353,10 @@ async def update_workload( async def delete_workload( self, - request: assuredworkloads.DeleteWorkloadRequest = None, + request: Union[assuredworkloads.DeleteWorkloadRequest, 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]] = (), ) -> None: @@ -363,7 +365,7 @@ async def delete_workload( with a FAILED_PRECONDITION error. Args: - request (:class:`google.cloud.assuredworkloads_v1.types.DeleteWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1.types.DeleteWorkloadRequest, dict]): The request object. Request for deleting a Workload. name (:class:`str`): Required. The ``name`` field is used to identify the @@ -417,17 +419,17 @@ async def delete_workload( async def get_workload( self, - request: assuredworkloads.GetWorkloadRequest = None, + request: Union[assuredworkloads.GetWorkloadRequest, 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]] = (), ) -> assuredworkloads.Workload: r"""Gets Assured Workload associated with a CRM Node Args: - request (:class:`google.cloud.assuredworkloads_v1.types.GetWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1.types.GetWorkloadRequest, dict]): The request object. Request for fetching a workload. name (:class:`str`): Required. The resource name of the Workload to fetch. @@ -492,17 +494,17 @@ async def get_workload( async def list_workloads( self, - request: assuredworkloads.ListWorkloadsRequest = None, + request: Union[assuredworkloads.ListWorkloadsRequest, 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.ListWorkloadsAsyncPager: r"""Lists Assured Workloads under a CRM Node. Args: - request (:class:`google.cloud.assuredworkloads_v1.types.ListWorkloadsRequest`): + request (Union[google.cloud.assuredworkloads_v1.types.ListWorkloadsRequest, dict]): The request object. Request for fetching workloads in an organization. parent (:class:`str`): diff --git a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py b/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py index c1f3e0c..e35b0a6 100644 --- a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py +++ b/google/cloud/assuredworkloads_v1/services/assured_workloads_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.assuredworkloads_v1.services.assured_workloads_service import pagers @@ -359,7 +361,7 @@ def create_workload( *, parent: str = None, workload: assuredworkloads.Workload = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -448,7 +450,7 @@ def update_workload( *, workload: assuredworkloads.Workload = 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]] = (), ) -> assuredworkloads.Workload: @@ -535,7 +537,7 @@ def delete_workload( request: Union[assuredworkloads.DeleteWorkloadRequest, 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]] = (), ) -> None: @@ -601,7 +603,7 @@ def get_workload( request: Union[assuredworkloads.GetWorkloadRequest, 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]] = (), ) -> assuredworkloads.Workload: @@ -676,7 +678,7 @@ def list_workloads( request: Union[assuredworkloads.ListWorkloadsRequest, 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.ListWorkloadsPager: diff --git a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py b/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py index 7eb7985..2771034 100644 --- a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py +++ b/google/cloud/assuredworkloads_v1/services/assured_workloads_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 @@ -40,15 +39,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 AssuredWorkloadsServiceTransport(abc.ABC): """Abstract transport class for AssuredWorkloadsService.""" @@ -98,7 +88,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 @@ -131,29 +121,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 = { @@ -184,7 +151,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/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py b/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py index 8cdb040..73113f6 100644 --- a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py +++ b/google/cloud/assuredworkloads_v1/services/assured_workloads_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/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py b/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py index 09f3b36..838ce17 100644 --- a/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/google/cloud/assuredworkloads_v1/services/assured_workloads_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/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py index d47e8f2..bcec3ca 100644 --- a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py +++ b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_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.assuredworkloads_v1beta1.services.assured_workloads_service import ( @@ -176,18 +178,18 @@ def __init__( async def create_workload( self, - request: assuredworkloads_v1beta1.CreateWorkloadRequest = None, + request: Union[assuredworkloads_v1beta1.CreateWorkloadRequest, dict] = None, *, parent: str = None, workload: assuredworkloads_v1beta1.Workload = 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 Assured Workload. Args: - request (:class:`google.cloud.assuredworkloads_v1beta1.types.CreateWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1beta1.types.CreateWorkloadRequest, dict]): The request object. Request for creating a workload. parent (:class:`str`): Required. The resource name of the new Workload's @@ -265,11 +267,11 @@ async def create_workload( async def update_workload( self, - request: assuredworkloads_v1beta1.UpdateWorkloadRequest = None, + request: Union[assuredworkloads_v1beta1.UpdateWorkloadRequest, dict] = None, *, workload: assuredworkloads_v1beta1.Workload = 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]] = (), ) -> assuredworkloads_v1beta1.Workload: @@ -279,7 +281,7 @@ async def update_workload( workload can be in progress. Args: - request (:class:`google.cloud.assuredworkloads_v1beta1.types.UpdateWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1beta1.types.UpdateWorkloadRequest, dict]): The request object. Request for Updating a workload. workload (:class:`google.cloud.assuredworkloads_v1beta1.types.Workload`): Required. The workload to update. The workload’s @@ -353,10 +355,10 @@ async def update_workload( async def delete_workload( self, - request: assuredworkloads_v1beta1.DeleteWorkloadRequest = None, + request: Union[assuredworkloads_v1beta1.DeleteWorkloadRequest, 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]] = (), ) -> None: @@ -365,7 +367,7 @@ async def delete_workload( with a FAILED_PRECONDITION error. Args: - request (:class:`google.cloud.assuredworkloads_v1beta1.types.DeleteWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1beta1.types.DeleteWorkloadRequest, dict]): The request object. Request for deleting a Workload. name (:class:`str`): Required. The ``name`` field is used to identify the @@ -428,17 +430,17 @@ async def delete_workload( async def get_workload( self, - request: assuredworkloads_v1beta1.GetWorkloadRequest = None, + request: Union[assuredworkloads_v1beta1.GetWorkloadRequest, 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]] = (), ) -> assuredworkloads_v1beta1.Workload: r"""Gets Assured Workload associated with a CRM Node Args: - request (:class:`google.cloud.assuredworkloads_v1beta1.types.GetWorkloadRequest`): + request (Union[google.cloud.assuredworkloads_v1beta1.types.GetWorkloadRequest, dict]): The request object. Request for fetching a workload. name (:class:`str`): Required. The resource name of the Workload to fetch. @@ -512,17 +514,17 @@ async def get_workload( async def list_workloads( self, - request: assuredworkloads_v1beta1.ListWorkloadsRequest = None, + request: Union[assuredworkloads_v1beta1.ListWorkloadsRequest, 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.ListWorkloadsAsyncPager: r"""Lists Assured Workloads under a CRM Node. Args: - request (:class:`google.cloud.assuredworkloads_v1beta1.types.ListWorkloadsRequest`): + request (Union[google.cloud.assuredworkloads_v1beta1.types.ListWorkloadsRequest, dict]): The request object. Request for fetching workloads in an organization. parent (:class:`str`): diff --git a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py index 29ba693..268bdcf 100644 --- a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py +++ b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_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.assuredworkloads_v1beta1.services.assured_workloads_service import ( @@ -361,7 +363,7 @@ def create_workload( *, parent: str = None, workload: assuredworkloads_v1beta1.Workload = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -450,7 +452,7 @@ def update_workload( *, workload: assuredworkloads_v1beta1.Workload = 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]] = (), ) -> assuredworkloads_v1beta1.Workload: @@ -537,7 +539,7 @@ def delete_workload( request: Union[assuredworkloads_v1beta1.DeleteWorkloadRequest, 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]] = (), ) -> None: @@ -603,7 +605,7 @@ def get_workload( request: Union[assuredworkloads_v1beta1.GetWorkloadRequest, 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]] = (), ) -> assuredworkloads_v1beta1.Workload: @@ -678,7 +680,7 @@ def list_workloads( request: Union[assuredworkloads_v1beta1.ListWorkloadsRequest, 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.ListWorkloadsPager: diff --git a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py index f8d6133..4194055 100644 --- a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py +++ b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_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 @@ -40,15 +39,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 AssuredWorkloadsServiceTransport(abc.ABC): """Abstract transport class for AssuredWorkloadsService.""" @@ -98,7 +88,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 @@ -131,29 +121,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 = { @@ -217,7 +184,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/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py index f823610..38d557d 100644 --- a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py +++ b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_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/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py index 9b43b8e..796a156 100644 --- a/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_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/assuredworkloads_v1beta1/types/assuredworkloads_v1beta1.py b/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads_v1beta1.py index 02c04bc..02a40ba 100644 --- a/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads_v1beta1.py +++ b/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads_v1beta1.py @@ -160,6 +160,13 @@ class Workload(proto.Message): r"""An Workload object for managing highly regulated workloads of cloud customers. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): Optional. The resource name of the workload. @@ -198,16 +205,20 @@ class Workload(proto.Message): il4_settings (google.cloud.assuredworkloads_v1beta1.types.Workload.IL4Settings): Required. Input only. Immutable. Settings specific to resources needed for IL4. + This field is a member of `oneof`_ ``compliance_regime_settings``. cjis_settings (google.cloud.assuredworkloads_v1beta1.types.Workload.CJISSettings): Required. Input only. Immutable. Settings specific to resources needed for CJIS. + This field is a member of `oneof`_ ``compliance_regime_settings``. fedramp_high_settings (google.cloud.assuredworkloads_v1beta1.types.Workload.FedrampHighSettings): Required. Input only. Immutable. Settings specific to resources needed for FedRAMP High. + This field is a member of `oneof`_ ``compliance_regime_settings``. fedramp_moderate_settings (google.cloud.assuredworkloads_v1beta1.types.Workload.FedrampModerateSettings): Required. Input only. Immutable. Settings specific to resources needed for FedRAMP Moderate. + This field is a member of `oneof`_ ``compliance_regime_settings``. etag (str): Optional. ETag of the workload, it is calculated on the basis of the Workload diff --git a/scripts/fixup_assuredworkloads_v1beta1_keywords.py b/scripts/fixup_assuredworkloads_v1beta1_keywords.py index a5168ee..c5e3062 100644 --- a/scripts/fixup_assuredworkloads_v1beta1_keywords.py +++ b/scripts/fixup_assuredworkloads_v1beta1_keywords.py @@ -1,5 +1,5 @@ +#! /usr/bin/env python3 # -*- coding: utf-8 -*- - # Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - import argparse import os import libcst as cst @@ -40,12 +39,11 @@ def partition( class assuredworkloadsCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_workload': ('parent', 'workload', 'external_id', ), - 'delete_workload': ('name', 'etag', ), - 'get_workload': ('name', ), - 'list_workloads': ('parent', 'page_size', 'page_token', 'filter', ), - 'update_workload': ('workload', 'update_mask', ), - + 'create_workload': ('parent', 'workload', 'external_id', ), + 'delete_workload': ('name', 'etag', ), + 'get_workload': ('name', ), + 'list_workloads': ('parent', 'page_size', 'page_token', 'filter', ), + 'update_workload': ('workload', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -64,7 +62,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) @@ -76,7 +74,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: value=cst.Dict([ cst.DictElement( cst.SimpleString("'{}'".format(name)), - cst.Element(value=arg.value) +cst.Element(value=arg.value) ) # Note: the args + kwargs looks silly, but keep in mind that # the control parameters had to be stripped out, and that diff --git a/setup.py b/setup.py index ae3e541..f9f509d 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", classifiers=[ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index cc4d1f9..6b451bc 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,9 +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 -# TODO: remove once google-auth>=1.25.0 is required transitively -# through google-api-core>=1.28.0 -google-auth==1.24.0 diff --git a/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py b/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py index fcd385c..396b9f0 100644 --- a/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py +++ b/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_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.assuredworkloads_v1.services.assured_workloads_service import ( transports, ) -from google.cloud.assuredworkloads_v1.services.assured_workloads_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.assuredworkloads_v1.types import assuredworkloads from google.longrunning import operations_pb2 from google.oauth2 import service_account @@ -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" @@ -232,7 +214,7 @@ def test_assured_workloads_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, @@ -249,7 +231,7 @@ def test_assured_workloads_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, @@ -266,7 +248,7 @@ def test_assured_workloads_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, @@ -295,7 +277,7 @@ def test_assured_workloads_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, @@ -364,7 +346,7 @@ def test_assured_workloads_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 @@ -406,7 +388,7 @@ def test_assured_workloads_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, @@ -428,7 +410,7 @@ def test_assured_workloads_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, @@ -463,7 +445,7 @@ def test_assured_workloads_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, @@ -498,7 +480,7 @@ def test_assured_workloads_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", @@ -1915,7 +1897,6 @@ def test_assured_workloads_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1936,26 +1917,6 @@ def test_assured_workloads_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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.assuredworkloads_v1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.AssuredWorkloadsServiceTransport( - 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_assured_workloads_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( @@ -1967,7 +1928,6 @@ def test_assured_workloads_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1980,18 +1940,6 @@ def test_assured_workloads_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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) - AssuredWorkloadsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1999,7 +1947,6 @@ def test_assured_workloads_service_auth_adc_old_google_auth(): transports.AssuredWorkloadsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2013,26 +1960,6 @@ def test_assured_workloads_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.AssuredWorkloadsServiceGrpcTransport, - transports.AssuredWorkloadsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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/assuredworkloads_v1beta1/test_assured_workloads_service.py b/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py index 65f6d92..cb23c8e 100644 --- a/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py +++ b/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -47,9 +46,6 @@ from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( transports, ) -from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads_v1beta1 from google.longrunning import operations_pb2 from google.oauth2 import service_account @@ -59,20 +55,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" @@ -234,7 +216,7 @@ def test_assured_workloads_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, @@ -251,7 +233,7 @@ def test_assured_workloads_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, @@ -268,7 +250,7 @@ def test_assured_workloads_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, @@ -297,7 +279,7 @@ def test_assured_workloads_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, @@ -366,7 +348,7 @@ def test_assured_workloads_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 @@ -408,7 +390,7 @@ def test_assured_workloads_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, @@ -430,7 +412,7 @@ def test_assured_workloads_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, @@ -465,7 +447,7 @@ def test_assured_workloads_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, @@ -500,7 +482,7 @@ def test_assured_workloads_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", @@ -1956,7 +1938,6 @@ def test_assured_workloads_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1977,26 +1958,6 @@ def test_assured_workloads_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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.assuredworkloads_v1beta1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.AssuredWorkloadsServiceTransport( - 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_assured_workloads_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( @@ -2008,7 +1969,6 @@ def test_assured_workloads_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2021,18 +1981,6 @@ def test_assured_workloads_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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) - AssuredWorkloadsServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2040,7 +1988,6 @@ def test_assured_workloads_service_auth_adc_old_google_auth(): transports.AssuredWorkloadsServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_assured_workloads_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2054,26 +2001,6 @@ def test_assured_workloads_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.AssuredWorkloadsServiceGrpcTransport, - transports.AssuredWorkloadsServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_assured_workloads_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", [