From 30b353c9296d37f8792759a5ee997b3f50572f19 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:50:11 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.53.4 (#43) - [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: https://github.com/googleapis/googleapis/commit/83d81b0c8fc22291a13398d6d77f02dc97a5b6f4 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9 --- .../async_client.py | 34 +++---- .../client.py | 12 ++- .../transports/base.py | 35 +------ .../transports/grpc_asyncio.py | 1 - .../async_client.py | 52 ++++++----- .../client.py | 18 ++-- .../transports/base.py | 35 +------ .../transports/grpc_asyncio.py | 1 - setup.py | 3 +- testing/constraints-3.11.txt | 10 -- testing/constraints-3.6.txt | 4 +- ...test_identity_aware_proxy_admin_service.py | 93 ++----------------- ...est_identity_aware_proxy_o_auth_service.py | 93 ++----------------- 13 files changed, 84 insertions(+), 307 deletions(-) delete mode 100644 testing/constraints-3.11.txt diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py index 5696b8f..6e33ea3 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.iap_v1.types import service from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore @@ -172,9 +174,9 @@ def __init__( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -184,7 +186,7 @@ async def set_iam_policy( https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -280,9 +282,9 @@ async def set_iam_policy( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -292,7 +294,7 @@ async def get_iam_policy( https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -388,9 +390,9 @@ async def get_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -400,7 +402,7 @@ async def test_iam_permissions( https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -441,9 +443,9 @@ async def test_iam_permissions( async def get_iap_settings( self, - request: service.GetIapSettingsRequest = None, + request: Union[service.GetIapSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: @@ -451,7 +453,7 @@ async def get_iap_settings( resource. Args: - request (:class:`google.cloud.iap_v1.types.GetIapSettingsRequest`): + request (Union[google.cloud.iap_v1.types.GetIapSettingsRequest, dict]): The request object. The request sent to GetIapSettings. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -488,9 +490,9 @@ async def get_iap_settings( async def update_iap_settings( self, - request: service.UpdateIapSettingsRequest = None, + request: Union[service.UpdateIapSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: @@ -498,7 +500,7 @@ async def update_iap_settings( It replaces all fields unless the ``update_mask`` is set. Args: - request (:class:`google.cloud.iap_v1.types.UpdateIapSettingsRequest`): + request (Union[google.cloud.iap_v1.types.UpdateIapSettingsRequest, dict]): The request object. The request sent to UpdateIapSettings. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py index 552deaa..1b8f770 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.iap_v1.types import service from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore @@ -345,7 +347,7 @@ def set_iam_policy( self, request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -452,7 +454,7 @@ def get_iam_policy( self, request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -559,7 +561,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -611,7 +613,7 @@ def get_iap_settings( self, request: Union[service.GetIapSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: @@ -659,7 +661,7 @@ def update_iap_settings( self, request: Union[service.UpdateIapSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py index 193ff54..6f8cb60 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_admin_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 @@ -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 IdentityAwareProxyAdminServiceTransport(abc.ABC): """Abstract transport class for IdentityAwareProxyAdminService.""" @@ -95,7 +85,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 @@ -128,29 +118,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/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py index 7db3404..1098c49 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py index be71693..45ef8ff 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service import pagers from google.cloud.iap_v1.types import service from .transports.base import ( @@ -174,16 +176,16 @@ def __init__( async def list_brands( self, - request: service.ListBrandsRequest = None, + request: Union[service.ListBrandsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.ListBrandsResponse: r"""Lists the existing brands for the project. Args: - request (:class:`google.cloud.iap_v1.types.ListBrandsRequest`): + request (Union[google.cloud.iap_v1.types.ListBrandsRequest, dict]): The request object. The request sent to ListBrands. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -220,9 +222,9 @@ async def list_brands( async def create_brand( self, - request: service.CreateBrandRequest = None, + request: Union[service.CreateBrandRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: @@ -238,7 +240,7 @@ async def create_brand( by the caller. Args: - request (:class:`google.cloud.iap_v1.types.CreateBrandRequest`): + request (Union[google.cloud.iap_v1.types.CreateBrandRequest, dict]): The request object. The request sent to CreateBrand. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -278,16 +280,16 @@ async def create_brand( async def get_brand( self, - request: service.GetBrandRequest = None, + request: Union[service.GetBrandRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: r"""Retrieves the OAuth brand of the project. Args: - request (:class:`google.cloud.iap_v1.types.GetBrandRequest`): + request (Union[google.cloud.iap_v1.types.GetBrandRequest, dict]): The request object. The request sent to GetBrand. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -327,9 +329,9 @@ async def get_brand( async def create_identity_aware_proxy_client( self, - request: service.CreateIdentityAwareProxyClientRequest = None, + request: Union[service.CreateIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -339,7 +341,7 @@ async def create_identity_aware_proxy_client( use. Args: - request (:class:`google.cloud.iap_v1.types.CreateIdentityAwareProxyClientRequest`): + request (Union[google.cloud.iap_v1.types.CreateIdentityAwareProxyClientRequest, dict]): The request object. The request sent to CreateIdentityAwareProxyClient. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -379,16 +381,16 @@ async def create_identity_aware_proxy_client( async def list_identity_aware_proxy_clients( self, - request: service.ListIdentityAwareProxyClientsRequest = None, + request: Union[service.ListIdentityAwareProxyClientsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListIdentityAwareProxyClientsAsyncPager: r"""Lists the existing clients for the brand. Args: - request (:class:`google.cloud.iap_v1.types.ListIdentityAwareProxyClientsRequest`): + request (Union[google.cloud.iap_v1.types.ListIdentityAwareProxyClientsRequest, dict]): The request object. The request sent to ListIdentityAwareProxyClients. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -437,9 +439,9 @@ async def list_identity_aware_proxy_clients( async def get_identity_aware_proxy_client( self, - request: service.GetIdentityAwareProxyClientRequest = None, + request: Union[service.GetIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -447,7 +449,7 @@ async def get_identity_aware_proxy_client( Requires that the client is owned by IAP. Args: - request (:class:`google.cloud.iap_v1.types.GetIdentityAwareProxyClientRequest`): + request (Union[google.cloud.iap_v1.types.GetIdentityAwareProxyClientRequest, dict]): The request object. The request sent to GetIdentityAwareProxyClient. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -487,9 +489,9 @@ async def get_identity_aware_proxy_client( async def reset_identity_aware_proxy_client_secret( self, - request: service.ResetIdentityAwareProxyClientSecretRequest = None, + request: Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -498,7 +500,7 @@ async def reset_identity_aware_proxy_client_secret( that the client is owned by IAP. Args: - request (:class:`google.cloud.iap_v1.types.ResetIdentityAwareProxyClientSecretRequest`): + request (Union[google.cloud.iap_v1.types.ResetIdentityAwareProxyClientSecretRequest, dict]): The request object. The request sent to ResetIdentityAwareProxyClientSecret. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -538,9 +540,9 @@ async def reset_identity_aware_proxy_client_secret( async def delete_identity_aware_proxy_client( self, - request: service.DeleteIdentityAwareProxyClientRequest = None, + request: Union[service.DeleteIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -550,7 +552,7 @@ async def delete_identity_aware_proxy_client( after tests. Requires that the client is owned by IAP. Args: - request (:class:`google.cloud.iap_v1.types.DeleteIdentityAwareProxyClientRequest`): + request (Union[google.cloud.iap_v1.types.DeleteIdentityAwareProxyClientRequest, dict]): The request object. The request sent to DeleteIdentityAwareProxyClient. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py index 36168fb..19efa91 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service import pagers from google.cloud.iap_v1.types import service from .transports.base import ( @@ -347,7 +349,7 @@ def list_brands( self, request: Union[service.ListBrandsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.ListBrandsResponse: @@ -394,7 +396,7 @@ def create_brand( self, request: Union[service.CreateBrandRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: @@ -453,7 +455,7 @@ def get_brand( self, request: Union[service.GetBrandRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: @@ -503,7 +505,7 @@ def create_identity_aware_proxy_client( self, request: Union[service.CreateIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -558,7 +560,7 @@ def list_identity_aware_proxy_clients( self, request: Union[service.ListIdentityAwareProxyClientsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListIdentityAwareProxyClientsPager: @@ -619,7 +621,7 @@ def get_identity_aware_proxy_client( self, request: Union[service.GetIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -672,7 +674,7 @@ def reset_identity_aware_proxy_client_secret( self, request: Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: @@ -726,7 +728,7 @@ def delete_identity_aware_proxy_client( self, request: Union[service.DeleteIdentityAwareProxyClientRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: diff --git a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py index a9fd7f8..7ad9e6a 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_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 @@ -36,15 +35,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 IdentityAwareProxyOAuthServiceTransport(abc.ABC): """Abstract transport class for IdentityAwareProxyOAuthService.""" @@ -94,7 +84,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 @@ -127,29 +117,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/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py index 6453269..b99ae38 100644 --- a/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py +++ b/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/setup.py b/setup.py index 1ef7bb3..27325d0 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.27.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "proto-plus >= 1.15.0", - "packaging >= 14.3", "grpc-google-iam-v1 >= 0.12.3, < 0.13dev", ] diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt deleted file mode 100644 index fe11de2..0000000 --- a/testing/constraints-3.11.txt +++ /dev/null @@ -1,10 +0,0 @@ -# This constraints file is used to check that lower bounds -# 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 -proto-plus==1.15.0 -packaging==14.3 -google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 si transitively required through google-api-core \ No newline at end of file diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 81fa145..685bbab 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.27.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 si transitively required through google-api-core grpc-google-iam-v1==0.12.3 diff --git a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py index 0d9c828..b90011f 100644 --- a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py +++ b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -39,9 +38,6 @@ IdentityAwareProxyAdminServiceClient, ) from google.cloud.iap_v1.services.identity_aware_proxy_admin_service import transports -from google.cloud.iap_v1.services.identity_aware_proxy_admin_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.iap_v1.types import service from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore @@ -53,20 +49,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" @@ -244,7 +226,7 @@ def test_identity_aware_proxy_admin_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, @@ -261,7 +243,7 @@ def test_identity_aware_proxy_admin_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, @@ -278,7 +260,7 @@ def test_identity_aware_proxy_admin_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, @@ -307,7 +289,7 @@ def test_identity_aware_proxy_admin_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, @@ -376,7 +358,7 @@ def test_identity_aware_proxy_admin_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 @@ -418,7 +400,7 @@ def test_identity_aware_proxy_admin_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, @@ -440,7 +422,7 @@ def test_identity_aware_proxy_admin_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, @@ -475,7 +457,7 @@ def test_identity_aware_proxy_admin_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, @@ -510,7 +492,7 @@ def test_identity_aware_proxy_admin_service_client_client_options_credentials_fi 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", @@ -1418,7 +1400,6 @@ def test_identity_aware_proxy_admin_service_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_admin_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1439,26 +1420,6 @@ def test_identity_aware_proxy_admin_service_base_transport_with_credentials_file ) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_admin_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.iap_v1.services.identity_aware_proxy_admin_service.transports.IdentityAwareProxyAdminServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.IdentityAwareProxyAdminServiceTransport( - 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_identity_aware_proxy_admin_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( @@ -1470,7 +1431,6 @@ def test_identity_aware_proxy_admin_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_admin_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1483,18 +1443,6 @@ def test_identity_aware_proxy_admin_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_admin_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) - IdentityAwareProxyAdminServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1502,7 +1450,6 @@ def test_identity_aware_proxy_admin_service_auth_adc_old_google_auth(): transports.IdentityAwareProxyAdminServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_admin_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1516,28 +1463,6 @@ def test_identity_aware_proxy_admin_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.IdentityAwareProxyAdminServiceGrpcTransport, - transports.IdentityAwareProxyAdminServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_admin_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", [ diff --git a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py index 421da4d..a52d066 100644 --- a/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py +++ b/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -40,28 +39,11 @@ ) from google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service import pagers from google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service import transports -from google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.iap_v1.types import service from google.oauth2 import service_account 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" @@ -239,7 +221,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -256,7 +238,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -273,7 +255,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -302,7 +284,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -371,7 +353,7 @@ def test_identity_aware_proxy_o_auth_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 @@ -413,7 +395,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -435,7 +417,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -470,7 +452,7 @@ def test_identity_aware_proxy_o_auth_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, @@ -505,7 +487,7 @@ def test_identity_aware_proxy_o_auth_service_client_client_options_credentials_f 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", @@ -2028,7 +2010,6 @@ def test_identity_aware_proxy_o_auth_service_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_o_auth_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -2049,26 +2030,6 @@ def test_identity_aware_proxy_o_auth_service_base_transport_with_credentials_fil ) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_o_auth_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.iap_v1.services.identity_aware_proxy_o_auth_service.transports.IdentityAwareProxyOAuthServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.IdentityAwareProxyOAuthServiceTransport( - 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_identity_aware_proxy_o_auth_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( @@ -2080,7 +2041,6 @@ def test_identity_aware_proxy_o_auth_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_o_auth_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -2093,18 +2053,6 @@ def test_identity_aware_proxy_o_auth_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_o_auth_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) - IdentityAwareProxyOAuthServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -2112,7 +2060,6 @@ def test_identity_aware_proxy_o_auth_service_auth_adc_old_google_auth(): transports.IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_identity_aware_proxy_o_auth_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -2126,28 +2073,6 @@ def test_identity_aware_proxy_o_auth_service_transport_auth_adc(transport_class) ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.IdentityAwareProxyOAuthServiceGrpcTransport, - transports.IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_identity_aware_proxy_o_auth_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", [