From dcefd7e92f08e12c868fee114c73075e8ba356a5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:04:19 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.51.2 (#30) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/network_security/client.py | 70 +++++++++++-------- .../network_security/transports/base.py | 2 +- .../network_security/transports/grpc.py | 6 +- .../transports/grpc_asyncio.py | 6 +- ...fixup_network_security_v1beta1_keywords.py | 32 ++++----- 5 files changed, 62 insertions(+), 54 deletions(-) diff --git a/google/cloud/network_security_v1beta1/services/network_security/client.py b/google/cloud/network_security_v1beta1/services/network_security/client.py index 4ee534a..3e40f96 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/client.py +++ b/google/cloud/network_security_v1beta1/services/network_security/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -410,7 +410,9 @@ def __init__( def list_authorization_policies( self, - request: authorization_policy.ListAuthorizationPoliciesRequest = None, + request: Union[ + authorization_policy.ListAuthorizationPoliciesRequest, dict + ] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -421,7 +423,7 @@ def list_authorization_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListAuthorizationPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListAuthorizationPoliciesRequest, dict]): The request object. Request used with the ListAuthorizationPolicies method. parent (str): @@ -496,7 +498,7 @@ def list_authorization_policies( def get_authorization_policy( self, - request: authorization_policy.GetAuthorizationPolicyRequest = None, + request: Union[authorization_policy.GetAuthorizationPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -506,7 +508,7 @@ def get_authorization_policy( r"""Gets details of a single AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetAuthorizationPolicyRequest, dict]): The request object. Request used by the GetAuthorizationPolicy method. name (str): @@ -573,7 +575,9 @@ def get_authorization_policy( def create_authorization_policy( self, - request: gcn_authorization_policy.CreateAuthorizationPolicyRequest = None, + request: Union[ + gcn_authorization_policy.CreateAuthorizationPolicyRequest, dict + ] = None, *, parent: str = None, authorization_policy: gcn_authorization_policy.AuthorizationPolicy = None, @@ -586,7 +590,7 @@ def create_authorization_policy( and location. Args: - request (google.cloud.network_security_v1beta1.types.CreateAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateAuthorizationPolicyRequest, dict]): The request object. Request used by the CreateAuthorizationPolicy method. parent (str): @@ -688,7 +692,9 @@ def create_authorization_policy( def update_authorization_policy( self, - request: gcn_authorization_policy.UpdateAuthorizationPolicyRequest = None, + request: Union[ + gcn_authorization_policy.UpdateAuthorizationPolicyRequest, dict + ] = None, *, authorization_policy: gcn_authorization_policy.AuthorizationPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -700,7 +706,7 @@ def update_authorization_policy( AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateAuthorizationPolicyRequest, dict]): The request object. Request used by the UpdateAuthorizationPolicy method. authorization_policy (google.cloud.network_security_v1beta1.types.AuthorizationPolicy): @@ -794,7 +800,9 @@ def update_authorization_policy( def delete_authorization_policy( self, - request: authorization_policy.DeleteAuthorizationPolicyRequest = None, + request: Union[ + authorization_policy.DeleteAuthorizationPolicyRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -804,7 +812,7 @@ def delete_authorization_policy( r"""Deletes a single AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteAuthorizationPolicyRequest, dict]): The request object. Request used by the DeleteAuthorizationPolicy method. name (str): @@ -891,7 +899,7 @@ def delete_authorization_policy( def list_server_tls_policies( self, - request: server_tls_policy.ListServerTlsPoliciesRequest = None, + request: Union[server_tls_policy.ListServerTlsPoliciesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -902,7 +910,7 @@ def list_server_tls_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListServerTlsPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListServerTlsPoliciesRequest, dict]): The request object. Request used by the ListServerTlsPolicies method. parent (str): @@ -973,7 +981,7 @@ def list_server_tls_policies( def get_server_tls_policy( self, - request: server_tls_policy.GetServerTlsPolicyRequest = None, + request: Union[server_tls_policy.GetServerTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -983,7 +991,7 @@ def get_server_tls_policy( r"""Gets details of a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetServerTlsPolicyRequest, dict]): The request object. Request used by the GetServerTlsPolicy method. name (str): @@ -1050,7 +1058,7 @@ def get_server_tls_policy( def create_server_tls_policy( self, - request: gcn_server_tls_policy.CreateServerTlsPolicyRequest = None, + request: Union[gcn_server_tls_policy.CreateServerTlsPolicyRequest, dict] = None, *, parent: str = None, server_tls_policy: gcn_server_tls_policy.ServerTlsPolicy = None, @@ -1063,7 +1071,7 @@ def create_server_tls_policy( location. Args: - request (google.cloud.network_security_v1beta1.types.CreateServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateServerTlsPolicyRequest, dict]): The request object. Request used by the CreateServerTlsPolicy method. parent (str): @@ -1159,7 +1167,7 @@ def create_server_tls_policy( def update_server_tls_policy( self, - request: gcn_server_tls_policy.UpdateServerTlsPolicyRequest = None, + request: Union[gcn_server_tls_policy.UpdateServerTlsPolicyRequest, dict] = None, *, server_tls_policy: gcn_server_tls_policy.ServerTlsPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1170,7 +1178,7 @@ def update_server_tls_policy( r"""Updates the parameters of a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateServerTlsPolicyRequest, dict]): The request object. Request used by UpdateServerTlsPolicy method. server_tls_policy (google.cloud.network_security_v1beta1.types.ServerTlsPolicy): @@ -1260,7 +1268,7 @@ def update_server_tls_policy( def delete_server_tls_policy( self, - request: server_tls_policy.DeleteServerTlsPolicyRequest = None, + request: Union[server_tls_policy.DeleteServerTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1270,7 +1278,7 @@ def delete_server_tls_policy( r"""Deletes a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteServerTlsPolicyRequest, dict]): The request object. Request used by the DeleteServerTlsPolicy method. name (str): @@ -1353,7 +1361,7 @@ def delete_server_tls_policy( def list_client_tls_policies( self, - request: client_tls_policy.ListClientTlsPoliciesRequest = None, + request: Union[client_tls_policy.ListClientTlsPoliciesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1364,7 +1372,7 @@ def list_client_tls_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListClientTlsPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListClientTlsPoliciesRequest, dict]): The request object. Request used by the ListClientTlsPolicies method. parent (str): @@ -1435,7 +1443,7 @@ def list_client_tls_policies( def get_client_tls_policy( self, - request: client_tls_policy.GetClientTlsPolicyRequest = None, + request: Union[client_tls_policy.GetClientTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1445,7 +1453,7 @@ def get_client_tls_policy( r"""Gets details of a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetClientTlsPolicyRequest, dict]): The request object. Request used by the GetClientTlsPolicy method. name (str): @@ -1511,7 +1519,7 @@ def get_client_tls_policy( def create_client_tls_policy( self, - request: gcn_client_tls_policy.CreateClientTlsPolicyRequest = None, + request: Union[gcn_client_tls_policy.CreateClientTlsPolicyRequest, dict] = None, *, parent: str = None, client_tls_policy: gcn_client_tls_policy.ClientTlsPolicy = None, @@ -1524,7 +1532,7 @@ def create_client_tls_policy( location. Args: - request (google.cloud.network_security_v1beta1.types.CreateClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateClientTlsPolicyRequest, dict]): The request object. Request used by the CreateClientTlsPolicy method. parent (str): @@ -1619,7 +1627,7 @@ def create_client_tls_policy( def update_client_tls_policy( self, - request: gcn_client_tls_policy.UpdateClientTlsPolicyRequest = None, + request: Union[gcn_client_tls_policy.UpdateClientTlsPolicyRequest, dict] = None, *, client_tls_policy: gcn_client_tls_policy.ClientTlsPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1630,7 +1638,7 @@ def update_client_tls_policy( r"""Updates the parameters of a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateClientTlsPolicyRequest, dict]): The request object. Request used by UpdateClientTlsPolicy method. client_tls_policy (google.cloud.network_security_v1beta1.types.ClientTlsPolicy): @@ -1719,7 +1727,7 @@ def update_client_tls_policy( def delete_client_tls_policy( self, - request: client_tls_policy.DeleteClientTlsPolicyRequest = None, + request: Union[client_tls_policy.DeleteClientTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1729,7 +1737,7 @@ def delete_client_tls_policy( r"""Deletes a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteClientTlsPolicyRequest, dict]): The request object. Request used by the DeleteClientTlsPolicy method. name (str): diff --git a/google/cloud/network_security_v1beta1/services/network_security/transports/base.py b/google/cloud/network_security_v1beta1/services/network_security/transports/base.py index c1d0300..6e4bd27 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/base.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/base.py @@ -130,7 +130,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py index f8fd775..70f2231 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py @@ -91,16 +91,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py index 7632628..c6fe5bb 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py @@ -138,16 +138,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_network_security_v1beta1_keywords.py b/scripts/fixup_network_security_v1beta1_keywords.py index e680120..219b0cc 100644 --- a/scripts/fixup_network_security_v1beta1_keywords.py +++ b/scripts/fixup_network_security_v1beta1_keywords.py @@ -39,21 +39,21 @@ def partition( class network_securityCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_authorization_policy': ('parent', 'authorization_policy_id', 'authorization_policy', ), - 'create_client_tls_policy': ('parent', 'client_tls_policy_id', 'client_tls_policy', ), - 'create_server_tls_policy': ('parent', 'server_tls_policy_id', 'server_tls_policy', ), - 'delete_authorization_policy': ('name', ), - 'delete_client_tls_policy': ('name', ), - 'delete_server_tls_policy': ('name', ), - 'get_authorization_policy': ('name', ), - 'get_client_tls_policy': ('name', ), - 'get_server_tls_policy': ('name', ), - 'list_authorization_policies': ('parent', 'page_size', 'page_token', ), - 'list_client_tls_policies': ('parent', 'page_size', 'page_token', ), - 'list_server_tls_policies': ('parent', 'page_size', 'page_token', ), - 'update_authorization_policy': ('authorization_policy', 'update_mask', ), - 'update_client_tls_policy': ('client_tls_policy', 'update_mask', ), - 'update_server_tls_policy': ('server_tls_policy', 'update_mask', ), + 'create_authorization_policy': ('parent', 'authorization_policy_id', 'authorization_policy', ), + 'create_client_tls_policy': ('parent', 'client_tls_policy_id', 'client_tls_policy', ), + 'create_server_tls_policy': ('parent', 'server_tls_policy_id', 'server_tls_policy', ), + 'delete_authorization_policy': ('name', ), + 'delete_client_tls_policy': ('name', ), + 'delete_server_tls_policy': ('name', ), + 'get_authorization_policy': ('name', ), + 'get_client_tls_policy': ('name', ), + 'get_server_tls_policy': ('name', ), + 'list_authorization_policies': ('parent', 'page_size', 'page_token', ), + 'list_client_tls_policies': ('parent', 'page_size', 'page_token', ), + 'list_server_tls_policies': ('parent', 'page_size', 'page_token', ), + 'update_authorization_policy': ('authorization_policy', 'update_mask', ), + 'update_client_tls_policy': ('client_tls_policy', 'update_mask', ), + 'update_server_tls_policy': ('server_tls_policy', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -72,7 +72,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs )