diff --git a/google/cloud/memcache_v1/services/cloud_memcache/client.py b/google/cloud/memcache_v1/services/cloud_memcache/client.py index ed1cf94..6ef32d3 100644 --- a/google/cloud/memcache_v1/services/cloud_memcache/client.py +++ b/google/cloud/memcache_v1/services/cloud_memcache/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 @@ -374,7 +374,7 @@ def __init__( def list_instances( self, - request: cloud_memcache.ListInstancesRequest = None, + request: Union[cloud_memcache.ListInstancesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -384,7 +384,7 @@ def list_instances( r"""Lists Instances in a given location. Args: - request (google.cloud.memcache_v1.types.ListInstancesRequest): + request (Union[google.cloud.memcache_v1.types.ListInstancesRequest, dict]): The request object. Request for [ListInstances][google.cloud.memcache.v1.CloudMemcache.ListInstances]. parent (str): @@ -456,7 +456,7 @@ def list_instances( def get_instance( self, - request: cloud_memcache.GetInstanceRequest = None, + request: Union[cloud_memcache.GetInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -466,7 +466,7 @@ def get_instance( r"""Gets details of a single Instance. Args: - request (google.cloud.memcache_v1.types.GetInstanceRequest): + request (Union[google.cloud.memcache_v1.types.GetInstanceRequest, dict]): The request object. Request for [GetInstance][google.cloud.memcache.v1.CloudMemcache.GetInstance]. name (str): @@ -527,7 +527,7 @@ def get_instance( def create_instance( self, - request: cloud_memcache.CreateInstanceRequest = None, + request: Union[cloud_memcache.CreateInstanceRequest, dict] = None, *, parent: str = None, instance: cloud_memcache.Instance = None, @@ -539,7 +539,7 @@ def create_instance( r"""Creates a new Instance in a given location. Args: - request (google.cloud.memcache_v1.types.CreateInstanceRequest): + request (Union[google.cloud.memcache_v1.types.CreateInstanceRequest, dict]): The request object. Request for [CreateInstance][google.cloud.memcache.v1.CloudMemcache.CreateInstance]. parent (str): @@ -638,7 +638,7 @@ def create_instance( def update_instance( self, - request: cloud_memcache.UpdateInstanceRequest = None, + request: Union[cloud_memcache.UpdateInstanceRequest, dict] = None, *, instance: cloud_memcache.Instance = None, update_mask: field_mask_pb2.FieldMask = None, @@ -650,7 +650,7 @@ def update_instance( location. Args: - request (google.cloud.memcache_v1.types.UpdateInstanceRequest): + request (Union[google.cloud.memcache_v1.types.UpdateInstanceRequest, dict]): The request object. Request for [UpdateInstance][google.cloud.memcache.v1.CloudMemcache.UpdateInstance]. instance (google.cloud.memcache_v1.types.Instance): @@ -733,7 +733,7 @@ def update_instance( def update_parameters( self, - request: cloud_memcache.UpdateParametersRequest = None, + request: Union[cloud_memcache.UpdateParametersRequest, dict] = None, *, name: str = None, update_mask: field_mask_pb2.FieldMask = None, @@ -748,7 +748,7 @@ def update_parameters( apply the parameters to nodes of the Memcached Instance. Args: - request (google.cloud.memcache_v1.types.UpdateParametersRequest): + request (Union[google.cloud.memcache_v1.types.UpdateParametersRequest, dict]): The request object. Request for [UpdateParameters][google.cloud.memcache.v1.CloudMemcache.UpdateParameters]. name (str): @@ -836,7 +836,7 @@ def update_parameters( def delete_instance( self, - request: cloud_memcache.DeleteInstanceRequest = None, + request: Union[cloud_memcache.DeleteInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -846,7 +846,7 @@ def delete_instance( r"""Deletes a single Instance. Args: - request (google.cloud.memcache_v1.types.DeleteInstanceRequest): + request (Union[google.cloud.memcache_v1.types.DeleteInstanceRequest, dict]): The request object. Request for [DeleteInstance][google.cloud.memcache.v1.CloudMemcache.DeleteInstance]. name (str): @@ -930,7 +930,7 @@ def delete_instance( def apply_parameters( self, - request: cloud_memcache.ApplyParametersRequest = None, + request: Union[cloud_memcache.ApplyParametersRequest, dict] = None, *, name: str = None, node_ids: Sequence[str] = None, @@ -944,7 +944,7 @@ def apply_parameters( parameters for the Memcached Instance. Args: - request (google.cloud.memcache_v1.types.ApplyParametersRequest): + request (Union[google.cloud.memcache_v1.types.ApplyParametersRequest, dict]): The request object. Request for [ApplyParameters][google.cloud.memcache.v1.CloudMemcache.ApplyParameters]. name (str): diff --git a/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py b/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py index 041aa53..e858b87 100644 --- a/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py +++ b/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py @@ -117,7 +117,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/memcache_v1/services/cloud_memcache/transports/grpc.py b/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py index c4c4827..e6d8a72 100644 --- a/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py +++ b/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py @@ -100,16 +100,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/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py b/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py index 8e1ad32..f8ce3db 100644 --- a/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py +++ b/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py @@ -147,16 +147,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/memcache_v1beta2/services/cloud_memcache/client.py b/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py index 08b759f..fa4815e 100644 --- a/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py +++ b/google/cloud/memcache_v1beta2/services/cloud_memcache/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 @@ -374,7 +374,7 @@ def __init__( def list_instances( self, - request: cloud_memcache.ListInstancesRequest = None, + request: Union[cloud_memcache.ListInstancesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -384,7 +384,7 @@ def list_instances( r"""Lists Instances in a given location. Args: - request (google.cloud.memcache_v1beta2.types.ListInstancesRequest): + request (Union[google.cloud.memcache_v1beta2.types.ListInstancesRequest, dict]): The request object. Request for [ListInstances][google.cloud.memcache.v1beta2.CloudMemcache.ListInstances]. parent (str): @@ -456,7 +456,7 @@ def list_instances( def get_instance( self, - request: cloud_memcache.GetInstanceRequest = None, + request: Union[cloud_memcache.GetInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -466,7 +466,7 @@ def get_instance( r"""Gets details of a single Instance. Args: - request (google.cloud.memcache_v1beta2.types.GetInstanceRequest): + request (Union[google.cloud.memcache_v1beta2.types.GetInstanceRequest, dict]): The request object. Request for [GetInstance][google.cloud.memcache.v1beta2.CloudMemcache.GetInstance]. name (str): @@ -527,7 +527,7 @@ def get_instance( def create_instance( self, - request: cloud_memcache.CreateInstanceRequest = None, + request: Union[cloud_memcache.CreateInstanceRequest, dict] = None, *, parent: str = None, instance_id: str = None, @@ -539,7 +539,7 @@ def create_instance( r"""Creates a new Instance in a given location. Args: - request (google.cloud.memcache_v1beta2.types.CreateInstanceRequest): + request (Union[google.cloud.memcache_v1beta2.types.CreateInstanceRequest, dict]): The request object. Request for [CreateInstance][google.cloud.memcache.v1beta2.CloudMemcache.CreateInstance]. parent (str): @@ -639,7 +639,7 @@ def create_instance( def update_instance( self, - request: cloud_memcache.UpdateInstanceRequest = None, + request: Union[cloud_memcache.UpdateInstanceRequest, dict] = None, *, update_mask: field_mask_pb2.FieldMask = None, resource: cloud_memcache.Instance = None, @@ -651,7 +651,7 @@ def update_instance( location. Args: - request (google.cloud.memcache_v1beta2.types.UpdateInstanceRequest): + request (Union[google.cloud.memcache_v1beta2.types.UpdateInstanceRequest, dict]): The request object. Request for [UpdateInstance][google.cloud.memcache.v1beta2.CloudMemcache.UpdateInstance]. update_mask (google.protobuf.field_mask_pb2.FieldMask): @@ -735,7 +735,7 @@ def update_instance( def update_parameters( self, - request: cloud_memcache.UpdateParametersRequest = None, + request: Union[cloud_memcache.UpdateParametersRequest, dict] = None, *, name: str = None, update_mask: field_mask_pb2.FieldMask = None, @@ -750,7 +750,7 @@ def update_parameters( of the Memcached instance. Args: - request (google.cloud.memcache_v1beta2.types.UpdateParametersRequest): + request (Union[google.cloud.memcache_v1beta2.types.UpdateParametersRequest, dict]): The request object. Request for [UpdateParameters][google.cloud.memcache.v1beta2.CloudMemcache.UpdateParameters]. name (str): @@ -839,7 +839,7 @@ def update_parameters( def delete_instance( self, - request: cloud_memcache.DeleteInstanceRequest = None, + request: Union[cloud_memcache.DeleteInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -849,7 +849,7 @@ def delete_instance( r"""Deletes a single Instance. Args: - request (google.cloud.memcache_v1beta2.types.DeleteInstanceRequest): + request (Union[google.cloud.memcache_v1beta2.types.DeleteInstanceRequest, dict]): The request object. Request for [DeleteInstance][google.cloud.memcache.v1beta2.CloudMemcache.DeleteInstance]. name (str): @@ -933,7 +933,7 @@ def delete_instance( def apply_parameters( self, - request: cloud_memcache.ApplyParametersRequest = None, + request: Union[cloud_memcache.ApplyParametersRequest, dict] = None, *, name: str = None, node_ids: Sequence[str] = None, @@ -947,7 +947,7 @@ def apply_parameters( Memcached Instance. Args: - request (google.cloud.memcache_v1beta2.types.ApplyParametersRequest): + request (Union[google.cloud.memcache_v1beta2.types.ApplyParametersRequest, dict]): The request object. Request for [ApplyParameters][google.cloud.memcache.v1beta2.CloudMemcache.ApplyParameters]. name (str): @@ -1040,7 +1040,7 @@ def apply_parameters( def apply_software_update( self, - request: cloud_memcache.ApplySoftwareUpdateRequest = None, + request: Union[cloud_memcache.ApplySoftwareUpdateRequest, dict] = None, *, instance: str = None, node_ids: Sequence[str] = None, @@ -1053,7 +1053,7 @@ def apply_software_update( Instance. Args: - request (google.cloud.memcache_v1beta2.types.ApplySoftwareUpdateRequest): + request (Union[google.cloud.memcache_v1beta2.types.ApplySoftwareUpdateRequest, dict]): The request object. Request for [ApplySoftwareUpdate][google.cloud.memcache.v1beta2.CloudMemcache.ApplySoftwareUpdate]. instance (str): diff --git a/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py index ad750d6..a403524 100644 --- a/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py +++ b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py @@ -117,7 +117,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/memcache_v1beta2/services/cloud_memcache/transports/grpc.py b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py index b92b70e..6984117 100644 --- a/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py +++ b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py @@ -100,16 +100,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/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py index 379650b..13b49de 100644 --- a/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py +++ b/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py @@ -147,16 +147,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_memcache_v1_keywords.py b/scripts/fixup_memcache_v1_keywords.py index 774b03f..4acdee8 100644 --- a/scripts/fixup_memcache_v1_keywords.py +++ b/scripts/fixup_memcache_v1_keywords.py @@ -39,13 +39,13 @@ def partition( class memcacheCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'apply_parameters': ('name', 'node_ids', 'apply_all', ), - 'create_instance': ('parent', 'instance_id', 'instance', ), - 'delete_instance': ('name', ), - 'get_instance': ('name', ), - 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'update_instance': ('update_mask', 'instance', ), - 'update_parameters': ('name', 'update_mask', 'parameters', ), + 'apply_parameters': ('name', 'node_ids', 'apply_all', ), + 'create_instance': ('parent', 'instance_id', 'instance', ), + 'delete_instance': ('name', ), + 'get_instance': ('name', ), + 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'update_instance': ('update_mask', 'instance', ), + 'update_parameters': ('name', 'update_mask', 'parameters', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -64,7 +64,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 ) diff --git a/scripts/fixup_memcache_v1beta2_keywords.py b/scripts/fixup_memcache_v1beta2_keywords.py index afe0f42..59d2e11 100644 --- a/scripts/fixup_memcache_v1beta2_keywords.py +++ b/scripts/fixup_memcache_v1beta2_keywords.py @@ -39,14 +39,14 @@ def partition( class memcacheCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'apply_parameters': ('name', 'node_ids', 'apply_all', ), - 'apply_software_update': ('instance', 'node_ids', 'apply_all', ), - 'create_instance': ('parent', 'instance_id', 'resource', ), - 'delete_instance': ('name', ), - 'get_instance': ('name', ), - 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'update_instance': ('update_mask', 'resource', ), - 'update_parameters': ('name', 'update_mask', 'parameters', ), + 'apply_parameters': ('name', 'node_ids', 'apply_all', ), + 'apply_software_update': ('instance', 'node_ids', 'apply_all', ), + 'create_instance': ('parent', 'instance_id', 'resource', ), + 'delete_instance': ('name', ), + 'get_instance': ('name', ), + 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'update_instance': ('update_mask', 'resource', ), + 'update_parameters': ('name', 'update_mask', 'parameters', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -65,7 +65,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 )