From 55a42ff6f2951ca2280a899cce836ccf19664613 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:22:12 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#145) - [ ] 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/recommender/async_client.py | 58 ++++++------ .../services/recommender/client.py | 18 ++-- .../services/recommender/transports/base.py | 35 +------- .../recommender/transports/grpc_asyncio.py | 1 - .../recommender_v1/types/recommendation.py | 17 ++++ .../services/recommender/async_client.py | 58 ++++++------ .../services/recommender/client.py | 18 ++-- .../services/recommender/transports/base.py | 35 +------- .../recommender/transports/grpc_asyncio.py | 1 - .../types/recommendation.py | 17 ++++ setup.py | 3 +- testing/constraints-3.6.txt | 4 +- .../gapic/recommender_v1/test_recommender.py | 88 ++----------------- .../recommender_v1beta1/test_recommender.py | 88 ++----------------- 14 files changed, 142 insertions(+), 299 deletions(-) diff --git a/google/cloud/recommender_v1/services/recommender/async_client.py b/google/cloud/recommender_v1/services/recommender/async_client.py index 6e7e6ff..af38d91 100644 --- a/google/cloud/recommender_v1/services/recommender/async_client.py +++ b/google/cloud/recommender_v1/services/recommender/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.recommender_v1.services.recommender import pagers from google.cloud.recommender_v1.types import insight from google.cloud.recommender_v1.types import recommendation @@ -177,10 +179,10 @@ def __init__( async def list_insights( self, - request: recommender_service.ListInsightsRequest = None, + request: Union[recommender_service.ListInsightsRequest, 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.ListInsightsAsyncPager: @@ -189,7 +191,7 @@ async def list_insights( type. Args: - request (:class:`google.cloud.recommender_v1.types.ListInsightsRequest`): + request (Union[google.cloud.recommender_v1.types.ListInsightsRequest, dict]): The request object. Request for the `ListInsights` method. parent (:class:`str`): @@ -277,10 +279,10 @@ async def list_insights( async def get_insight( self, - request: recommender_service.GetInsightRequest = None, + request: Union[recommender_service.GetInsightRequest, 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]] = (), ) -> insight.Insight: @@ -288,7 +290,7 @@ async def get_insight( permission for the specified insight type. Args: - request (:class:`google.cloud.recommender_v1.types.GetInsightRequest`): + request (Union[google.cloud.recommender_v1.types.GetInsightRequest, dict]): The request object. Request to the `GetInsight` method. name (:class:`str`): Required. Name of the insight. @@ -358,14 +360,14 @@ async def get_insight( async def mark_insight_accepted( self, - request: recommender_service.MarkInsightAcceptedRequest = None, + request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> insight.Insight: @@ -379,7 +381,7 @@ async def mark_insight_accepted( specified insight. Args: - request (:class:`google.cloud.recommender_v1.types.MarkInsightAcceptedRequest`): + request (Union[google.cloud.recommender_v1.types.MarkInsightAcceptedRequest, dict]): The request object. Request for the `MarkInsightAccepted` method. name (:class:`str`): @@ -459,11 +461,11 @@ async def mark_insight_accepted( async def list_recommendations( self, - request: recommender_service.ListRecommendationsRequest = None, + request: Union[recommender_service.ListRecommendationsRequest, dict] = None, *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRecommendationsAsyncPager: @@ -471,7 +473,7 @@ async def list_recommendations( recommender.*.list IAM permission for the specified recommender. Args: - request (:class:`google.cloud.recommender_v1.types.ListRecommendationsRequest`): + request (Union[google.cloud.recommender_v1.types.ListRecommendationsRequest, dict]): The request object. Request for the `ListRecommendations` method. parent (:class:`str`): @@ -570,10 +572,10 @@ async def list_recommendations( async def get_recommendation( self, - request: recommender_service.GetRecommendationRequest = None, + request: Union[recommender_service.GetRecommendationRequest, 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]] = (), ) -> recommendation.Recommendation: @@ -581,7 +583,7 @@ async def get_recommendation( recommender.*.get IAM permission for the specified recommender. Args: - request (:class:`google.cloud.recommender_v1.types.GetRecommendationRequest`): + request (Union[google.cloud.recommender_v1.types.GetRecommendationRequest, dict]): The request object. Request to the `GetRecommendation` method. name (:class:`str`): @@ -652,14 +654,16 @@ async def get_recommendation( async def mark_recommendation_claimed( self, - request: recommender_service.MarkRecommendationClaimedRequest = None, + request: Union[ + recommender_service.MarkRecommendationClaimedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -676,7 +680,7 @@ async def mark_recommendation_claimed( specified recommender. Args: - request (:class:`google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest`): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest, dict]): The request object. Request for the `MarkRecommendationClaimed` Method. name (:class:`str`): @@ -759,14 +763,16 @@ async def mark_recommendation_claimed( async def mark_recommendation_succeeded( self, - request: recommender_service.MarkRecommendationSucceededRequest = None, + request: Union[ + recommender_service.MarkRecommendationSucceededRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -783,7 +789,7 @@ async def mark_recommendation_succeeded( specified recommender. Args: - request (:class:`google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest`): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest, dict]): The request object. Request for the `MarkRecommendationSucceeded` Method. name (:class:`str`): @@ -866,14 +872,16 @@ async def mark_recommendation_succeeded( async def mark_recommendation_failed( self, - request: recommender_service.MarkRecommendationFailedRequest = None, + request: Union[ + recommender_service.MarkRecommendationFailedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -890,7 +898,7 @@ async def mark_recommendation_failed( specified recommender. Args: - request (:class:`google.cloud.recommender_v1.types.MarkRecommendationFailedRequest`): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationFailedRequest, dict]): The request object. Request for the `MarkRecommendationFailed` Method. name (:class:`str`): diff --git a/google/cloud/recommender_v1/services/recommender/client.py b/google/cloud/recommender_v1/services/recommender/client.py index d9df1ab..d9bec77 100644 --- a/google/cloud/recommender_v1/services/recommender/client.py +++ b/google/cloud/recommender_v1/services/recommender/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.recommender_v1.services.recommender import pagers from google.cloud.recommender_v1.types import insight from google.cloud.recommender_v1.types import recommendation @@ -418,7 +420,7 @@ def list_insights( request: Union[recommender_service.ListInsightsRequest, 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.ListInsightsPager: @@ -508,7 +510,7 @@ def get_insight( request: Union[recommender_service.GetInsightRequest, 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]] = (), ) -> insight.Insight: @@ -583,7 +585,7 @@ def mark_insight_accepted( recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> insight.Insight: @@ -680,7 +682,7 @@ def list_recommendations( *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRecommendationsPager: @@ -780,7 +782,7 @@ def get_recommendation( request: Union[recommender_service.GetRecommendationRequest, 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]] = (), ) -> recommendation.Recommendation: @@ -858,7 +860,7 @@ def mark_recommendation_claimed( recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -970,7 +972,7 @@ def mark_recommendation_succeeded( recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -1082,7 +1084,7 @@ def mark_recommendation_failed( recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: diff --git a/google/cloud/recommender_v1/services/recommender/transports/base.py b/google/cloud/recommender_v1/services/recommender/transports/base.py index 6d4a9ea..73c46de 100644 --- a/google/cloud/recommender_v1/services/recommender/transports/base.py +++ b/google/cloud/recommender_v1/services/recommender/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 @@ -39,15 +38,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 RecommenderTransport(abc.ABC): """Abstract transport class for Recommender.""" @@ -97,7 +87,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 @@ -130,29 +120,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/recommender_v1/services/recommender/transports/grpc_asyncio.py b/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py index ec9bbb9..acf4480 100644 --- a/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py +++ b/google/cloud/recommender_v1/services/recommender/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/recommender_v1/types/recommendation.py b/google/cloud/recommender_v1/types/recommendation.py index 631e2a6..23142f4 100644 --- a/google/cloud/recommender_v1/types/recommendation.py +++ b/google/cloud/recommender_v1/types/recommendation.py @@ -157,6 +157,13 @@ class Operation(proto.Message): RFC6902. See https://tools.ietf.org/html/rfc6902 for details on the original RFC. + 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: action (str): Type of this operation. Contains one of @@ -192,10 +199,12 @@ class Operation(proto.Message): actions:'add'/'replace'. Maybe set for action: 'test'. Either this or ``value_matcher`` will be set for 'test' operation. An exact match must be performed. + This field is a member of `oneof`_ ``path_value``. value_matcher (google.cloud.recommender_v1.types.ValueMatcher): Can be set for action 'test' for advanced matching for the value of 'path' field. Either this or ``value`` will be set for 'test' operation. + This field is a member of `oneof`_ ``path_value``. path_filters (Sequence[google.cloud.recommender_v1.types.Operation.PathFiltersEntry]): Set of filters to apply if ``path`` refers to array elements or nested array elements in order to narrow down to a single @@ -245,6 +254,9 @@ class ValueMatcher(proto.Message): r"""Contains various matching options for values for a GCP resource field. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: matches_pattern (str): To be used for full regex matching. The @@ -252,6 +264,7 @@ class ValueMatcher(proto.Message): syntax (https://github.com/google/re2/wiki/Syntax), so to be used with RE2::FullMatch + This field is a member of `oneof`_ ``match_variant``. """ matches_pattern = proto.Field(proto.STRING, number=1, oneof="match_variant",) @@ -280,11 +293,15 @@ class Impact(proto.Message): r"""Contains the impact a recommendation can have for a given category. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: category (google.cloud.recommender_v1.types.Impact.Category): Category that is being targeted. cost_projection (google.cloud.recommender_v1.types.CostProjection): Use with CategoryType.COST + This field is a member of `oneof`_ ``projection``. """ class Category(proto.Enum): diff --git a/google/cloud/recommender_v1beta1/services/recommender/async_client.py b/google/cloud/recommender_v1beta1/services/recommender/async_client.py index 9cd57be..e36fc7c 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/async_client.py +++ b/google/cloud/recommender_v1beta1/services/recommender/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.recommender_v1beta1.services.recommender import pagers from google.cloud.recommender_v1beta1.types import insight from google.cloud.recommender_v1beta1.types import recommendation @@ -177,10 +179,10 @@ def __init__( async def list_insights( self, - request: recommender_service.ListInsightsRequest = None, + request: Union[recommender_service.ListInsightsRequest, 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.ListInsightsAsyncPager: @@ -189,7 +191,7 @@ async def list_insights( type. Args: - request (:class:`google.cloud.recommender_v1beta1.types.ListInsightsRequest`): + request (Union[google.cloud.recommender_v1beta1.types.ListInsightsRequest, dict]): The request object. Request for the `ListInsights` method. parent (:class:`str`): @@ -277,10 +279,10 @@ async def list_insights( async def get_insight( self, - request: recommender_service.GetInsightRequest = None, + request: Union[recommender_service.GetInsightRequest, 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]] = (), ) -> insight.Insight: @@ -288,7 +290,7 @@ async def get_insight( permission for the specified insight type. Args: - request (:class:`google.cloud.recommender_v1beta1.types.GetInsightRequest`): + request (Union[google.cloud.recommender_v1beta1.types.GetInsightRequest, dict]): The request object. Request to the `GetInsight` method. name (:class:`str`): Required. Name of the insight. @@ -358,14 +360,14 @@ async def get_insight( async def mark_insight_accepted( self, - request: recommender_service.MarkInsightAcceptedRequest = None, + request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> insight.Insight: @@ -379,7 +381,7 @@ async def mark_insight_accepted( specified insight. Args: - request (:class:`google.cloud.recommender_v1beta1.types.MarkInsightAcceptedRequest`): + request (Union[google.cloud.recommender_v1beta1.types.MarkInsightAcceptedRequest, dict]): The request object. Request for the `MarkInsightAccepted` method. name (:class:`str`): @@ -459,11 +461,11 @@ async def mark_insight_accepted( async def list_recommendations( self, - request: recommender_service.ListRecommendationsRequest = None, + request: Union[recommender_service.ListRecommendationsRequest, dict] = None, *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRecommendationsAsyncPager: @@ -471,7 +473,7 @@ async def list_recommendations( recommender.*.list IAM permission for the specified recommender. Args: - request (:class:`google.cloud.recommender_v1beta1.types.ListRecommendationsRequest`): + request (Union[google.cloud.recommender_v1beta1.types.ListRecommendationsRequest, dict]): The request object. Request for the `ListRecommendations` method. parent (:class:`str`): @@ -570,10 +572,10 @@ async def list_recommendations( async def get_recommendation( self, - request: recommender_service.GetRecommendationRequest = None, + request: Union[recommender_service.GetRecommendationRequest, 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]] = (), ) -> recommendation.Recommendation: @@ -581,7 +583,7 @@ async def get_recommendation( recommender.*.get IAM permission for the specified recommender. Args: - request (:class:`google.cloud.recommender_v1beta1.types.GetRecommendationRequest`): + request (Union[google.cloud.recommender_v1beta1.types.GetRecommendationRequest, dict]): The request object. Request to the `GetRecommendation` method. name (:class:`str`): @@ -652,14 +654,16 @@ async def get_recommendation( async def mark_recommendation_claimed( self, - request: recommender_service.MarkRecommendationClaimedRequest = None, + request: Union[ + recommender_service.MarkRecommendationClaimedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -676,7 +680,7 @@ async def mark_recommendation_claimed( specified recommender. Args: - request (:class:`google.cloud.recommender_v1beta1.types.MarkRecommendationClaimedRequest`): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationClaimedRequest, dict]): The request object. Request for the `MarkRecommendationClaimed` Method. name (:class:`str`): @@ -759,14 +763,16 @@ async def mark_recommendation_claimed( async def mark_recommendation_succeeded( self, - request: recommender_service.MarkRecommendationSucceededRequest = None, + request: Union[ + recommender_service.MarkRecommendationSucceededRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -783,7 +789,7 @@ async def mark_recommendation_succeeded( specified recommender. Args: - request (:class:`google.cloud.recommender_v1beta1.types.MarkRecommendationSucceededRequest`): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationSucceededRequest, dict]): The request object. Request for the `MarkRecommendationSucceeded` Method. name (:class:`str`): @@ -866,14 +872,16 @@ async def mark_recommendation_succeeded( async def mark_recommendation_failed( self, - request: recommender_service.MarkRecommendationFailedRequest = None, + request: Union[ + recommender_service.MarkRecommendationFailedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -890,7 +898,7 @@ async def mark_recommendation_failed( specified recommender. Args: - request (:class:`google.cloud.recommender_v1beta1.types.MarkRecommendationFailedRequest`): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationFailedRequest, dict]): The request object. Request for the `MarkRecommendationFailed` Method. name (:class:`str`): diff --git a/google/cloud/recommender_v1beta1/services/recommender/client.py b/google/cloud/recommender_v1beta1/services/recommender/client.py index 490f731..2681347 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/client.py +++ b/google/cloud/recommender_v1beta1/services/recommender/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.recommender_v1beta1.services.recommender import pagers from google.cloud.recommender_v1beta1.types import insight from google.cloud.recommender_v1beta1.types import recommendation @@ -418,7 +420,7 @@ def list_insights( request: Union[recommender_service.ListInsightsRequest, 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.ListInsightsPager: @@ -508,7 +510,7 @@ def get_insight( request: Union[recommender_service.GetInsightRequest, 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]] = (), ) -> insight.Insight: @@ -583,7 +585,7 @@ def mark_insight_accepted( recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> insight.Insight: @@ -680,7 +682,7 @@ def list_recommendations( *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRecommendationsPager: @@ -780,7 +782,7 @@ def get_recommendation( request: Union[recommender_service.GetRecommendationRequest, 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]] = (), ) -> recommendation.Recommendation: @@ -858,7 +860,7 @@ def mark_recommendation_claimed( recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -970,7 +972,7 @@ def mark_recommendation_succeeded( recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: @@ -1082,7 +1084,7 @@ def mark_recommendation_failed( recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry ] = None, etag: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> recommendation.Recommendation: diff --git a/google/cloud/recommender_v1beta1/services/recommender/transports/base.py b/google/cloud/recommender_v1beta1/services/recommender/transports/base.py index 647f6f1..42ecfe0 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/transports/base.py +++ b/google/cloud/recommender_v1beta1/services/recommender/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 @@ -39,15 +38,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 RecommenderTransport(abc.ABC): """Abstract transport class for Recommender.""" @@ -97,7 +87,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 @@ -130,29 +120,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/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py b/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py index c9f802e..4337043 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py +++ b/google/cloud/recommender_v1beta1/services/recommender/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/recommender_v1beta1/types/recommendation.py b/google/cloud/recommender_v1beta1/types/recommendation.py index 0ec6a65..e8b3c19 100644 --- a/google/cloud/recommender_v1beta1/types/recommendation.py +++ b/google/cloud/recommender_v1beta1/types/recommendation.py @@ -157,6 +157,13 @@ class Operation(proto.Message): RFC6902. See https://tools.ietf.org/html/rfc6902 for details on the original RFC. + 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: action (str): Type of this operation. Contains one of @@ -192,10 +199,12 @@ class Operation(proto.Message): actions:'add'/'replace'. Maybe set for action: 'test'. Either this or ``value_matcher`` will be set for 'test' operation. An exact match must be performed. + This field is a member of `oneof`_ ``path_value``. value_matcher (google.cloud.recommender_v1beta1.types.ValueMatcher): Can be set for action 'test' for advanced matching for the value of 'path' field. Either this or ``value`` will be set for 'test' operation. + This field is a member of `oneof`_ ``path_value``. path_filters (Sequence[google.cloud.recommender_v1beta1.types.Operation.PathFiltersEntry]): Set of filters to apply if ``path`` refers to array elements or nested array elements in order to narrow down to a single @@ -245,6 +254,9 @@ class ValueMatcher(proto.Message): r"""Contains various matching options for values for a GCP resource field. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: matches_pattern (str): To be used for full regex matching. The @@ -252,6 +264,7 @@ class ValueMatcher(proto.Message): syntax (https://github.com/google/re2/wiki/Syntax), so to be used with RE2::FullMatch + This field is a member of `oneof`_ ``match_variant``. """ matches_pattern = proto.Field(proto.STRING, number=1, oneof="match_variant",) @@ -280,11 +293,15 @@ class Impact(proto.Message): r"""Contains the impact a recommendation can have for a given category. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: category (google.cloud.recommender_v1beta1.types.Impact.Category): Category that is being targeted. cost_projection (google.cloud.recommender_v1beta1.types.CostProjection): Use with CategoryType.COST + This field is a member of `oneof`_ ``projection``. """ class Category(proto.Enum): diff --git a/setup.py b/setup.py index ef6052b..3ba5cf3 100644 --- a/setup.py +++ b/setup.py @@ -27,9 +27,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.10.0", - "packaging >= 14.3", ] extras = {"libcst": "libcst >= 0.2.5"} scripts = [ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 7de2572..1e3ec8b 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -2,9 +2,7 @@ # are correct in setup.py # List all library dependencies and extras in this file. # 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 diff --git a/tests/unit/gapic/recommender_v1/test_recommender.py b/tests/unit/gapic/recommender_v1/test_recommender.py index f40e63b..42aa51a 100644 --- a/tests/unit/gapic/recommender_v1/test_recommender.py +++ b/tests/unit/gapic/recommender_v1/test_recommender.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -36,9 +35,6 @@ from google.cloud.recommender_v1.services.recommender import RecommenderClient from google.cloud.recommender_v1.services.recommender import pagers from google.cloud.recommender_v1.services.recommender import transports -from google.cloud.recommender_v1.services.recommender.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.recommender_v1.types import insight from google.cloud.recommender_v1.types import recommendation from google.cloud.recommender_v1.types import recommender_service @@ -49,20 +45,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" @@ -210,7 +192,7 @@ def test_recommender_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, @@ -227,7 +209,7 @@ def test_recommender_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, @@ -244,7 +226,7 @@ def test_recommender_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, @@ -273,7 +255,7 @@ def test_recommender_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, @@ -330,7 +312,7 @@ def test_recommender_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 @@ -372,7 +354,7 @@ def test_recommender_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, @@ -394,7 +376,7 @@ def test_recommender_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, @@ -425,7 +407,7 @@ def test_recommender_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, @@ -456,7 +438,7 @@ def test_recommender_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", @@ -2754,7 +2736,6 @@ def test_recommender_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_recommender_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2775,26 +2756,6 @@ def test_recommender_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_recommender_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.recommender_v1.services.recommender.transports.RecommenderTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.RecommenderTransport( - 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_recommender_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( @@ -2806,7 +2767,6 @@ def test_recommender_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_recommender_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2819,23 +2779,10 @@ def test_recommender_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_recommender_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) - RecommenderClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.RecommenderGrpcTransport, transports.RecommenderGrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_recommender_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2849,23 +2796,6 @@ def test_recommender_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.RecommenderGrpcTransport, transports.RecommenderGrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_recommender_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", [ diff --git a/tests/unit/gapic/recommender_v1beta1/test_recommender.py b/tests/unit/gapic/recommender_v1beta1/test_recommender.py index c9094b9..b128c96 100644 --- a/tests/unit/gapic/recommender_v1beta1/test_recommender.py +++ b/tests/unit/gapic/recommender_v1beta1/test_recommender.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -36,9 +35,6 @@ from google.cloud.recommender_v1beta1.services.recommender import RecommenderClient from google.cloud.recommender_v1beta1.services.recommender import pagers from google.cloud.recommender_v1beta1.services.recommender import transports -from google.cloud.recommender_v1beta1.services.recommender.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.recommender_v1beta1.types import insight from google.cloud.recommender_v1beta1.types import recommendation from google.cloud.recommender_v1beta1.types import recommender_service @@ -49,20 +45,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" @@ -210,7 +192,7 @@ def test_recommender_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, @@ -227,7 +209,7 @@ def test_recommender_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, @@ -244,7 +226,7 @@ def test_recommender_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, @@ -273,7 +255,7 @@ def test_recommender_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, @@ -330,7 +312,7 @@ def test_recommender_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 @@ -372,7 +354,7 @@ def test_recommender_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, @@ -394,7 +376,7 @@ def test_recommender_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, @@ -425,7 +407,7 @@ def test_recommender_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, @@ -456,7 +438,7 @@ def test_recommender_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", @@ -2754,7 +2736,6 @@ def test_recommender_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_recommender_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2775,26 +2756,6 @@ def test_recommender_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_recommender_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.recommender_v1beta1.services.recommender.transports.RecommenderTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.RecommenderTransport( - 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_recommender_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( @@ -2806,7 +2767,6 @@ def test_recommender_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_recommender_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2819,23 +2779,10 @@ def test_recommender_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_recommender_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) - RecommenderClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [transports.RecommenderGrpcTransport, transports.RecommenderGrpcAsyncIOTransport,], ) -@requires_google_auth_gte_1_25_0 def test_recommender_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2849,23 +2796,6 @@ def test_recommender_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [transports.RecommenderGrpcTransport, transports.RecommenderGrpcAsyncIOTransport,], -) -@requires_google_auth_lt_1_25_0 -def test_recommender_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", [