diff --git a/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py b/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py index 642a154..c64bb59 100644 --- a/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py +++ b/google/cloud/filestore_v1/services/cloud_filestore_manager/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.common.types import operation_metadata as operation_metadata_pb2 # type: ignore @@ -198,10 +200,10 @@ def __init__( async def list_instances( self, - request: cloud_filestore_service.ListInstancesRequest = None, + request: Union[cloud_filestore_service.ListInstancesRequest, 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.ListInstancesAsyncPager: @@ -209,7 +211,7 @@ async def list_instances( specified location or for all locations. Args: - request (:class:`google.cloud.filestore_v1.types.ListInstancesRequest`): + request (Union[google.cloud.filestore_v1.types.ListInstancesRequest, dict]): The request object. ListInstancesRequest lists instances. parent (:class:`str`): @@ -292,17 +294,17 @@ async def list_instances( async def get_instance( self, - request: cloud_filestore_service.GetInstanceRequest = None, + request: Union[cloud_filestore_service.GetInstanceRequest, 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]] = (), ) -> cloud_filestore_service.Instance: r"""Gets the details of a specific instance. Args: - request (:class:`google.cloud.filestore_v1.types.GetInstanceRequest`): + request (Union[google.cloud.filestore_v1.types.GetInstanceRequest, dict]): The request object. GetInstanceRequest gets the state of an instance. name (:class:`str`): @@ -370,12 +372,12 @@ async def get_instance( async def create_instance( self, - request: cloud_filestore_service.CreateInstanceRequest = None, + request: Union[cloud_filestore_service.CreateInstanceRequest, dict] = None, *, parent: str = None, instance: cloud_filestore_service.Instance = None, instance_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: @@ -386,7 +388,7 @@ async def create_instance( the minimum capacity of the tier). Args: - request (:class:`google.cloud.filestore_v1.types.CreateInstanceRequest`): + request (Union[google.cloud.filestore_v1.types.CreateInstanceRequest, dict]): The request object. CreateInstanceRequest creates an instance. parent (:class:`str`): @@ -479,18 +481,18 @@ async def create_instance( async def update_instance( self, - request: cloud_filestore_service.UpdateInstanceRequest = None, + request: Union[cloud_filestore_service.UpdateInstanceRequest, dict] = None, *, instance: cloud_filestore_service.Instance = 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 settings of a specific instance. Args: - request (:class:`google.cloud.filestore_v1.types.UpdateInstanceRequest`): + request (Union[google.cloud.filestore_v1.types.UpdateInstanceRequest, dict]): The request object. UpdateInstanceRequest updates the settings of an instance. instance (:class:`google.cloud.filestore_v1.types.Instance`): @@ -576,9 +578,9 @@ async def update_instance( async def restore_instance( self, - request: cloud_filestore_service.RestoreInstanceRequest = None, + request: Union[cloud_filestore_service.RestoreInstanceRequest, dict] = 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: @@ -589,7 +591,7 @@ async def restore_instance( to or larger than the minimum capacity of the tier). Args: - request (:class:`google.cloud.filestore_v1.types.RestoreInstanceRequest`): + request (Union[google.cloud.filestore_v1.types.RestoreInstanceRequest, dict]): The request object. RestoreInstanceRequest restores an existing instances's file share from a backup. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -640,17 +642,17 @@ async def restore_instance( async def delete_instance( self, - request: cloud_filestore_service.DeleteInstanceRequest = None, + request: Union[cloud_filestore_service.DeleteInstanceRequest, 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 an instance. Args: - request (:class:`google.cloud.filestore_v1.types.DeleteInstanceRequest`): + request (Union[google.cloud.filestore_v1.types.DeleteInstanceRequest, dict]): The request object. DeleteInstanceRequest deletes an instance. name (:class:`str`): @@ -732,10 +734,10 @@ async def delete_instance( async def list_backups( self, - request: cloud_filestore_service.ListBackupsRequest = None, + request: Union[cloud_filestore_service.ListBackupsRequest, 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.ListBackupsAsyncPager: @@ -743,7 +745,7 @@ async def list_backups( location or for all locations. Args: - request (:class:`google.cloud.filestore_v1.types.ListBackupsRequest`): + request (Union[google.cloud.filestore_v1.types.ListBackupsRequest, dict]): The request object. ListBackupsRequest lists backups. parent (:class:`str`): Required. The project and location for which to retrieve @@ -825,17 +827,17 @@ async def list_backups( async def get_backup( self, - request: cloud_filestore_service.GetBackupRequest = None, + request: Union[cloud_filestore_service.GetBackupRequest, 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]] = (), ) -> cloud_filestore_service.Backup: r"""Gets the details of a specific backup. Args: - request (:class:`google.cloud.filestore_v1.types.GetBackupRequest`): + request (Union[google.cloud.filestore_v1.types.GetBackupRequest, dict]): The request object. GetBackupRequest gets the state of a backup. name (:class:`str`): @@ -903,19 +905,19 @@ async def get_backup( async def create_backup( self, - request: cloud_filestore_service.CreateBackupRequest = None, + request: Union[cloud_filestore_service.CreateBackupRequest, dict] = None, *, parent: str = None, backup: cloud_filestore_service.Backup = None, backup_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 backup. Args: - request (:class:`google.cloud.filestore_v1.types.CreateBackupRequest`): + request (Union[google.cloud.filestore_v1.types.CreateBackupRequest, dict]): The request object. CreateBackupRequest creates a backup. parent (:class:`str`): @@ -1013,17 +1015,17 @@ async def create_backup( async def delete_backup( self, - request: cloud_filestore_service.DeleteBackupRequest = None, + request: Union[cloud_filestore_service.DeleteBackupRequest, 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 backup. Args: - request (:class:`google.cloud.filestore_v1.types.DeleteBackupRequest`): + request (Union[google.cloud.filestore_v1.types.DeleteBackupRequest, dict]): The request object. DeleteBackupRequest deletes a backup. name (:class:`str`): @@ -1105,18 +1107,18 @@ async def delete_backup( async def update_backup( self, - request: cloud_filestore_service.UpdateBackupRequest = None, + request: Union[cloud_filestore_service.UpdateBackupRequest, dict] = None, *, backup: cloud_filestore_service.Backup = 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 settings of a specific backup. Args: - request (:class:`google.cloud.filestore_v1.types.UpdateBackupRequest`): + request (Union[google.cloud.filestore_v1.types.UpdateBackupRequest, dict]): The request object. UpdateBackupRequest updates description and/or labels for a backup. backup (:class:`google.cloud.filestore_v1.types.Backup`): diff --git a/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py b/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py index 1baf6a0..7c02bdf 100644 --- a/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py +++ b/google/cloud/filestore_v1/services/cloud_filestore_manager/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.common.types import operation_metadata as operation_metadata_pb2 # type: ignore @@ -400,7 +402,7 @@ def list_instances( request: Union[cloud_filestore_service.ListInstancesRequest, 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.ListInstancesPager: @@ -485,7 +487,7 @@ def get_instance( request: Union[cloud_filestore_service.GetInstanceRequest, 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]] = (), ) -> cloud_filestore_service.Instance: @@ -556,7 +558,7 @@ def create_instance( parent: str = None, instance: cloud_filestore_service.Instance = None, instance_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: @@ -664,7 +666,7 @@ def update_instance( *, instance: cloud_filestore_service.Instance = 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: @@ -759,7 +761,7 @@ def restore_instance( self, request: Union[cloud_filestore_service.RestoreInstanceRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -825,7 +827,7 @@ def delete_instance( request: Union[cloud_filestore_service.DeleteInstanceRequest, 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: @@ -917,7 +919,7 @@ def list_backups( request: Union[cloud_filestore_service.ListBackupsRequest, 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.ListBackupsPager: @@ -1001,7 +1003,7 @@ def get_backup( request: Union[cloud_filestore_service.GetBackupRequest, 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]] = (), ) -> cloud_filestore_service.Backup: @@ -1072,7 +1074,7 @@ def create_backup( parent: str = None, backup: cloud_filestore_service.Backup = None, backup_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: @@ -1180,7 +1182,7 @@ def delete_backup( request: Union[cloud_filestore_service.DeleteBackupRequest, 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: @@ -1273,7 +1275,7 @@ def update_backup( *, backup: cloud_filestore_service.Backup = 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: diff --git a/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py b/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py index e198d91..d986591 100644 --- a/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py +++ b/google/cloud/filestore_v1/services/cloud_filestore_manager/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 @@ -37,15 +36,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 CloudFilestoreManagerTransport(abc.ABC): """Abstract transport class for CloudFilestoreManager.""" @@ -95,7 +85,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 @@ -128,29 +118,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 = { @@ -243,7 +210,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/filestore_v1/services/cloud_filestore_manager/transports/grpc.py b/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py index a85055b..e74e577 100644 --- a/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py +++ b/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py @@ -134,7 +134,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/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py b/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py index d1cb2da..f3b4445 100644 --- a/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py +++ b/google/cloud/filestore_v1/services/cloud_filestore_manager/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 @@ -181,7 +180,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/filestore_v1/types/cloud_filestore_service.py b/google/cloud/filestore_v1/types/cloud_filestore_service.py index d643684..3cb975d 100644 --- a/google/cloud/filestore_v1/types/cloud_filestore_service.py +++ b/google/cloud/filestore_v1/types/cloud_filestore_service.py @@ -86,6 +86,8 @@ class AddressMode(proto.Enum): class FileShareConfig(proto.Message): r"""File share configuration for the instance. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): The name of the file share (must be 16 @@ -97,6 +99,7 @@ class FileShareConfig(proto.Message): The resource name of the backup, in the format ``projects/{project_number}/locations/{location_id}/backups/{backup_id}``, that this file share has been restored from. + This field is a member of `oneof`_ ``source``. nfs_export_options (Sequence[google.cloud.filestore_v1.types.NfsExportOptions]): Nfs Export Options. There is a limit of 10 export options per file @@ -300,6 +303,9 @@ class RestoreInstanceRequest(proto.Message): r"""RestoreInstanceRequest restores an existing instances's file share from a backup. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: name (str): Required. The resource name of the instance, in the format @@ -311,6 +317,7 @@ class RestoreInstanceRequest(proto.Message): source_backup (str): The resource name of the backup, in the format ``projects/{project_number}/locations/{location_id}/backups/{backup_id}``. + This field is a member of `oneof`_ ``source``. """ name = proto.Field(proto.STRING, number=1,) diff --git a/setup.py b/setup.py index 993f9b0..9e91d64 100644 --- a/setup.py +++ b/setup.py @@ -29,10 +29,9 @@ # 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.27.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "google-cloud-common >= 0.1.0", "proto-plus >= 1.15.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 d88187f..26b4b53 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -4,8 +4,6 @@ # Pin the version to the lower bound. # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", # Then this file should have google-cloud-foo==1.14.0 -google-api-core==1.27.0 +google-api-core==1.28.0 google-cloud-common==0.1.0 proto-plus==1.15.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/filestore_v1/test_cloud_filestore_manager.py b/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py index bfdd8df..ee18b6b 100644 --- a/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py +++ b/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -44,9 +43,6 @@ ) from google.cloud.filestore_v1.services.cloud_filestore_manager import pagers from google.cloud.filestore_v1.services.cloud_filestore_manager import transports -from google.cloud.filestore_v1.services.cloud_filestore_manager.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.filestore_v1.types import cloud_filestore_service from google.longrunning import operations_pb2 from google.oauth2 import service_account @@ -56,20 +52,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" @@ -231,7 +213,7 @@ def test_cloud_filestore_manager_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, @@ -248,7 +230,7 @@ def test_cloud_filestore_manager_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, @@ -265,7 +247,7 @@ def test_cloud_filestore_manager_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, @@ -294,7 +276,7 @@ def test_cloud_filestore_manager_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, @@ -363,7 +345,7 @@ def test_cloud_filestore_manager_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 @@ -405,7 +387,7 @@ def test_cloud_filestore_manager_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, @@ -427,7 +409,7 @@ def test_cloud_filestore_manager_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, @@ -462,7 +444,7 @@ def test_cloud_filestore_manager_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, @@ -497,7 +479,7 @@ def test_cloud_filestore_manager_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", @@ -3341,7 +3323,6 @@ def test_cloud_filestore_manager_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_cloud_filestore_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -3362,26 +3343,6 @@ def test_cloud_filestore_manager_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_cloud_filestore_manager_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.filestore_v1.services.cloud_filestore_manager.transports.CloudFilestoreManagerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.CloudFilestoreManagerTransport( - 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_cloud_filestore_manager_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( @@ -3393,7 +3354,6 @@ def test_cloud_filestore_manager_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_cloud_filestore_manager_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -3406,18 +3366,6 @@ def test_cloud_filestore_manager_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_cloud_filestore_manager_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) - CloudFilestoreManagerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -3425,7 +3373,6 @@ def test_cloud_filestore_manager_auth_adc_old_google_auth(): transports.CloudFilestoreManagerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_cloud_filestore_manager_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -3439,26 +3386,6 @@ def test_cloud_filestore_manager_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.CloudFilestoreManagerGrpcTransport, - transports.CloudFilestoreManagerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_cloud_filestore_manager_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", [