From f4ef191701f0306d32303cde0e48918b14a29682 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 10:52:11 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#48) - [ ] 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 --- .../reachability_service/async_client.py | 40 ++++---- .../services/reachability_service/client.py | 14 +-- .../reachability_service/transports/base.py | 37 +------- .../reachability_service/transports/grpc.py | 2 +- .../transports/grpc_asyncio.py | 3 +- .../network_management_v1/types/trace.py | 22 +++++ setup.py | 3 +- testing/constraints-3.6.txt | 4 +- .../test_reachability_service.py | 91 ++----------------- 9 files changed, 66 insertions(+), 150 deletions(-) diff --git a/google/cloud/network_management_v1/services/reachability_service/async_client.py b/google/cloud/network_management_v1/services/reachability_service/async_client.py index f4816cb..bf28195 100644 --- a/google/cloud/network_management_v1/services/reachability_service/async_client.py +++ b/google/cloud/network_management_v1/services/reachability_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.network_management_v1.services.reachability_service import pagers @@ -184,17 +186,17 @@ def __init__( async def list_connectivity_tests( self, - request: reachability.ListConnectivityTestsRequest = None, + request: Union[reachability.ListConnectivityTestsRequest, 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.ListConnectivityTestsAsyncPager: r"""Lists all Connectivity Tests owned by a project. Args: - request (:class:`google.cloud.network_management_v1.types.ListConnectivityTestsRequest`): + request (Union[google.cloud.network_management_v1.types.ListConnectivityTestsRequest, dict]): The request object. Request for the `ListConnectivityTests` method. parent (:class:`str`): @@ -263,17 +265,17 @@ async def list_connectivity_tests( async def get_connectivity_test( self, - request: reachability.GetConnectivityTestRequest = None, + request: Union[reachability.GetConnectivityTestRequest, 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]] = (), ) -> connectivity_test.ConnectivityTest: r"""Gets the details of a specific Connectivity Test. Args: - request (:class:`google.cloud.network_management_v1.types.GetConnectivityTestRequest`): + request (Union[google.cloud.network_management_v1.types.GetConnectivityTestRequest, dict]): The request object. Request for the `GetConnectivityTest` method. name (:class:`str`): @@ -335,12 +337,12 @@ async def get_connectivity_test( async def create_connectivity_test( self, - request: reachability.CreateConnectivityTestRequest = None, + request: Union[reachability.CreateConnectivityTestRequest, dict] = None, *, parent: str = None, test_id: str = None, resource: connectivity_test.ConnectivityTest = 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: @@ -360,7 +362,7 @@ async def create_connectivity_test( documentation. Args: - request (:class:`google.cloud.network_management_v1.types.CreateConnectivityTestRequest`): + request (Union[google.cloud.network_management_v1.types.CreateConnectivityTestRequest, dict]): The request object. Request for the `CreateConnectivityTest` method. parent (:class:`str`): @@ -455,11 +457,11 @@ async def create_connectivity_test( async def update_connectivity_test( self, - request: reachability.UpdateConnectivityTestRequest = None, + request: Union[reachability.UpdateConnectivityTestRequest, dict] = None, *, update_mask: field_mask_pb2.FieldMask = None, resource: connectivity_test.ConnectivityTest = 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: @@ -481,7 +483,7 @@ async def update_connectivity_test( for more details. Args: - request (:class:`google.cloud.network_management_v1.types.UpdateConnectivityTestRequest`): + request (Union[google.cloud.network_management_v1.types.UpdateConnectivityTestRequest, dict]): The request object. Request for the `UpdateConnectivityTest` method. update_mask (:class:`google.protobuf.field_mask_pb2.FieldMask`): @@ -565,9 +567,9 @@ async def update_connectivity_test( async def rerun_connectivity_test( self, - request: reachability.RerunConnectivityTestRequest = None, + request: Union[reachability.RerunConnectivityTestRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -587,7 +589,7 @@ async def rerun_connectivity_test( returns a value of ``UNKNOWN``. Args: - request (:class:`google.cloud.network_management_v1.types.RerunConnectivityTestRequest`): + request (Union[google.cloud.network_management_v1.types.RerunConnectivityTestRequest, dict]): The request object. Request for the `RerunConnectivityTest` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -638,17 +640,17 @@ async def rerun_connectivity_test( async def delete_connectivity_test( self, - request: reachability.DeleteConnectivityTestRequest = None, + request: Union[reachability.DeleteConnectivityTestRequest, 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 specific ``ConnectivityTest``. Args: - request (:class:`google.cloud.network_management_v1.types.DeleteConnectivityTestRequest`): + request (Union[google.cloud.network_management_v1.types.DeleteConnectivityTestRequest, dict]): The request object. Request for the `DeleteConnectivityTest` method. name (:class:`str`): diff --git a/google/cloud/network_management_v1/services/reachability_service/client.py b/google/cloud/network_management_v1/services/reachability_service/client.py index 466057b..34f62ee 100644 --- a/google/cloud/network_management_v1/services/reachability_service/client.py +++ b/google/cloud/network_management_v1/services/reachability_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.network_management_v1.services.reachability_service import pagers @@ -370,7 +372,7 @@ def list_connectivity_tests( request: Union[reachability.ListConnectivityTestsRequest, 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.ListConnectivityTestsPager: @@ -449,7 +451,7 @@ def get_connectivity_test( request: Union[reachability.GetConnectivityTestRequest, 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]] = (), ) -> connectivity_test.ConnectivityTest: @@ -523,7 +525,7 @@ def create_connectivity_test( parent: str = None, test_id: str = None, resource: connectivity_test.ConnectivityTest = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -642,7 +644,7 @@ def update_connectivity_test( *, update_mask: field_mask_pb2.FieldMask = None, resource: connectivity_test.ConnectivityTest = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -750,7 +752,7 @@ def rerun_connectivity_test( self, request: Union[reachability.RerunConnectivityTestRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -825,7 +827,7 @@ def delete_connectivity_test( request: Union[reachability.DeleteConnectivityTestRequest, 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: diff --git a/google/cloud/network_management_v1/services/reachability_service/transports/base.py b/google/cloud/network_management_v1/services/reachability_service/transports/base.py index 42a0942..3d4ae14 100644 --- a/google/cloud/network_management_v1/services/reachability_service/transports/base.py +++ b/google/cloud/network_management_v1/services/reachability_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 ReachabilityServiceTransport(abc.ABC): """Abstract transport class for ReachabilityService.""" @@ -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 = { @@ -199,7 +166,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/network_management_v1/services/reachability_service/transports/grpc.py b/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py index 68ad948..65bc730 100644 --- a/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py +++ b/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py @@ -122,7 +122,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/network_management_v1/services/reachability_service/transports/grpc_asyncio.py b/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py index 4ceb3cf..56d297e 100644 --- a/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py +++ b/google/cloud/network_management_v1/services/reachability_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 @@ -169,7 +168,7 @@ def __init__( self._grpc_channel = None self._ssl_channel_credentials = ssl_channel_credentials self._stubs: Dict[str, Callable] = {} - self._operations_client = None + self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None if api_mtls_endpoint: warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning) diff --git a/google/cloud/network_management_v1/types/trace.py b/google/cloud/network_management_v1/types/trace.py index 64fce56..1b6cc78 100644 --- a/google/cloud/network_management_v1/types/trace.py +++ b/google/cloud/network_management_v1/types/trace.py @@ -81,6 +81,13 @@ class Step(proto.Message): Each step has a well-defined state and an associated configuration. + 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: description (str): A description of the step. Usually this is a @@ -97,49 +104,64 @@ class Step(proto.Message): instance (google.cloud.network_management_v1.types.InstanceInfo): Display information of a Compute Engine instance. + This field is a member of `oneof`_ ``step_info``. firewall (google.cloud.network_management_v1.types.FirewallInfo): Display information of a Compute Engine firewall rule. + This field is a member of `oneof`_ ``step_info``. route (google.cloud.network_management_v1.types.RouteInfo): Display information of a Compute Engine route. + This field is a member of `oneof`_ ``step_info``. endpoint (google.cloud.network_management_v1.types.EndpointInfo): Display information of the source and destination under analysis. The endpoint information in an intermediate state may differ with the initial input, as it might be modified by state like NAT, or Connection Proxy. + This field is a member of `oneof`_ ``step_info``. forwarding_rule (google.cloud.network_management_v1.types.ForwardingRuleInfo): Display information of a Compute Engine forwarding rule. + This field is a member of `oneof`_ ``step_info``. vpn_gateway (google.cloud.network_management_v1.types.VpnGatewayInfo): Display information of a Compute Engine VPN gateway. + This field is a member of `oneof`_ ``step_info``. vpn_tunnel (google.cloud.network_management_v1.types.VpnTunnelInfo): Display information of a Compute Engine VPN tunnel. + This field is a member of `oneof`_ ``step_info``. deliver (google.cloud.network_management_v1.types.DeliverInfo): Display information of the final state "deliver" and reason. + This field is a member of `oneof`_ ``step_info``. forward (google.cloud.network_management_v1.types.ForwardInfo): Display information of the final state "forward" and reason. + This field is a member of `oneof`_ ``step_info``. abort (google.cloud.network_management_v1.types.AbortInfo): Display information of the final state "abort" and reason. + This field is a member of `oneof`_ ``step_info``. drop (google.cloud.network_management_v1.types.DropInfo): Display information of the final state "drop" and reason. + This field is a member of `oneof`_ ``step_info``. load_balancer (google.cloud.network_management_v1.types.LoadBalancerInfo): Display information of the load balancers. + This field is a member of `oneof`_ ``step_info``. network (google.cloud.network_management_v1.types.NetworkInfo): Display information of a Google Cloud network. + This field is a member of `oneof`_ ``step_info``. gke_master (google.cloud.network_management_v1.types.GKEMasterInfo): Display information of a Google Kubernetes Engine cluster master. + This field is a member of `oneof`_ ``step_info``. cloud_sql_instance (google.cloud.network_management_v1.types.CloudSQLInstanceInfo): Display information of a Cloud SQL instance. + This field is a member of `oneof`_ ``step_info``. """ class State(proto.Enum): diff --git a/setup.py b/setup.py index c91b1fb..2e9fa4c 100644 --- a/setup.py +++ b/setup.py @@ -29,9 +29,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", ] package_root = os.path.abspath(os.path.dirname(__file__)) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 3f7f11e..1e3ec8b 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -4,7 +4,5 @@ # 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-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 is transitively required through google-api-core \ No newline at end of file diff --git a/tests/unit/gapic/network_management_v1/test_reachability_service.py b/tests/unit/gapic/network_management_v1/test_reachability_service.py index 42349f1..d1cc14e 100644 --- a/tests/unit/gapic/network_management_v1/test_reachability_service.py +++ b/tests/unit/gapic/network_management_v1/test_reachability_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.network_management_v1.services.reachability_service import pagers from google.cloud.network_management_v1.services.reachability_service import transports -from google.cloud.network_management_v1.services.reachability_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.network_management_v1.types import connectivity_test from google.cloud.network_management_v1.types import reachability from google.cloud.network_management_v1.types import trace @@ -58,20 +54,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" @@ -233,7 +215,7 @@ def test_reachability_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, @@ -250,7 +232,7 @@ def test_reachability_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, @@ -267,7 +249,7 @@ def test_reachability_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, @@ -296,7 +278,7 @@ def test_reachability_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, @@ -365,7 +347,7 @@ def test_reachability_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 @@ -407,7 +389,7 @@ def test_reachability_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, @@ -429,7 +411,7 @@ def test_reachability_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, @@ -464,7 +446,7 @@ def test_reachability_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, @@ -499,7 +481,7 @@ def test_reachability_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", @@ -2140,7 +2122,6 @@ def test_reachability_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_reachability_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2161,26 +2142,6 @@ def test_reachability_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_reachability_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.network_management_v1.services.reachability_service.transports.ReachabilityServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.ReachabilityServiceTransport( - 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_reachability_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( @@ -2192,7 +2153,6 @@ def test_reachability_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_reachability_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2205,18 +2165,6 @@ def test_reachability_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_reachability_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) - ReachabilityServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2224,7 +2172,6 @@ def test_reachability_service_auth_adc_old_google_auth(): transports.ReachabilityServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_reachability_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2238,26 +2185,6 @@ def test_reachability_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.ReachabilityServiceGrpcTransport, - transports.ReachabilityServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_reachability_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", [