From d4db0513a5beba7936d33f011bdf1a8ee831d425 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 15:10:32 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.51.2 (#195) - [ ] 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 --- .../iot_v1/services/device_manager/client.py | 78 +++++++++---------- .../device_manager/transports/base.py | 2 +- .../device_manager/transports/grpc.py | 6 +- .../device_manager/transports/grpc_asyncio.py | 6 +- scripts/fixup_iot_v1_keywords.py | 40 +++++----- 5 files changed, 66 insertions(+), 66 deletions(-) diff --git a/google/cloud/iot_v1/services/device_manager/client.py b/google/cloud/iot_v1/services/device_manager/client.py index bf348acc..7b32007b 100644 --- a/google/cloud/iot_v1/services/device_manager/client.py +++ b/google/cloud/iot_v1/services/device_manager/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 create_device_registry( self, - request: device_manager.CreateDeviceRegistryRequest = None, + request: Union[device_manager.CreateDeviceRegistryRequest, dict] = None, *, parent: str = None, device_registry: resources.DeviceRegistry = None, @@ -385,7 +385,7 @@ def create_device_registry( r"""Creates a device registry that contains devices. Args: - request (google.cloud.iot_v1.types.CreateDeviceRegistryRequest): + request (Union[google.cloud.iot_v1.types.CreateDeviceRegistryRequest, dict]): The request object. Request for `CreateDeviceRegistry`. parent (str): Required. The project and cloud region where this device @@ -455,7 +455,7 @@ def create_device_registry( def get_device_registry( self, - request: device_manager.GetDeviceRegistryRequest = None, + request: Union[device_manager.GetDeviceRegistryRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -465,7 +465,7 @@ def get_device_registry( r"""Gets a device registry configuration. Args: - request (google.cloud.iot_v1.types.GetDeviceRegistryRequest): + request (Union[google.cloud.iot_v1.types.GetDeviceRegistryRequest, dict]): The request object. Request for `GetDeviceRegistry`. name (str): Required. The name of the device registry. For example, @@ -523,7 +523,7 @@ def get_device_registry( def update_device_registry( self, - request: device_manager.UpdateDeviceRegistryRequest = None, + request: Union[device_manager.UpdateDeviceRegistryRequest, dict] = None, *, device_registry: resources.DeviceRegistry = None, update_mask: field_mask_pb2.FieldMask = None, @@ -534,7 +534,7 @@ def update_device_registry( r"""Updates a device registry configuration. Args: - request (google.cloud.iot_v1.types.UpdateDeviceRegistryRequest): + request (Union[google.cloud.iot_v1.types.UpdateDeviceRegistryRequest, dict]): The request object. Request for `UpdateDeviceRegistry`. device_registry (google.cloud.iot_v1.types.DeviceRegistry): Required. The new values for the device registry. The @@ -609,7 +609,7 @@ def update_device_registry( def delete_device_registry( self, - request: device_manager.DeleteDeviceRegistryRequest = None, + request: Union[device_manager.DeleteDeviceRegistryRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -619,7 +619,7 @@ def delete_device_registry( r"""Deletes a device registry configuration. Args: - request (google.cloud.iot_v1.types.DeleteDeviceRegistryRequest): + request (Union[google.cloud.iot_v1.types.DeleteDeviceRegistryRequest, dict]): The request object. Request for `DeleteDeviceRegistry`. name (str): Required. The name of the device registry. For example, @@ -672,7 +672,7 @@ def delete_device_registry( def list_device_registries( self, - request: device_manager.ListDeviceRegistriesRequest = None, + request: Union[device_manager.ListDeviceRegistriesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -682,7 +682,7 @@ def list_device_registries( r"""Lists device registries. Args: - request (google.cloud.iot_v1.types.ListDeviceRegistriesRequest): + request (Union[google.cloud.iot_v1.types.ListDeviceRegistriesRequest, dict]): The request object. Request for `ListDeviceRegistries`. parent (str): Required. The project and cloud region path. For @@ -751,7 +751,7 @@ def list_device_registries( def create_device( self, - request: device_manager.CreateDeviceRequest = None, + request: Union[device_manager.CreateDeviceRequest, dict] = None, *, parent: str = None, device: resources.Device = None, @@ -762,7 +762,7 @@ def create_device( r"""Creates a device in a device registry. Args: - request (google.cloud.iot_v1.types.CreateDeviceRequest): + request (Union[google.cloud.iot_v1.types.CreateDeviceRequest, dict]): The request object. Request for `CreateDevice`. parent (str): Required. The name of the device registry where this @@ -832,7 +832,7 @@ def create_device( def get_device( self, - request: device_manager.GetDeviceRequest = None, + request: Union[device_manager.GetDeviceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -842,7 +842,7 @@ def get_device( r"""Gets details about a device. Args: - request (google.cloud.iot_v1.types.GetDeviceRequest): + request (Union[google.cloud.iot_v1.types.GetDeviceRequest, dict]): The request object. Request for `GetDevice`. name (str): Required. The name of the device. For example, @@ -902,7 +902,7 @@ def get_device( def update_device( self, - request: device_manager.UpdateDeviceRequest = None, + request: Union[device_manager.UpdateDeviceRequest, dict] = None, *, device: resources.Device = None, update_mask: field_mask_pb2.FieldMask = None, @@ -913,7 +913,7 @@ def update_device( r"""Updates a device. Args: - request (google.cloud.iot_v1.types.UpdateDeviceRequest): + request (Union[google.cloud.iot_v1.types.UpdateDeviceRequest, dict]): The request object. Request for `UpdateDevice`. device (google.cloud.iot_v1.types.Device): Required. The new values for the device. The ``id`` and @@ -988,7 +988,7 @@ def update_device( def delete_device( self, - request: device_manager.DeleteDeviceRequest = None, + request: Union[device_manager.DeleteDeviceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -998,7 +998,7 @@ def delete_device( r"""Deletes a device. Args: - request (google.cloud.iot_v1.types.DeleteDeviceRequest): + request (Union[google.cloud.iot_v1.types.DeleteDeviceRequest, dict]): The request object. Request for `DeleteDevice`. name (str): Required. The name of the device. For example, @@ -1053,7 +1053,7 @@ def delete_device( def list_devices( self, - request: device_manager.ListDevicesRequest = None, + request: Union[device_manager.ListDevicesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1063,7 +1063,7 @@ def list_devices( r"""List devices in a device registry. Args: - request (google.cloud.iot_v1.types.ListDevicesRequest): + request (Union[google.cloud.iot_v1.types.ListDevicesRequest, dict]): The request object. Request for `ListDevices`. parent (str): Required. The device registry path. Required. For @@ -1132,7 +1132,7 @@ def list_devices( def modify_cloud_to_device_config( self, - request: device_manager.ModifyCloudToDeviceConfigRequest = None, + request: Union[device_manager.ModifyCloudToDeviceConfigRequest, dict] = None, *, name: str = None, binary_data: bytes = None, @@ -1145,7 +1145,7 @@ def modify_cloud_to_device_config( the modified configuration version and its metadata. Args: - request (google.cloud.iot_v1.types.ModifyCloudToDeviceConfigRequest): + request (Union[google.cloud.iot_v1.types.ModifyCloudToDeviceConfigRequest, dict]): The request object. Request for `ModifyCloudToDeviceConfig`. name (str): @@ -1219,7 +1219,7 @@ def modify_cloud_to_device_config( def list_device_config_versions( self, - request: device_manager.ListDeviceConfigVersionsRequest = None, + request: Union[device_manager.ListDeviceConfigVersionsRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1230,7 +1230,7 @@ def list_device_config_versions( configuration in descending order (i.e.: newest first). Args: - request (google.cloud.iot_v1.types.ListDeviceConfigVersionsRequest): + request (Union[google.cloud.iot_v1.types.ListDeviceConfigVersionsRequest, dict]): The request object. Request for `ListDeviceConfigVersions`. name (str): @@ -1293,7 +1293,7 @@ def list_device_config_versions( def list_device_states( self, - request: device_manager.ListDeviceStatesRequest = None, + request: Union[device_manager.ListDeviceStatesRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1304,7 +1304,7 @@ def list_device_states( descending order (i.e.: newest first). Args: - request (google.cloud.iot_v1.types.ListDeviceStatesRequest): + request (Union[google.cloud.iot_v1.types.ListDeviceStatesRequest, dict]): The request object. Request for `ListDeviceStates`. name (str): Required. The name of the device. For example, @@ -1364,7 +1364,7 @@ def list_device_states( def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1375,7 +1375,7 @@ def set_iam_policy( resource. Replaces any existing policy. Args: - request (google.iam.v1.iam_policy_pb2.SetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (str): @@ -1490,7 +1490,7 @@ def set_iam_policy( def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1502,7 +1502,7 @@ def get_iam_policy( not have a policy set. Args: - request (google.iam.v1.iam_policy_pb2.GetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (str): @@ -1617,7 +1617,7 @@ def get_iam_policy( def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, resource: str = None, permissions: Sequence[str] = None, @@ -1630,7 +1630,7 @@ def test_iam_permissions( permissions, not a NOT_FOUND error. Args: - request (google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. resource (str): @@ -1701,7 +1701,7 @@ def test_iam_permissions( def send_command_to_device( self, - request: device_manager.SendCommandToDeviceRequest = None, + request: Union[device_manager.SendCommandToDeviceRequest, dict] = None, *, name: str = None, binary_data: bytes = None, @@ -1729,7 +1729,7 @@ def send_command_to_device( from the device. Args: - request (google.cloud.iot_v1.types.SendCommandToDeviceRequest): + request (Union[google.cloud.iot_v1.types.SendCommandToDeviceRequest, dict]): The request object. Request for `SendCommandToDevice`. name (str): Required. The name of the device. For example, @@ -1815,7 +1815,7 @@ def send_command_to_device( def bind_device_to_gateway( self, - request: device_manager.BindDeviceToGatewayRequest = None, + request: Union[device_manager.BindDeviceToGatewayRequest, dict] = None, *, parent: str = None, gateway_id: str = None, @@ -1827,7 +1827,7 @@ def bind_device_to_gateway( r"""Associates the device with the gateway. Args: - request (google.cloud.iot_v1.types.BindDeviceToGatewayRequest): + request (Union[google.cloud.iot_v1.types.BindDeviceToGatewayRequest, dict]): The request object. Request for `BindDeviceToGateway`. parent (str): Required. The name of the registry. For example, @@ -1904,7 +1904,7 @@ def bind_device_to_gateway( def unbind_device_from_gateway( self, - request: device_manager.UnbindDeviceFromGatewayRequest = None, + request: Union[device_manager.UnbindDeviceFromGatewayRequest, dict] = None, *, parent: str = None, gateway_id: str = None, @@ -1917,7 +1917,7 @@ def unbind_device_from_gateway( gateway. Args: - request (google.cloud.iot_v1.types.UnbindDeviceFromGatewayRequest): + request (Union[google.cloud.iot_v1.types.UnbindDeviceFromGatewayRequest, dict]): The request object. Request for `UnbindDeviceFromGateway`. parent (str): diff --git a/google/cloud/iot_v1/services/device_manager/transports/base.py b/google/cloud/iot_v1/services/device_manager/transports/base.py index be90b88a..ae596089 100644 --- a/google/cloud/iot_v1/services/device_manager/transports/base.py +++ b/google/cloud/iot_v1/services/device_manager/transports/base.py @@ -122,7 +122,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/iot_v1/services/device_manager/transports/grpc.py b/google/cloud/iot_v1/services/device_manager/transports/grpc.py index fff1da95..04b119b6 100644 --- a/google/cloud/iot_v1/services/device_manager/transports/grpc.py +++ b/google/cloud/iot_v1/services/device_manager/transports/grpc.py @@ -85,16 +85,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/iot_v1/services/device_manager/transports/grpc_asyncio.py b/google/cloud/iot_v1/services/device_manager/transports/grpc_asyncio.py index 62709c50..d621cb4d 100644 --- a/google/cloud/iot_v1/services/device_manager/transports/grpc_asyncio.py +++ b/google/cloud/iot_v1/services/device_manager/transports/grpc_asyncio.py @@ -132,16 +132,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_iot_v1_keywords.py b/scripts/fixup_iot_v1_keywords.py index 23111df8..6e5159ad 100644 --- a/scripts/fixup_iot_v1_keywords.py +++ b/scripts/fixup_iot_v1_keywords.py @@ -39,25 +39,25 @@ def partition( class iotCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'bind_device_to_gateway': ('parent', 'gateway_id', 'device_id', ), - 'create_device': ('parent', 'device', ), - 'create_device_registry': ('parent', 'device_registry', ), - 'delete_device': ('name', ), - 'delete_device_registry': ('name', ), - 'get_device': ('name', 'field_mask', ), - 'get_device_registry': ('name', ), - 'get_iam_policy': ('resource', 'options', ), - 'list_device_config_versions': ('name', 'num_versions', ), - 'list_device_registries': ('parent', 'page_size', 'page_token', ), - 'list_devices': ('parent', 'device_num_ids', 'device_ids', 'field_mask', 'gateway_list_options', 'page_size', 'page_token', ), - 'list_device_states': ('name', 'num_states', ), - 'modify_cloud_to_device_config': ('name', 'binary_data', 'version_to_update', ), - 'send_command_to_device': ('name', 'binary_data', 'subfolder', ), - 'set_iam_policy': ('resource', 'policy', ), - 'test_iam_permissions': ('resource', 'permissions', ), - 'unbind_device_from_gateway': ('parent', 'gateway_id', 'device_id', ), - 'update_device': ('device', 'update_mask', ), - 'update_device_registry': ('device_registry', 'update_mask', ), + 'bind_device_to_gateway': ('parent', 'gateway_id', 'device_id', ), + 'create_device': ('parent', 'device', ), + 'create_device_registry': ('parent', 'device_registry', ), + 'delete_device': ('name', ), + 'delete_device_registry': ('name', ), + 'get_device': ('name', 'field_mask', ), + 'get_device_registry': ('name', ), + 'get_iam_policy': ('resource', 'options', ), + 'list_device_config_versions': ('name', 'num_versions', ), + 'list_device_registries': ('parent', 'page_size', 'page_token', ), + 'list_devices': ('parent', 'device_num_ids', 'device_ids', 'field_mask', 'gateway_list_options', 'page_size', 'page_token', ), + 'list_device_states': ('name', 'num_states', ), + 'modify_cloud_to_device_config': ('name', 'binary_data', 'version_to_update', ), + 'send_command_to_device': ('name', 'binary_data', 'subfolder', ), + 'set_iam_policy': ('resource', 'policy', ), + 'test_iam_permissions': ('resource', 'permissions', ), + 'unbind_device_from_gateway': ('parent', 'gateway_id', 'device_id', ), + 'update_device': ('device', 'update_mask', ), + 'update_device_registry': ('device_registry', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -76,7 +76,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 )