diff --git a/packages/google-cloud-iap/.github/release-please.yml b/packages/google-cloud-iap/.github/release-please.yml index 6def37a84c98..e9a4f0085128 100644 --- a/packages/google-cloud-iap/.github/release-please.yml +++ b/packages/google-cloud-iap/.github/release-please.yml @@ -1,5 +1,6 @@ releaseType: python handleGHRelease: true +manifest: true # NOTE: this section is generated by synthtool.languages.python # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py branches: diff --git a/packages/google-cloud-iap/.release-please-manifest.json b/packages/google-cloud-iap/.release-please-manifest.json new file mode 100644 index 000000000000..bf6b57154ea8 --- /dev/null +++ b/packages/google-cloud-iap/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.5.4" +} diff --git a/packages/google-cloud-iap/docs/iap_v1/types.rst b/packages/google-cloud-iap/docs/iap_v1/types.rst index cd228d8fce8d..711d3b91bff3 100644 --- a/packages/google-cloud-iap/docs/iap_v1/types.rst +++ b/packages/google-cloud-iap/docs/iap_v1/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Iap v1 API .. automodule:: google.cloud.iap_v1.types :members: - :undoc-members: :show-inheritance: diff --git a/packages/google-cloud-iap/google/cloud/iap/__init__.py b/packages/google-cloud-iap/google/cloud/iap/__init__.py index 77b97467fb0f..4019ea416fc4 100644 --- a/packages/google-cloud-iap/google/cloud/iap/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.iap import gapic_version as package_version + +__version__ = package_version.__version__ + from google.cloud.iap_v1.services.identity_aware_proxy_admin_service.async_client import ( IdentityAwareProxyAdminServiceAsyncClient, diff --git a/packages/google-cloud-iap/google/cloud/iap/gapic_version.py b/packages/google-cloud-iap/google/cloud/iap/gapic_version.py new file mode 100644 index 000000000000..afd6fcfa0d51 --- /dev/null +++ b/packages/google-cloud-iap/google/cloud/iap/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "1.5.4" # {x-release-please-version} diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py index 487d61792cf3..723bc0e80be6 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.iap import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.identity_aware_proxy_admin_service import ( IdentityAwareProxyAdminServiceAsyncClient, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py index 156d997c9d60..1e46601e4834 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -183,9 +193,9 @@ def transport(self) -> IdentityAwareProxyAdminServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, IdentityAwareProxyAdminServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the identity aware proxy admin service client. @@ -229,10 +239,10 @@ def __init__( async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for an Identity-Aware Proxy @@ -268,7 +278,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[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, @@ -375,10 +385,10 @@ async def sample_set_iam_policy(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for an Identity-Aware Proxy @@ -414,7 +424,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[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, @@ -521,10 +531,10 @@ async def sample_get_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on the Identity-Aware @@ -561,7 +571,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[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, @@ -607,10 +617,10 @@ async def sample_test_iam_permissions(): async def get_iap_settings( self, - request: Union[service.GetIapSettingsRequest, dict] = None, + request: Optional[Union[service.GetIapSettingsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: r"""Gets the IAP settings on a particular IAP protected @@ -643,7 +653,7 @@ async def sample_get_iap_settings(): print(response) Args: - request (Union[google.cloud.iap_v1.types.GetIapSettingsRequest, dict]): + request (Optional[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. @@ -685,10 +695,10 @@ async def sample_get_iap_settings(): async def update_iap_settings( self, - request: Union[service.UpdateIapSettingsRequest, dict] = None, + request: Optional[Union[service.UpdateIapSettingsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: r"""Updates the IAP settings on a particular IAP protected resource. @@ -724,7 +734,7 @@ async def sample_update_iap_settings(): print(response) Args: - request (Union[google.cloud.iap_v1.types.UpdateIapSettingsRequest, dict]): + request (Optional[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, @@ -769,11 +779,11 @@ async def sample_update_iap_settings(): async def list_tunnel_dest_groups( self, - request: Union[service.ListTunnelDestGroupsRequest, dict] = None, + request: Optional[Union[service.ListTunnelDestGroupsRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTunnelDestGroupsAsyncPager: r"""Lists the existing TunnelDestGroups. To group across all @@ -808,7 +818,7 @@ async def sample_list_tunnel_dest_groups(): print(response) Args: - request (Union[google.cloud.iap_v1.types.ListTunnelDestGroupsRequest, dict]): + request (Optional[Union[google.cloud.iap_v1.types.ListTunnelDestGroupsRequest, dict]]): The request object. The request to ListTunnelDestGroups. parent (:class:`str`): Required. Google Cloud Project ID and location. In the @@ -888,13 +898,13 @@ async def sample_list_tunnel_dest_groups(): async def create_tunnel_dest_group( self, - request: Union[service.CreateTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.CreateTunnelDestGroupRequest, dict]] = None, *, - parent: str = None, - tunnel_dest_group: service.TunnelDestGroup = None, - tunnel_dest_group_id: str = None, + parent: Optional[str] = None, + tunnel_dest_group: Optional[service.TunnelDestGroup] = None, + tunnel_dest_group_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Creates a new TunnelDestGroup. @@ -931,7 +941,7 @@ async def sample_create_tunnel_dest_group(): print(response) Args: - request (Union[google.cloud.iap_v1.types.CreateTunnelDestGroupRequest, dict]): + request (Optional[Union[google.cloud.iap_v1.types.CreateTunnelDestGroupRequest, dict]]): The request object. The request to CreateTunnelDestGroup. parent (:class:`str`): @@ -1017,11 +1027,11 @@ async def sample_create_tunnel_dest_group(): async def get_tunnel_dest_group( self, - request: Union[service.GetTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.GetTunnelDestGroupRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Retrieves an existing TunnelDestGroup. @@ -1053,7 +1063,7 @@ async def sample_get_tunnel_dest_group(): print(response) Args: - request (Union[google.cloud.iap_v1.types.GetTunnelDestGroupRequest, dict]): + request (Optional[Union[google.cloud.iap_v1.types.GetTunnelDestGroupRequest, dict]]): The request object. The request to GetTunnelDestGroup. name (:class:`str`): Required. Name of the TunnelDestGroup to be fetched. In @@ -1117,11 +1127,11 @@ async def sample_get_tunnel_dest_group(): async def delete_tunnel_dest_group( self, - request: Union[service.DeleteTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.DeleteTunnelDestGroupRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a TunnelDestGroup. @@ -1150,7 +1160,7 @@ async def sample_delete_tunnel_dest_group(): await client.delete_tunnel_dest_group(request=request) Args: - request (Union[google.cloud.iap_v1.types.DeleteTunnelDestGroupRequest, dict]): + request (Optional[Union[google.cloud.iap_v1.types.DeleteTunnelDestGroupRequest, dict]]): The request object. The request to DeleteTunnelDestGroup. name (:class:`str`): @@ -1208,12 +1218,12 @@ async def sample_delete_tunnel_dest_group(): async def update_tunnel_dest_group( self, - request: Union[service.UpdateTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.UpdateTunnelDestGroupRequest, dict]] = None, *, - tunnel_dest_group: service.TunnelDestGroup = None, - update_mask: field_mask_pb2.FieldMask = None, + tunnel_dest_group: Optional[service.TunnelDestGroup] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Updates a TunnelDestGroup. @@ -1248,7 +1258,7 @@ async def sample_update_tunnel_dest_group(): print(response) Args: - request (Union[google.cloud.iap_v1.types.UpdateTunnelDestGroupRequest, dict]): + request (Optional[Union[google.cloud.iap_v1.types.UpdateTunnelDestGroupRequest, dict]]): The request object. The request to UpdateTunnelDestGroup. tunnel_dest_group (:class:`google.cloud.iap_v1.types.TunnelDestGroup`): diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py index 79a4cc42db89..634fb06cd951 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -67,7 +78,7 @@ class IdentityAwareProxyAdminServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[IdentityAwareProxyAdminServiceTransport]: """Returns an appropriate transport class. @@ -363,8 +374,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, IdentityAwareProxyAdminServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, IdentityAwareProxyAdminServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the identity aware proxy admin service client. @@ -378,7 +389,7 @@ def __init__( transport (Union[str, IdentityAwareProxyAdminServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -408,6 +419,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -460,10 +472,10 @@ def __init__( def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for an Identity-Aware Proxy @@ -605,10 +617,10 @@ def sample_set_iam_policy(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for an Identity-Aware Proxy @@ -750,10 +762,10 @@ def sample_get_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on the Identity-Aware @@ -835,10 +847,10 @@ def sample_test_iam_permissions(): def get_iap_settings( self, - request: Union[service.GetIapSettingsRequest, dict] = None, + request: Optional[Union[service.GetIapSettingsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: r"""Gets the IAP settings on a particular IAP protected @@ -914,10 +926,10 @@ def sample_get_iap_settings(): def update_iap_settings( self, - request: Union[service.UpdateIapSettingsRequest, dict] = None, + request: Optional[Union[service.UpdateIapSettingsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IapSettings: r"""Updates the IAP settings on a particular IAP protected resource. @@ -999,11 +1011,11 @@ def sample_update_iap_settings(): def list_tunnel_dest_groups( self, - request: Union[service.ListTunnelDestGroupsRequest, dict] = None, + request: Optional[Union[service.ListTunnelDestGroupsRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTunnelDestGroupsPager: r"""Lists the existing TunnelDestGroups. To group across all @@ -1118,13 +1130,13 @@ def sample_list_tunnel_dest_groups(): def create_tunnel_dest_group( self, - request: Union[service.CreateTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.CreateTunnelDestGroupRequest, dict]] = None, *, - parent: str = None, - tunnel_dest_group: service.TunnelDestGroup = None, - tunnel_dest_group_id: str = None, + parent: Optional[str] = None, + tunnel_dest_group: Optional[service.TunnelDestGroup] = None, + tunnel_dest_group_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Creates a new TunnelDestGroup. @@ -1247,11 +1259,11 @@ def sample_create_tunnel_dest_group(): def get_tunnel_dest_group( self, - request: Union[service.GetTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.GetTunnelDestGroupRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Retrieves an existing TunnelDestGroup. @@ -1347,11 +1359,11 @@ def sample_get_tunnel_dest_group(): def delete_tunnel_dest_group( self, - request: Union[service.DeleteTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.DeleteTunnelDestGroupRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a TunnelDestGroup. @@ -1438,12 +1450,12 @@ def sample_delete_tunnel_dest_group(): def update_tunnel_dest_group( self, - request: Union[service.UpdateTunnelDestGroupRequest, dict] = None, + request: Optional[Union[service.UpdateTunnelDestGroupRequest, dict]] = None, *, - tunnel_dest_group: service.TunnelDestGroup = None, - update_mask: field_mask_pb2.FieldMask = None, + tunnel_dest_group: Optional[service.TunnelDestGroup] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.TunnelDestGroup: r"""Updates a TunnelDestGroup. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py index 033fa2e07d08..c04088ebac87 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py @@ -51,7 +51,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py index d59d017f270c..742bcbf6b2dd 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py @@ -51,14 +51,14 @@ def __init__( self, *, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -185,8 +185,8 @@ def __init__( def create_channel( cls, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py index 8486d7484b88..d55615fdaf7b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py @@ -53,7 +53,7 @@ class IdentityAwareProxyAdminServiceGrpcAsyncIOTransport( def create_channel( cls, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -96,15 +96,15 @@ def __init__( self, *, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py index 3332056e51c0..ae8117321539 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -170,9 +180,9 @@ def transport(self) -> IdentityAwareProxyOAuthServiceTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, IdentityAwareProxyOAuthServiceTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the identity aware proxy o auth service client. @@ -216,10 +226,10 @@ def __init__( async def list_brands( self, - request: Union[service.ListBrandsRequest, dict] = None, + request: Optional[Union[service.ListBrandsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.ListBrandsResponse: r"""Lists the existing brands for the project. @@ -251,7 +261,7 @@ async def sample_list_brands(): print(response) Args: - request (Union[google.cloud.iap_v1.types.ListBrandsRequest, dict]): + request (Optional[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. @@ -293,10 +303,10 @@ async def sample_list_brands(): async def create_brand( self, - request: Union[service.CreateBrandRequest, dict] = None, + request: Optional[Union[service.CreateBrandRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: r"""Constructs a new OAuth brand for the project if one @@ -337,7 +347,7 @@ async def sample_create_brand(): print(response) Args: - request (Union[google.cloud.iap_v1.types.CreateBrandRequest, dict]): + request (Optional[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. @@ -382,10 +392,10 @@ async def sample_create_brand(): async def get_brand( self, - request: Union[service.GetBrandRequest, dict] = None, + request: Optional[Union[service.GetBrandRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: r"""Retrieves the OAuth brand of the project. @@ -417,7 +427,7 @@ async def sample_get_brand(): print(response) Args: - request (Union[google.cloud.iap_v1.types.GetBrandRequest, dict]): + request (Optional[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. @@ -462,10 +472,12 @@ async def sample_get_brand(): async def create_identity_aware_proxy_client( self, - request: Union[service.CreateIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.CreateIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Creates an Identity Aware Proxy (IAP) OAuth client. @@ -500,7 +512,7 @@ async def sample_create_identity_aware_proxy_client(): print(response) Args: - request (Union[google.cloud.iap_v1.types.CreateIdentityAwareProxyClientRequest, dict]): + request (Optional[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, @@ -545,10 +557,12 @@ async def sample_create_identity_aware_proxy_client(): async def list_identity_aware_proxy_clients( self, - request: Union[service.ListIdentityAwareProxyClientsRequest, dict] = None, + request: Optional[ + Union[service.ListIdentityAwareProxyClientsRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListIdentityAwareProxyClientsAsyncPager: r"""Lists the existing clients for the brand. @@ -581,7 +595,7 @@ async def sample_list_identity_aware_proxy_clients(): print(response) Args: - request (Union[google.cloud.iap_v1.types.ListIdentityAwareProxyClientsRequest, dict]): + request (Optional[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, @@ -638,10 +652,12 @@ async def sample_list_identity_aware_proxy_clients(): async def get_identity_aware_proxy_client( self, - request: Union[service.GetIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.GetIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Retrieves an Identity Aware Proxy (IAP) OAuth client. @@ -674,7 +690,7 @@ async def sample_get_identity_aware_proxy_client(): print(response) Args: - request (Union[google.cloud.iap_v1.types.GetIdentityAwareProxyClientRequest, dict]): + request (Optional[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, @@ -719,10 +735,12 @@ async def sample_get_identity_aware_proxy_client(): async def reset_identity_aware_proxy_client_secret( self, - request: Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] = None, + request: Optional[ + Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Resets an Identity Aware Proxy (IAP) OAuth client @@ -756,7 +774,7 @@ async def sample_reset_identity_aware_proxy_client_secret(): print(response) Args: - request (Union[google.cloud.iap_v1.types.ResetIdentityAwareProxyClientSecretRequest, dict]): + request (Optional[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, @@ -801,10 +819,12 @@ async def sample_reset_identity_aware_proxy_client_secret(): async def delete_identity_aware_proxy_client( self, - request: Union[service.DeleteIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.DeleteIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes an Identity Aware Proxy (IAP) OAuth client. @@ -836,7 +856,7 @@ async def sample_delete_identity_aware_proxy_client(): await client.delete_identity_aware_proxy_client(request=request) Args: - request (Union[google.cloud.iap_v1.types.DeleteIdentityAwareProxyClientRequest, dict]): + request (Optional[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/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py index 2765b54cbed1..fe09e9d0642a 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -63,7 +74,7 @@ class IdentityAwareProxyOAuthServiceClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[IdentityAwareProxyOAuthServiceTransport]: """Returns an appropriate transport class. @@ -321,8 +332,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, IdentityAwareProxyOAuthServiceTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, IdentityAwareProxyOAuthServiceTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the identity aware proxy o auth service client. @@ -336,7 +347,7 @@ def __init__( transport (Union[str, IdentityAwareProxyOAuthServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -366,6 +377,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -418,10 +430,10 @@ def __init__( def list_brands( self, - request: Union[service.ListBrandsRequest, dict] = None, + request: Optional[Union[service.ListBrandsRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.ListBrandsResponse: r"""Lists the existing brands for the project. @@ -496,10 +508,10 @@ def sample_list_brands(): def create_brand( self, - request: Union[service.CreateBrandRequest, dict] = None, + request: Optional[Union[service.CreateBrandRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: r"""Constructs a new OAuth brand for the project if one @@ -586,10 +598,10 @@ def sample_create_brand(): def get_brand( self, - request: Union[service.GetBrandRequest, dict] = None, + request: Optional[Union[service.GetBrandRequest, dict]] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.Brand: r"""Retrieves the OAuth brand of the project. @@ -667,10 +679,12 @@ def sample_get_brand(): def create_identity_aware_proxy_client( self, - request: Union[service.CreateIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.CreateIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Creates an Identity Aware Proxy (IAP) OAuth client. @@ -753,10 +767,12 @@ def sample_create_identity_aware_proxy_client(): def list_identity_aware_proxy_clients( self, - request: Union[service.ListIdentityAwareProxyClientsRequest, dict] = None, + request: Optional[ + Union[service.ListIdentityAwareProxyClientsRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListIdentityAwareProxyClientsPager: r"""Lists the existing clients for the brand. @@ -849,10 +865,12 @@ def sample_list_identity_aware_proxy_clients(): def get_identity_aware_proxy_client( self, - request: Union[service.GetIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.GetIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Retrieves an Identity Aware Proxy (IAP) OAuth client. @@ -933,10 +951,12 @@ def sample_get_identity_aware_proxy_client(): def reset_identity_aware_proxy_client_secret( self, - request: Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] = None, + request: Optional[ + Union[service.ResetIdentityAwareProxyClientSecretRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.IdentityAwareProxyClient: r"""Resets an Identity Aware Proxy (IAP) OAuth client @@ -1018,10 +1038,12 @@ def sample_reset_identity_aware_proxy_client_secret(): def delete_identity_aware_proxy_client( self, - request: Union[service.DeleteIdentityAwareProxyClientRequest, dict] = None, + request: Optional[ + Union[service.DeleteIdentityAwareProxyClientRequest, dict] + ] = None, *, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes an Identity Aware Proxy (IAP) OAuth client. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py index d58d32a80328..84b7a3430417 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py @@ -49,7 +49,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py index a95d8517627b..4e4d927c08fd 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py @@ -51,14 +51,14 @@ def __init__( self, *, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -185,8 +185,8 @@ def __init__( def create_channel( cls, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py index c85aed611eb8..139d3cb3a721 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py @@ -53,7 +53,7 @@ class IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport( def create_channel( cls, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -96,15 +96,15 @@ def __init__( self, *, host: str = "iap.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py index c9d9e318d173..29f3f7f205bd 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import wrappers_pb2 # type: ignore @@ -81,15 +83,15 @@ class ListTunnelDestGroupsRequest(proto.Message): the page token. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) @@ -99,7 +101,7 @@ class ListTunnelDestGroupsResponse(proto.Message): r"""The response from ListTunnelDestGroups. Attributes: - tunnel_dest_groups (Sequence[google.cloud.iap_v1.types.TunnelDestGroup]): + tunnel_dest_groups (MutableSequence[google.cloud.iap_v1.types.TunnelDestGroup]): TunnelDestGroup existing in the project. next_page_token (str): A token that you can send as ``page_token`` to retrieve the @@ -111,12 +113,12 @@ class ListTunnelDestGroupsResponse(proto.Message): def raw_page(self): return self - tunnel_dest_groups = proto.RepeatedField( + tunnel_dest_groups: MutableSequence["TunnelDestGroup"] = proto.RepeatedField( proto.MESSAGE, number=1, message="TunnelDestGroup", ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -140,16 +142,16 @@ class CreateTunnelDestGroupRequest(proto.Message): ``[a-z][0-9]-``. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - tunnel_dest_group = proto.Field( + tunnel_dest_group: "TunnelDestGroup" = proto.Field( proto.MESSAGE, number=2, message="TunnelDestGroup", ) - tunnel_dest_group_id = proto.Field( + tunnel_dest_group_id: str = proto.Field( proto.STRING, number=3, ) @@ -165,7 +167,7 @@ class GetTunnelDestGroupRequest(proto.Message): ``projects/{project_number/id}/iap_tunnel/locations/{location}/destGroups/{dest_group}``. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -181,7 +183,7 @@ class DeleteTunnelDestGroupRequest(proto.Message): ``projects/{project_number/id}/iap_tunnel/locations/{location}/destGroups/{dest_group}``. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -201,12 +203,12 @@ class UpdateTunnelDestGroupRequest(proto.Message): https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask """ - tunnel_dest_group = proto.Field( + tunnel_dest_group: "TunnelDestGroup" = proto.Field( proto.MESSAGE, number=1, message="TunnelDestGroup", ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -221,23 +223,23 @@ class TunnelDestGroup(proto.Message): Required. Immutable. Identifier for the TunnelDestGroup. Must be unique within the project. - cidrs (Sequence[str]): + cidrs (MutableSequence[str]): null List of CIDRs that this group applies to. - fqdns (Sequence[str]): + fqdns (MutableSequence[str]): null List of FQDNs that this group applies to. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - cidrs = proto.RepeatedField( + cidrs: MutableSequence[str] = proto.RepeatedField( proto.STRING, number=2, ) - fqdns = proto.RepeatedField( + fqdns: MutableSequence[str] = proto.RepeatedField( proto.STRING, number=3, ) @@ -253,7 +255,7 @@ class GetIapSettingsRequest(proto.Message): permission for the associated resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -274,12 +276,12 @@ class UpdateIapSettingsRequest(proto.Message): https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask """ - iap_settings = proto.Field( + iap_settings: "IapSettings" = proto.Field( proto.MESSAGE, number=1, message="IapSettings", ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -301,16 +303,16 @@ class IapSettings(proto.Message): settings in IAP """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - access_settings = proto.Field( + access_settings: "AccessSettings" = proto.Field( proto.MESSAGE, number=5, message="AccessSettings", ) - application_settings = proto.Field( + application_settings: "ApplicationSettings" = proto.Field( proto.MESSAGE, number=6, message="ApplicationSettings", @@ -334,22 +336,22 @@ class AccessSettings(proto.Message): policies in IAP. """ - gcip_settings = proto.Field( + gcip_settings: "GcipSettings" = proto.Field( proto.MESSAGE, number=1, message="GcipSettings", ) - cors_settings = proto.Field( + cors_settings: "CorsSettings" = proto.Field( proto.MESSAGE, number=2, message="CorsSettings", ) - oauth_settings = proto.Field( + oauth_settings: "OAuthSettings" = proto.Field( proto.MESSAGE, number=3, message="OAuthSettings", ) - reauth_settings = proto.Field( + reauth_settings: "ReauthSettings" = proto.Field( proto.MESSAGE, number=6, message="ReauthSettings", @@ -360,7 +362,7 @@ class GcipSettings(proto.Message): r"""Allows customers to configure tenant_id for GCIP instance per-app. Attributes: - tenant_ids (Sequence[str]): + tenant_ids (MutableSequence[str]): GCIP tenant ids that are linked to the IAP resource. tenant_ids could be a string beginning with a number character to indicate authenticating with GCIP tenant flow, @@ -376,11 +378,11 @@ class GcipSettings(proto.Message): level. """ - tenant_ids = proto.RepeatedField( + tenant_ids: MutableSequence[str] = proto.RepeatedField( proto.STRING, number=1, ) - login_page_uri = proto.Field( + login_page_uri: wrappers_pb2.StringValue = proto.Field( proto.MESSAGE, number=2, message=wrappers_pb2.StringValue, @@ -399,7 +401,7 @@ class CorsSettings(proto.Message): apply any special logic to OPTIONS requests. """ - allow_http_options = proto.Field( + allow_http_options: wrappers_pb2.BoolValue = proto.Field( proto.MESSAGE, number=1, message=wrappers_pb2.BoolValue, @@ -421,7 +423,7 @@ class OAuthSettings(proto.Message): is managed by IAM policies. """ - login_hint = proto.Field( + login_hint: wrappers_pb2.StringValue = proto.Field( proto.MESSAGE, number=2, message=wrappers_pb2.StringValue, @@ -457,17 +459,17 @@ class PolicyType(proto.Enum): MINIMUM = 1 DEFAULT = 2 - method = proto.Field( + method: Method = proto.Field( proto.ENUM, number=1, enum=Method, ) - max_age = proto.Field( + max_age: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=2, message=duration_pb2.Duration, ) - policy_type = proto.Field( + policy_type: PolicyType = proto.Field( proto.ENUM, number=3, enum=PolicyType, @@ -489,17 +491,17 @@ class ApplicationSettings(proto.Message): but will be ignored at runtime if invalid. """ - csm_settings = proto.Field( + csm_settings: "CsmSettings" = proto.Field( proto.MESSAGE, number=1, message="CsmSettings", ) - access_denied_page_settings = proto.Field( + access_denied_page_settings: "AccessDeniedPageSettings" = proto.Field( proto.MESSAGE, number=2, message="AccessDeniedPageSettings", ) - cookie_domain = proto.Field( + cookie_domain: wrappers_pb2.StringValue = proto.Field( proto.MESSAGE, number=3, message=wrappers_pb2.StringValue, @@ -519,7 +521,7 @@ class CsmSettings(proto.Message): This value is not validated by IAP. """ - rctoken_aud = proto.Field( + rctoken_aud: wrappers_pb2.StringValue = proto.Field( proto.MESSAGE, number=1, message=wrappers_pb2.StringValue, @@ -541,12 +543,12 @@ class AccessDeniedPageSettings(proto.Message): access denied events to this application. """ - access_denied_page_uri = proto.Field( + access_denied_page_uri: wrappers_pb2.StringValue = proto.Field( proto.MESSAGE, number=1, message=wrappers_pb2.StringValue, ) - generate_troubleshooting_uri = proto.Field( + generate_troubleshooting_uri: wrappers_pb2.BoolValue = proto.Field( proto.MESSAGE, number=2, message=wrappers_pb2.BoolValue, @@ -562,7 +564,7 @@ class ListBrandsRequest(proto.Message): projects/{project_number/id}. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) @@ -572,11 +574,11 @@ class ListBrandsResponse(proto.Message): r"""Response message for ListBrands. Attributes: - brands (Sequence[google.cloud.iap_v1.types.Brand]): + brands (MutableSequence[google.cloud.iap_v1.types.Brand]): Brands existing in the project. """ - brands = proto.RepeatedField( + brands: MutableSequence["Brand"] = proto.RepeatedField( proto.MESSAGE, number=1, message="Brand", @@ -595,11 +597,11 @@ class CreateBrandRequest(proto.Message): Required. The brand to be created. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - brand = proto.Field( + brand: "Brand" = proto.Field( proto.MESSAGE, number=2, message="Brand", @@ -615,7 +617,7 @@ class GetBrandRequest(proto.Message): format: projects/{project_number/id}/brands/{brand}. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -644,15 +646,15 @@ class ListIdentityAwareProxyClientsRequest(proto.Message): provided the page token. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=2, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=3, ) @@ -662,7 +664,7 @@ class ListIdentityAwareProxyClientsResponse(proto.Message): r"""Response message for ListIdentityAwareProxyClients. Attributes: - identity_aware_proxy_clients (Sequence[google.cloud.iap_v1.types.IdentityAwareProxyClient]): + identity_aware_proxy_clients (MutableSequence[google.cloud.iap_v1.types.IdentityAwareProxyClient]): Clients existing in the brand. next_page_token (str): A token, which can be send as ``page_token`` to retrieve the @@ -674,12 +676,14 @@ class ListIdentityAwareProxyClientsResponse(proto.Message): def raw_page(self): return self - identity_aware_proxy_clients = proto.RepeatedField( + identity_aware_proxy_clients: MutableSequence[ + "IdentityAwareProxyClient" + ] = proto.RepeatedField( proto.MESSAGE, number=1, message="IdentityAwareProxyClient", ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -698,11 +702,11 @@ class CreateIdentityAwareProxyClientRequest(proto.Message): created. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - identity_aware_proxy_client = proto.Field( + identity_aware_proxy_client: "IdentityAwareProxyClient" = proto.Field( proto.MESSAGE, number=2, message="IdentityAwareProxyClient", @@ -719,7 +723,7 @@ class GetIdentityAwareProxyClientRequest(proto.Message): projects/{project_number/id}/brands/{brand}/identityAwareProxyClients/{client_id}. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -735,7 +739,7 @@ class ResetIdentityAwareProxyClientSecretRequest(proto.Message): projects/{project_number/id}/brands/{brand}/identityAwareProxyClients/{client_id}. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -751,7 +755,7 @@ class DeleteIdentityAwareProxyClientRequest(proto.Message): projects/{project_number/id}/brands/{brand}/identityAwareProxyClients/{client_id}. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -780,19 +784,19 @@ class Brand(proto.Message): organization only. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - support_email = proto.Field( + support_email: str = proto.Field( proto.STRING, number=2, ) - application_title = proto.Field( + application_title: str = proto.Field( proto.STRING, number=3, ) - org_internal_only = proto.Field( + org_internal_only: bool = proto.Field( proto.BOOL, number=4, ) @@ -814,15 +818,15 @@ class IdentityAwareProxyClient(proto.Message): client. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - secret = proto.Field( + secret: str = proto.Field( proto.STRING, number=2, ) - display_name = proto.Field( + display_name: str = proto.Field( proto.STRING, number=3, ) diff --git a/packages/google-cloud-iap/owlbot.py b/packages/google-cloud-iap/owlbot.py new file mode 100644 index 000000000000..ce738f01d012 --- /dev/null +++ b/packages/google-cloud-iap/owlbot.py @@ -0,0 +1,56 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +from pathlib import Path +import shutil + +import synthtool as s +import synthtool.gcp as gcp +from synthtool.languages import python + +# ---------------------------------------------------------------------------- +# Copy the generated client from the owl-bot staging directory +# ---------------------------------------------------------------------------- + +clean_up_generated_samples = True + +# Load the default version defined in .repo-metadata.json. +default_version = json.load(open(".repo-metadata.json", "rt")).get( + "default_version" +) + +for library in s.get_staging_dirs(default_version): + if clean_up_generated_samples: + shutil.rmtree("samples/generated_samples", ignore_errors=True) + clean_up_generated_samples = False + s.move([library], excludes=["**/gapic_version.py"]) +s.remove_staging_dirs() + +# ---------------------------------------------------------------------------- +# Add templated files +# ---------------------------------------------------------------------------- + +templated_files = gcp.CommonTemplates().py_library( + cov_level=100, + microgenerator=True, + versions=gcp.common.detect_versions(path="./google", default_first=True), +) +s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"]) + +python.py_samples(skip_readmes=True) + +# run format session for all directories which have a noxfile +for noxfile in Path(".").glob("**/noxfile.py"): + s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) diff --git a/packages/google-cloud-iap/release-please-config.json b/packages/google-cloud-iap/release-please-config.json new file mode 100644 index 000000000000..75279fc5fcb2 --- /dev/null +++ b/packages/google-cloud-iap/release-please-config.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "packages": { + ".": { + "release-type": "python", + "extra-files": [ + "google/cloud/iap/gapic_version.py", + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.iap.v1.json", + "jsonpath": "$.clientLibrary.version" + } + ] + } + }, + "release-type": "python", + "plugins": [ + { + "type": "sentence-case" + } + ], + "initial-version": "0.1.0" +} diff --git a/packages/google-cloud-iap/samples/generated_samples/snippet_metadata_iap_v1.json b/packages/google-cloud-iap/samples/generated_samples/snippet_metadata_google.cloud.iap.v1.json similarity index 99% rename from packages/google-cloud-iap/samples/generated_samples/snippet_metadata_iap_v1.json rename to packages/google-cloud-iap/samples/generated_samples/snippet_metadata_google.cloud.iap.v1.json index a0d092434f23..3170bc627f80 100644 --- a/packages/google-cloud-iap/samples/generated_samples/snippet_metadata_iap_v1.json +++ b/packages/google-cloud-iap/samples/generated_samples/snippet_metadata_google.cloud.iap.v1.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-iap" + "name": "google-cloud-iap", + "version": "0.1.0" }, "snippets": [ { diff --git a/packages/google-cloud-iap/setup.py b/packages/google-cloud-iap/setup.py index 70915cc7b955..8bd091334a0a 100644 --- a/packages/google-cloud-iap/setup.py +++ b/packages/google-cloud-iap/setup.py @@ -1,35 +1,47 @@ # -*- coding: utf-8 -*- -# -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +# import io import os -import setuptools +import setuptools # type: ignore + +package_root = os.path.abspath(os.path.dirname(__file__)) name = "google-cloud-iap" -description = "Identity-Aware Proxy API client library" -version = "1.5.4" -release_status = "Development Status :: 5 - Production/Stable" -url = "https://github.com/googleapis/python-iap" + + +description = "Google Cloud Iap API client library" + +version = {} +with open(os.path.join(package_root, "google/cloud/iap/gapic_version.py")) as fp: + exec(fp.read(), version) +version = version["__version__"] + +if version[0] == "0": + release_status = "Development Status :: 4 - Beta" +else: + release_status = "Development Status :: 5 - Production/Stable" + dependencies = [ - "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", "proto-plus >= 1.22.0, <2.0.0dev", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", - "grpc-google-iam-v1 >= 0.12.4, <1.0.0dev", + "grpc-google-iam-v1 >= 0.12.4, < 1.0.0dev", ] +url = "https://github.com/googleapis/python-iap" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -47,7 +59,6 @@ if "google.cloud" in packages: namespaces.append("google.cloud") - setuptools.setup( name=name, version=version, diff --git a/packages/google-cloud-iap/testing/constraints-3.10.txt b/packages/google-cloud-iap/testing/constraints-3.10.txt index e69de29bb2d1..ad3f0fa58e2d 100644 --- a/packages/google-cloud-iap/testing/constraints-3.10.txt +++ b/packages/google-cloud-iap/testing/constraints-3.10.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/packages/google-cloud-iap/testing/constraints-3.11.txt b/packages/google-cloud-iap/testing/constraints-3.11.txt new file mode 100644 index 000000000000..ad3f0fa58e2d --- /dev/null +++ b/packages/google-cloud-iap/testing/constraints-3.11.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/packages/google-cloud-iap/testing/constraints-3.7.txt b/packages/google-cloud-iap/testing/constraints-3.7.txt index d977db965665..883a87aefd06 100644 --- a/packages/google-cloud-iap/testing/constraints-3.7.txt +++ b/packages/google-cloud-iap/testing/constraints-3.7.txt @@ -4,7 +4,7 @@ # 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.32.0 +google-api-core==1.33.2 proto-plus==1.22.0 -grpc-google-iam-v1==0.12.4 protobuf==3.19.5 +grpc-google-iam-v1==0.12.4 diff --git a/packages/google-cloud-iap/testing/constraints-3.8.txt b/packages/google-cloud-iap/testing/constraints-3.8.txt index e69de29bb2d1..ad3f0fa58e2d 100644 --- a/packages/google-cloud-iap/testing/constraints-3.8.txt +++ b/packages/google-cloud-iap/testing/constraints-3.8.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/packages/google-cloud-iap/testing/constraints-3.9.txt b/packages/google-cloud-iap/testing/constraints-3.9.txt index e69de29bb2d1..ad3f0fa58e2d 100644 --- a/packages/google-cloud-iap/testing/constraints-3.9.txt +++ b/packages/google-cloud-iap/testing/constraints-3.9.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1