From b68553ff06d1f13cc77eb64909b53758e1610fd0 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 00:24:13 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#44) - [ ] 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 --- .../services/controller2/async_client.py | 22 +++-- .../services/controller2/client.py | 8 +- .../services/controller2/transports/base.py | 35 +------ .../controller2/transports/grpc_asyncio.py | 1 - .../services/debugger2/async_client.py | 34 ++++--- .../debugger_v2/services/debugger2/client.py | 12 ++- .../services/debugger2/transports/base.py | 35 +------ .../debugger2/transports/grpc_asyncio.py | 1 - setup.py | 3 +- testing/constraints-3.6.txt | 4 +- .../gapic/debugger_v2/test_controller2.py | 97 ++----------------- .../unit/gapic/debugger_v2/test_debugger2.py | 97 ++----------------- 12 files changed, 64 insertions(+), 285 deletions(-) diff --git a/google/cloud/debugger_v2/services/controller2/async_client.py b/google/cloud/debugger_v2/services/controller2/async_client.py index 2f7ad87..e53901f 100644 --- a/google/cloud/debugger_v2/services/controller2/async_client.py +++ b/google/cloud/debugger_v2/services/controller2/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.debugger_v2.types import controller from google.cloud.debugger_v2.types import data from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO @@ -179,10 +181,10 @@ def __init__( async def register_debuggee( self, - request: controller.RegisterDebuggeeRequest = None, + request: Union[controller.RegisterDebuggeeRequest, dict] = None, *, debuggee: data.Debuggee = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.RegisterDebuggeeResponse: @@ -200,7 +202,7 @@ async def register_debuggee( re-registration. Args: - request (:class:`google.cloud.debugger_v2.types.RegisterDebuggeeRequest`): + request (Union[google.cloud.debugger_v2.types.RegisterDebuggeeRequest, dict]): The request object. Request to register a debuggee. debuggee (:class:`google.cloud.debugger_v2.types.Debuggee`): Required. Debuggee information to register. The fields @@ -253,10 +255,10 @@ async def register_debuggee( async def list_active_breakpoints( self, - request: controller.ListActiveBreakpointsRequest = None, + request: Union[controller.ListActiveBreakpointsRequest, dict] = None, *, debuggee_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.ListActiveBreakpointsResponse: @@ -276,7 +278,7 @@ async def list_active_breakpoints( from the active list to avoid setting those breakpoints again. Args: - request (:class:`google.cloud.debugger_v2.types.ListActiveBreakpointsRequest`): + request (Union[google.cloud.debugger_v2.types.ListActiveBreakpointsRequest, dict]): The request object. Request to list active breakpoints. debuggee_id (:class:`str`): Required. Identifies the debuggee. @@ -338,11 +340,11 @@ async def list_active_breakpoints( async def update_active_breakpoint( self, - request: controller.UpdateActiveBreakpointRequest = None, + request: Union[controller.UpdateActiveBreakpointRequest, dict] = None, *, debuggee_id: str = None, breakpoint_: data.Breakpoint = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.UpdateActiveBreakpointResponse: @@ -357,7 +359,7 @@ async def update_active_breakpoint( to the correct line of code. Args: - request (:class:`google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest`): + request (Union[google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest, dict]): The request object. Request to update an active breakpoint. debuggee_id (:class:`str`): diff --git a/google/cloud/debugger_v2/services/controller2/client.py b/google/cloud/debugger_v2/services/controller2/client.py index ce38144..dee8747 100644 --- a/google/cloud/debugger_v2/services/controller2/client.py +++ b/google/cloud/debugger_v2/services/controller2/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.debugger_v2.types import controller from google.cloud.debugger_v2.types import data from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO @@ -356,7 +358,7 @@ def register_debuggee( request: Union[controller.RegisterDebuggeeRequest, dict] = None, *, debuggee: data.Debuggee = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.RegisterDebuggeeResponse: @@ -430,7 +432,7 @@ def list_active_breakpoints( request: Union[controller.ListActiveBreakpointsRequest, dict] = None, *, debuggee_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.ListActiveBreakpointsResponse: @@ -506,7 +508,7 @@ def update_active_breakpoint( *, debuggee_id: str = None, breakpoint_: data.Breakpoint = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> controller.UpdateActiveBreakpointResponse: diff --git a/google/cloud/debugger_v2/services/controller2/transports/base.py b/google/cloud/debugger_v2/services/controller2/transports/base.py index 317a320..5d80888 100644 --- a/google/cloud/debugger_v2/services/controller2/transports/base.py +++ b/google/cloud/debugger_v2/services/controller2/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 Controller2Transport(abc.ABC): """Abstract transport class for Controller2.""" @@ -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 = { diff --git a/google/cloud/debugger_v2/services/controller2/transports/grpc_asyncio.py b/google/cloud/debugger_v2/services/controller2/transports/grpc_asyncio.py index 16f8839..172c6b0 100644 --- a/google/cloud/debugger_v2/services/controller2/transports/grpc_asyncio.py +++ b/google/cloud/debugger_v2/services/controller2/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/debugger_v2/services/debugger2/async_client.py b/google/cloud/debugger_v2/services/debugger2/async_client.py index b65ef52..c8db347 100644 --- a/google/cloud/debugger_v2/services/debugger2/async_client.py +++ b/google/cloud/debugger_v2/services/debugger2/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.debugger_v2.types import data from google.cloud.debugger_v2.types import debugger from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO @@ -168,19 +170,19 @@ def __init__( async def set_breakpoint( self, - request: debugger.SetBreakpointRequest = None, + request: Union[debugger.SetBreakpointRequest, dict] = None, *, debuggee_id: str = None, breakpoint_: data.Breakpoint = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.SetBreakpointResponse: r"""Sets the breakpoint to the debuggee. Args: - request (:class:`google.cloud.debugger_v2.types.SetBreakpointRequest`): + request (Union[google.cloud.debugger_v2.types.SetBreakpointRequest, dict]): The request object. Request to set a breakpoint debuggee_id (:class:`str`): Required. ID of the debuggee where @@ -251,19 +253,19 @@ async def set_breakpoint( async def get_breakpoint( self, - request: debugger.GetBreakpointRequest = None, + request: Union[debugger.GetBreakpointRequest, dict] = None, *, debuggee_id: str = None, breakpoint_id: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.GetBreakpointResponse: r"""Gets breakpoint information. Args: - request (:class:`google.cloud.debugger_v2.types.GetBreakpointRequest`): + request (Union[google.cloud.debugger_v2.types.GetBreakpointRequest, dict]): The request object. Request to get breakpoint information. debuggee_id (:class:`str`): @@ -347,19 +349,19 @@ async def get_breakpoint( async def delete_breakpoint( self, - request: debugger.DeleteBreakpointRequest = None, + request: Union[debugger.DeleteBreakpointRequest, dict] = None, *, debuggee_id: str = None, breakpoint_id: str = None, client_version: str = 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 breakpoint from the debuggee. Args: - request (:class:`google.cloud.debugger_v2.types.DeleteBreakpointRequest`): + request (Union[google.cloud.debugger_v2.types.DeleteBreakpointRequest, dict]): The request object. Request to delete a breakpoint. debuggee_id (:class:`str`): Required. ID of the debuggee whose @@ -435,18 +437,18 @@ async def delete_breakpoint( async def list_breakpoints( self, - request: debugger.ListBreakpointsRequest = None, + request: Union[debugger.ListBreakpointsRequest, dict] = None, *, debuggee_id: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.ListBreakpointsResponse: r"""Lists all breakpoints for the debuggee. Args: - request (:class:`google.cloud.debugger_v2.types.ListBreakpointsRequest`): + request (Union[google.cloud.debugger_v2.types.ListBreakpointsRequest, dict]): The request object. Request to list breakpoints. debuggee_id (:class:`str`): Required. ID of the debuggee whose @@ -518,18 +520,18 @@ async def list_breakpoints( async def list_debuggees( self, - request: debugger.ListDebuggeesRequest = None, + request: Union[debugger.ListDebuggeesRequest, dict] = None, *, project: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.ListDebuggeesResponse: r"""Lists all the debuggees that the user has access to. Args: - request (:class:`google.cloud.debugger_v2.types.ListDebuggeesRequest`): + request (Union[google.cloud.debugger_v2.types.ListDebuggeesRequest, dict]): The request object. Request to list debuggees. project (:class:`str`): Required. Project number of a Google diff --git a/google/cloud/debugger_v2/services/debugger2/client.py b/google/cloud/debugger_v2/services/debugger2/client.py index 7037fc4..a2fbe87 100644 --- a/google/cloud/debugger_v2/services/debugger2/client.py +++ b/google/cloud/debugger_v2/services/debugger2/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.debugger_v2.types import data from google.cloud.debugger_v2.types import debugger from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO @@ -349,7 +351,7 @@ def set_breakpoint( debuggee_id: str = None, breakpoint_: data.Breakpoint = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.SetBreakpointResponse: @@ -432,7 +434,7 @@ def get_breakpoint( debuggee_id: str = None, breakpoint_id: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.GetBreakpointResponse: @@ -518,7 +520,7 @@ def delete_breakpoint( debuggee_id: str = None, breakpoint_id: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -595,7 +597,7 @@ def list_breakpoints( *, debuggee_id: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.ListBreakpointsResponse: @@ -668,7 +670,7 @@ def list_debuggees( *, project: str = None, client_version: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> debugger.ListDebuggeesResponse: diff --git a/google/cloud/debugger_v2/services/debugger2/transports/base.py b/google/cloud/debugger_v2/services/debugger2/transports/base.py index 4f95b3f..7afaabd 100644 --- a/google/cloud/debugger_v2/services/debugger2/transports/base.py +++ b/google/cloud/debugger_v2/services/debugger2/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 Debugger2Transport(abc.ABC): """Abstract transport class for Debugger2.""" @@ -99,7 +89,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 @@ -132,29 +122,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/debugger_v2/services/debugger2/transports/grpc_asyncio.py b/google/cloud/debugger_v2/services/debugger2/transports/grpc_asyncio.py index 47b39fc..da08e70 100644 --- a/google/cloud/debugger_v2/services/debugger2/transports/grpc_asyncio.py +++ b/google/cloud/debugger_v2/services/debugger2/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/setup.py b/setup.py index 53f86ab..73d6191 100644 --- a/setup.py +++ b/setup.py @@ -28,9 +28,8 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "proto-plus >= 1.15.0", - "packaging >= 14.3", "google-cloud-source-context >= 1.0.0", ] diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index bc833f8..8f366b5 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.26.0 +google-api-core==1.28.0 proto-plus==1.15.0 -packaging==14.3 google-cloud-source-context==1.0.0 -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/debugger_v2/test_controller2.py b/tests/unit/gapic/debugger_v2/test_controller2.py index 7cd23ea..04f2e24 100644 --- a/tests/unit/gapic/debugger_v2/test_controller2.py +++ b/tests/unit/gapic/debugger_v2/test_controller2.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -35,9 +34,6 @@ from google.cloud.debugger_v2.services.controller2 import Controller2AsyncClient from google.cloud.debugger_v2.services.controller2 import Controller2Client from google.cloud.debugger_v2.services.controller2 import transports -from google.cloud.debugger_v2.services.controller2.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.debugger_v2.types import controller from google.cloud.debugger_v2.types import data from google.cloud.source_context_v1.types import source_context as source_context_pb2 # type: ignore @@ -47,20 +43,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" @@ -208,7 +190,7 @@ def test_controller2_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, @@ -225,7 +207,7 @@ def test_controller2_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, @@ -242,7 +224,7 @@ def test_controller2_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, @@ -271,7 +253,7 @@ def test_controller2_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, @@ -328,7 +310,7 @@ def test_controller2_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 @@ -370,7 +352,7 @@ def test_controller2_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, @@ -392,7 +374,7 @@ def test_controller2_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, @@ -423,7 +405,7 @@ def test_controller2_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, @@ -454,7 +436,7 @@ def test_controller2_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", @@ -1074,7 +1056,6 @@ def test_controller2_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_controller2_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1098,29 +1079,6 @@ def test_controller2_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_controller2_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.debugger_v2.services.controller2.transports.Controller2Transport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.Controller2Transport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id="octopus", - ) - - def test_controller2_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( @@ -1132,7 +1090,6 @@ def test_controller2_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_controller2_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1148,26 +1105,10 @@ def test_controller2_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_controller2_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) - Controller2Client() - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.Controller2GrpcTransport, transports.Controller2GrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_controller2_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1184,26 +1125,6 @@ def test_controller2_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.Controller2GrpcTransport, transports.Controller2GrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_controller2_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", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/debugger_v2/test_debugger2.py b/tests/unit/gapic/debugger_v2/test_debugger2.py index ad935b1..10cb9ef 100644 --- a/tests/unit/gapic/debugger_v2/test_debugger2.py +++ b/tests/unit/gapic/debugger_v2/test_debugger2.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -35,9 +34,6 @@ from google.cloud.debugger_v2.services.debugger2 import Debugger2AsyncClient from google.cloud.debugger_v2.services.debugger2 import Debugger2Client from google.cloud.debugger_v2.services.debugger2 import transports -from google.cloud.debugger_v2.services.debugger2.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.debugger_v2.types import data from google.cloud.debugger_v2.types import debugger from google.oauth2 import service_account @@ -46,20 +42,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" @@ -203,7 +185,7 @@ def test_debugger2_client_client_options(client_class, transport_class, transpor 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, @@ -220,7 +202,7 @@ def test_debugger2_client_client_options(client_class, transport_class, transpor 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, @@ -237,7 +219,7 @@ def test_debugger2_client_client_options(client_class, transport_class, transpor 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, @@ -266,7 +248,7 @@ def test_debugger2_client_client_options(client_class, transport_class, transpor 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, @@ -323,7 +305,7 @@ def test_debugger2_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 @@ -365,7 +347,7 @@ def test_debugger2_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, @@ -387,7 +369,7 @@ def test_debugger2_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, @@ -418,7 +400,7 @@ def test_debugger2_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, @@ -449,7 +431,7 @@ def test_debugger2_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", @@ -1387,7 +1369,6 @@ def test_debugger2_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_debugger2_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1411,29 +1392,6 @@ def test_debugger2_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_debugger2_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.debugger_v2.services.debugger2.transports.Debugger2Transport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.Debugger2Transport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id="octopus", - ) - - def test_debugger2_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( @@ -1445,7 +1403,6 @@ def test_debugger2_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_debugger2_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1461,26 +1418,10 @@ def test_debugger2_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_debugger2_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) - Debugger2Client() - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.Debugger2GrpcTransport, transports.Debugger2GrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_debugger2_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1497,26 +1438,6 @@ def test_debugger2_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.Debugger2GrpcTransport, transports.Debugger2GrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_debugger2_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", - "https://www.googleapis.com/auth/cloud_debugger", - ), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [