From 22ed89dcaa628790d09584b3bd20c35115647bb7 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 11:28:12 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#143) - [ ] 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 --- .../async_client.py | 58 ++++++------ .../recaptcha_enterprise_service/client.py | 20 ++-- .../transports/base.py | 35 +------ .../transports/grpc_asyncio.py | 1 - .../types/recaptchaenterprise.py | 10 ++ setup.py | 5 +- testing/constraints-3.6.txt | 3 +- .../test_recaptcha_enterprise_service.py | 93 ++----------------- 8 files changed, 64 insertions(+), 161 deletions(-) diff --git a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/async_client.py b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/async_client.py index 4195fa7..3706409 100644 --- a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/async_client.py +++ b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_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.cloud.recaptchaenterprise_v1.services.recaptcha_enterprise_service import ( pagers, ) @@ -181,11 +183,11 @@ def __init__( async def create_assessment( self, - request: recaptchaenterprise.CreateAssessmentRequest = None, + request: Union[recaptchaenterprise.CreateAssessmentRequest, dict] = None, *, parent: str = None, assessment: recaptchaenterprise.Assessment = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Assessment: @@ -193,7 +195,7 @@ async def create_assessment( legitimate. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.CreateAssessmentRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.CreateAssessmentRequest, dict]): The request object. The create assessment request message. parent (:class:`str`): @@ -260,11 +262,11 @@ async def create_assessment( async def annotate_assessment( self, - request: recaptchaenterprise.AnnotateAssessmentRequest = None, + request: Union[recaptchaenterprise.AnnotateAssessmentRequest, dict] = None, *, name: str = None, annotation: recaptchaenterprise.AnnotateAssessmentRequest.Annotation = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.AnnotateAssessmentResponse: @@ -273,7 +275,7 @@ async def annotate_assessment( to be authentic or fraudulent. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.AnnotateAssessmentRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.AnnotateAssessmentRequest, dict]): The request object. The request message to annotate an Assessment. name (:class:`str`): @@ -347,16 +349,16 @@ async def annotate_assessment( async def create_key( self, - request: recaptchaenterprise.CreateKeyRequest = None, + request: Union[recaptchaenterprise.CreateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: r"""Creates a new reCAPTCHA Enterprise key. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.CreateKeyRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.CreateKeyRequest, dict]): The request object. The create key request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -396,9 +398,9 @@ async def create_key( async def list_keys( self, - request: recaptchaenterprise.ListKeysRequest = None, + request: Union[recaptchaenterprise.ListKeysRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListKeysAsyncPager: @@ -406,7 +408,7 @@ async def list_keys( project. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.ListKeysRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.ListKeysRequest, dict]): The request object. The list keys request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -454,16 +456,16 @@ async def list_keys( async def get_key( self, - request: recaptchaenterprise.GetKeyRequest = None, + request: Union[recaptchaenterprise.GetKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: r"""Returns the specified key. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.GetKeyRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.GetKeyRequest, dict]): The request object. The get key request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -503,16 +505,16 @@ async def get_key( async def update_key( self, - request: recaptchaenterprise.UpdateKeyRequest = None, + request: Union[recaptchaenterprise.UpdateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: r"""Updates the specified key. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.UpdateKeyRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.UpdateKeyRequest, dict]): The request object. The update key request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -552,16 +554,16 @@ async def update_key( async def delete_key( self, - request: recaptchaenterprise.DeleteKeyRequest = None, + request: Union[recaptchaenterprise.DeleteKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes the specified key. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.DeleteKeyRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.DeleteKeyRequest, dict]): The request object. The delete key request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -593,9 +595,9 @@ async def delete_key( async def migrate_key( self, - request: recaptchaenterprise.MigrateKeyRequest = None, + request: Union[recaptchaenterprise.MigrateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: @@ -608,7 +610,7 @@ async def migrate_key( role in the destination project. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.MigrateKeyRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.MigrateKeyRequest, dict]): The request object. The migrate key request message. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -648,10 +650,10 @@ async def migrate_key( async def get_metrics( self, - request: recaptchaenterprise.GetMetricsRequest = None, + request: Union[recaptchaenterprise.GetMetricsRequest, 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]] = (), ) -> recaptchaenterprise.Metrics: @@ -659,7 +661,7 @@ async def get_metrics( be used to build dashboards. Args: - request (:class:`google.cloud.recaptchaenterprise_v1.types.GetMetricsRequest`): + request (Union[google.cloud.recaptchaenterprise_v1.types.GetMetricsRequest, dict]): The request object. The get metrics request message. name (:class:`str`): Required. The name of the requested diff --git a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/client.py b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/client.py index 14d3ae3..f5010e7 100644 --- a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/client.py +++ b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_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.cloud.recaptchaenterprise_v1.services.recaptcha_enterprise_service import ( pagers, ) @@ -379,7 +381,7 @@ def create_assessment( *, parent: str = None, assessment: recaptchaenterprise.Assessment = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Assessment: @@ -458,7 +460,7 @@ def annotate_assessment( *, name: str = None, annotation: recaptchaenterprise.AnnotateAssessmentRequest.Annotation = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.AnnotateAssessmentResponse: @@ -543,7 +545,7 @@ def create_key( self, request: Union[recaptchaenterprise.CreateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: @@ -593,7 +595,7 @@ def list_keys( self, request: Union[recaptchaenterprise.ListKeysRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListKeysPager: @@ -652,7 +654,7 @@ def get_key( self, request: Union[recaptchaenterprise.GetKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: @@ -702,7 +704,7 @@ def update_key( self, request: Union[recaptchaenterprise.UpdateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: @@ -752,7 +754,7 @@ def delete_key( self, request: Union[recaptchaenterprise.DeleteKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -794,7 +796,7 @@ def migrate_key( self, request: Union[recaptchaenterprise.MigrateKeyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recaptchaenterprise.Key: @@ -851,7 +853,7 @@ def get_metrics( request: Union[recaptchaenterprise.GetMetricsRequest, 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]] = (), ) -> recaptchaenterprise.Metrics: diff --git a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/base.py b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/base.py index 16269de..34aa42e 100644 --- a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/base.py +++ b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_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 @@ -38,15 +37,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 RecaptchaEnterpriseServiceTransport(abc.ABC): """Abstract transport class for RecaptchaEnterpriseService.""" @@ -96,7 +86,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 @@ -129,29 +119,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 = { diff --git a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/grpc_asyncio.py b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/grpc_asyncio.py index 57ece55..ec821bb 100644 --- a/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/grpc_asyncio.py +++ b/google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # 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 diff --git a/google/cloud/recaptchaenterprise_v1/types/recaptchaenterprise.py b/google/cloud/recaptchaenterprise_v1/types/recaptchaenterprise.py index 3186f38..543c8b7 100644 --- a/google/cloud/recaptchaenterprise_v1/types/recaptchaenterprise.py +++ b/google/cloud/recaptchaenterprise_v1/types/recaptchaenterprise.py @@ -399,6 +399,13 @@ class Key(proto.Message): r"""A key used to identify and configure applications (web and/or mobile) that use reCAPTCHA Enterprise. + 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): The resource name for the Key in the format @@ -409,12 +416,15 @@ class Key(proto.Message): web_settings (google.cloud.recaptchaenterprise_v1.types.WebKeySettings): Settings for keys that can be used by websites. + This field is a member of `oneof`_ ``platform_settings``. android_settings (google.cloud.recaptchaenterprise_v1.types.AndroidKeySettings): Settings for keys that can be used by Android apps. + This field is a member of `oneof`_ ``platform_settings``. ios_settings (google.cloud.recaptchaenterprise_v1.types.IOSKeySettings): Settings for keys that can be used by iOS apps. + This field is a member of `oneof`_ ``platform_settings``. labels (Sequence[google.cloud.recaptchaenterprise_v1.types.Key.LabelsEntry]): See = 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "proto-plus >= 1.10.0", - "packaging >= 14.3", ), - extras_requires={}, + extras_require={}, python_requires=">=3.6", classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 3ba086c..da8c573 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,6 +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.10.0 -packaging==14.3 diff --git a/tests/unit/gapic/recaptchaenterprise_v1/test_recaptcha_enterprise_service.py b/tests/unit/gapic/recaptchaenterprise_v1/test_recaptcha_enterprise_service.py index 779ef8c..09d22be 100644 --- a/tests/unit/gapic/recaptchaenterprise_v1/test_recaptcha_enterprise_service.py +++ b/tests/unit/gapic/recaptchaenterprise_v1/test_recaptcha_enterprise_service.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.recaptchaenterprise_v1.services.recaptcha_enterprise_service import ( transports, ) -from google.cloud.recaptchaenterprise_v1.services.recaptcha_enterprise_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.recaptchaenterprise_v1.types import recaptchaenterprise from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore @@ -54,20 +50,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -237,7 +219,7 @@ def test_recaptcha_enterprise_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, @@ -254,7 +236,7 @@ def test_recaptcha_enterprise_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, @@ -271,7 +253,7 @@ def test_recaptcha_enterprise_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, @@ -300,7 +282,7 @@ def test_recaptcha_enterprise_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, @@ -369,7 +351,7 @@ def test_recaptcha_enterprise_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 @@ -411,7 +393,7 @@ def test_recaptcha_enterprise_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, @@ -433,7 +415,7 @@ def test_recaptcha_enterprise_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, @@ -468,7 +450,7 @@ def test_recaptcha_enterprise_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, @@ -503,7 +485,7 @@ def test_recaptcha_enterprise_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", @@ -2329,7 +2311,6 @@ def test_recaptcha_enterprise_service_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_recaptcha_enterprise_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2350,26 +2331,6 @@ def test_recaptcha_enterprise_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_recaptcha_enterprise_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.recaptchaenterprise_v1.services.recaptcha_enterprise_service.transports.RecaptchaEnterpriseServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.RecaptchaEnterpriseServiceTransport( - 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_recaptcha_enterprise_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( @@ -2381,7 +2342,6 @@ def test_recaptcha_enterprise_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_recaptcha_enterprise_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2394,18 +2354,6 @@ def test_recaptcha_enterprise_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_recaptcha_enterprise_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) - RecaptchaEnterpriseServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2413,7 +2361,6 @@ def test_recaptcha_enterprise_service_auth_adc_old_google_auth(): transports.RecaptchaEnterpriseServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_recaptcha_enterprise_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2427,28 +2374,6 @@ def test_recaptcha_enterprise_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.RecaptchaEnterpriseServiceGrpcTransport, - transports.RecaptchaEnterpriseServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_recaptcha_enterprise_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", [