diff --git a/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py b/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py index a4fe9a3..dfbad0d 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_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.managedidentities_v1.services.managed_identities_service import pagers @@ -209,19 +211,21 @@ def __init__( async def create_microsoft_ad_domain( self, - request: managed_identities_service.CreateMicrosoftAdDomainRequest = None, + request: Union[ + managed_identities_service.CreateMicrosoftAdDomainRequest, dict + ] = None, *, parent: str = None, domain_name: str = None, domain: resource.Domain = 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 Microsoft AD domain. Args: - request (:class:`google.cloud.managedidentities_v1.types.CreateMicrosoftAdDomainRequest`): + request (Union[google.cloud.managedidentities_v1.types.CreateMicrosoftAdDomainRequest, dict]): The request object. Request message for [CreateMicrosoftAdDomain][google.cloud.managedidentities.v1.CreateMicrosoftAdDomain] parent (:class:`str`): @@ -323,17 +327,19 @@ async def create_microsoft_ad_domain( async def reset_admin_password( self, - request: managed_identities_service.ResetAdminPasswordRequest = None, + request: Union[ + managed_identities_service.ResetAdminPasswordRequest, 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]] = (), ) -> managed_identities_service.ResetAdminPasswordResponse: r"""Resets a domain's administrator password. Args: - request (:class:`google.cloud.managedidentities_v1.types.ResetAdminPasswordRequest`): + request (Union[google.cloud.managedidentities_v1.types.ResetAdminPasswordRequest, dict]): The request object. Request message for [ResetAdminPassword][google.cloud.managedidentities.v1.ResetAdminPassword] name (:class:`str`): @@ -394,17 +400,17 @@ async def reset_admin_password( async def list_domains( self, - request: managed_identities_service.ListDomainsRequest = None, + request: Union[managed_identities_service.ListDomainsRequest, 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.ListDomainsAsyncPager: r"""Lists domains in a project. Args: - request (:class:`google.cloud.managedidentities_v1.types.ListDomainsRequest`): + request (Union[google.cloud.managedidentities_v1.types.ListDomainsRequest, dict]): The request object. Request message for [ListDomains][google.cloud.managedidentities.v1.ListDomains] parent (:class:`str`): @@ -474,17 +480,17 @@ async def list_domains( async def get_domain( self, - request: managed_identities_service.GetDomainRequest = None, + request: Union[managed_identities_service.GetDomainRequest, 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]] = (), ) -> resource.Domain: r"""Gets information about a domain. Args: - request (:class:`google.cloud.managedidentities_v1.types.GetDomainRequest`): + request (Union[google.cloud.managedidentities_v1.types.GetDomainRequest, dict]): The request object. Request message for [GetDomain][google.cloud.managedidentities.v1.GetDomain] name (:class:`str`): @@ -545,18 +551,18 @@ async def get_domain( async def update_domain( self, - request: managed_identities_service.UpdateDomainRequest = None, + request: Union[managed_identities_service.UpdateDomainRequest, dict] = None, *, domain: resource.Domain = 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 metadata and configuration of a domain. Args: - request (:class:`google.cloud.managedidentities_v1.types.UpdateDomainRequest`): + request (Union[google.cloud.managedidentities_v1.types.UpdateDomainRequest, dict]): The request object. Request message for [UpdateDomain][google.cloud.managedidentities.v1.UpdateDomain] domain (:class:`google.cloud.managedidentities_v1.types.Domain`): @@ -645,17 +651,17 @@ async def update_domain( async def delete_domain( self, - request: managed_identities_service.DeleteDomainRequest = None, + request: Union[managed_identities_service.DeleteDomainRequest, 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 domain. Args: - request (:class:`google.cloud.managedidentities_v1.types.DeleteDomainRequest`): + request (Union[google.cloud.managedidentities_v1.types.DeleteDomainRequest, dict]): The request object. Request message for [DeleteDomain][google.cloud.managedidentities.v1.DeleteDomain] name (:class:`str`): @@ -737,18 +743,18 @@ async def delete_domain( async def attach_trust( self, - request: managed_identities_service.AttachTrustRequest = None, + request: Union[managed_identities_service.AttachTrustRequest, dict] = None, *, name: str = None, trust: resource.Trust = 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"""Adds an AD trust to a domain. Args: - request (:class:`google.cloud.managedidentities_v1.types.AttachTrustRequest`): + request (Union[google.cloud.managedidentities_v1.types.AttachTrustRequest, dict]): The request object. Request message for [AttachTrust][google.cloud.managedidentities.v1.AttachTrust] name (:class:`str`): @@ -828,19 +834,19 @@ async def attach_trust( async def reconfigure_trust( self, - request: managed_identities_service.ReconfigureTrustRequest = None, + request: Union[managed_identities_service.ReconfigureTrustRequest, dict] = None, *, name: str = None, target_domain_name: str = None, target_dns_ip_addresses: Sequence[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"""Updates the DNS conditional forwarder. Args: - request (:class:`google.cloud.managedidentities_v1.types.ReconfigureTrustRequest`): + request (Union[google.cloud.managedidentities_v1.types.ReconfigureTrustRequest, dict]): The request object. Request message for [ReconfigureTrust][google.cloud.managedidentities.v1.ReconfigureTrust] name (:class:`str`): @@ -933,18 +939,18 @@ async def reconfigure_trust( async def detach_trust( self, - request: managed_identities_service.DetachTrustRequest = None, + request: Union[managed_identities_service.DetachTrustRequest, dict] = None, *, name: str = None, trust: resource.Trust = 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"""Removes an AD trust. Args: - request (:class:`google.cloud.managedidentities_v1.types.DetachTrustRequest`): + request (Union[google.cloud.managedidentities_v1.types.DetachTrustRequest, dict]): The request object. Request message for [DetachTrust][google.cloud.managedidentities.v1.DetachTrust] name (:class:`str`): @@ -1026,11 +1032,11 @@ async def detach_trust( async def validate_trust( self, - request: managed_identities_service.ValidateTrustRequest = None, + request: Union[managed_identities_service.ValidateTrustRequest, dict] = None, *, name: str = None, trust: resource.Trust = 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: @@ -1039,7 +1045,7 @@ async def validate_trust( incoming trust requests. Args: - request (:class:`google.cloud.managedidentities_v1.types.ValidateTrustRequest`): + request (Union[google.cloud.managedidentities_v1.types.ValidateTrustRequest, dict]): The request object. Request message for [ValidateTrust][google.cloud.managedidentities.v1.ValidateTrust] name (:class:`str`): diff --git a/google/cloud/managedidentities_v1/services/managed_identities_service/client.py b/google/cloud/managedidentities_v1/services/managed_identities_service/client.py index 00335b5..0567cb0 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/client.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_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.managedidentities_v1.services.managed_identities_service import pagers @@ -399,7 +401,7 @@ def create_microsoft_ad_domain( parent: str = None, domain_name: str = None, domain: resource.Domain = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -517,7 +519,7 @@ def reset_admin_password( ] = 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]] = (), ) -> managed_identities_service.ResetAdminPasswordResponse: @@ -590,7 +592,7 @@ def list_domains( request: Union[managed_identities_service.ListDomainsRequest, 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.ListDomainsPager: @@ -670,7 +672,7 @@ def get_domain( request: Union[managed_identities_service.GetDomainRequest, 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]] = (), ) -> resource.Domain: @@ -742,7 +744,7 @@ def update_domain( *, domain: resource.Domain = 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: @@ -841,7 +843,7 @@ def delete_domain( request: Union[managed_identities_service.DeleteDomainRequest, 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: @@ -934,7 +936,7 @@ def attach_trust( *, name: str = None, trust: resource.Trust = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1026,7 +1028,7 @@ def reconfigure_trust( name: str = None, target_domain_name: str = None, target_dns_ip_addresses: Sequence[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: @@ -1130,7 +1132,7 @@ def detach_trust( *, name: str = None, trust: resource.Trust = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1223,7 +1225,7 @@ def validate_trust( *, name: str = None, trust: resource.Trust = 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/managedidentities_v1/services/managed_identities_service/transports/base.py b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py index 4f61e09..d60bbd2 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_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 ManagedIdentitiesServiceTransport(abc.ABC): """Abstract transport class for ManagedIdentitiesService.""" @@ -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 = { @@ -203,7 +170,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/managedidentities_v1/services/managed_identities_service/transports/grpc.py b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py index e42a310..c81915d 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py @@ -147,7 +147,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/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py index eaf3753..6c987e9 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_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 @@ -194,7 +193,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 0d0cd8d..dfa4772 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,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.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "libcst >= 0.2.5", "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 ce83770..2aef716 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -19,10 +19,6 @@ # # 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 libcst==0.2.5 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/managedidentities_v1/test_managed_identities_service.py b/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py index 5982639..35909da 100644 --- a/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py +++ b/tests/unit/gapic/managedidentities_v1/test_managed_identities_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.managedidentities_v1.services.managed_identities_service import ( transports, ) -from google.cloud.managedidentities_v1.services.managed_identities_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.managedidentities_v1.types import managed_identities_service from google.cloud.managedidentities_v1.types import resource from google.longrunning import operations_pb2 @@ -57,20 +53,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -238,7 +220,7 @@ def test_managed_identities_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_managed_identities_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -272,7 +254,7 @@ def test_managed_identities_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -301,7 +283,7 @@ def test_managed_identities_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -370,7 +352,7 @@ def test_managed_identities_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -412,7 +394,7 @@ def test_managed_identities_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -434,7 +416,7 @@ def test_managed_identities_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_managed_identities_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -504,7 +486,7 @@ def test_managed_identities_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", @@ -3057,7 +3039,6 @@ def test_managed_identities_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_managed_identities_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -3078,26 +3059,6 @@ def test_managed_identities_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_managed_identities_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.managedidentities_v1.services.managed_identities_service.transports.ManagedIdentitiesServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.ManagedIdentitiesServiceTransport( - 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_managed_identities_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( @@ -3109,7 +3070,6 @@ def test_managed_identities_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_managed_identities_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -3122,18 +3082,6 @@ def test_managed_identities_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_managed_identities_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) - ManagedIdentitiesServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -3141,7 +3089,6 @@ def test_managed_identities_service_auth_adc_old_google_auth(): transports.ManagedIdentitiesServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_managed_identities_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -3155,26 +3102,6 @@ def test_managed_identities_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.ManagedIdentitiesServiceGrpcTransport, - transports.ManagedIdentitiesServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_managed_identities_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", [