diff --git a/google/cloud/metastore_v1/services/dataproc_metastore/client.py b/google/cloud/metastore_v1/services/dataproc_metastore/client.py index 2dca481..855bcb0 100644 --- a/google/cloud/metastore_v1/services/dataproc_metastore/client.py +++ b/google/cloud/metastore_v1/services/dataproc_metastore/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 @@ -433,7 +433,7 @@ def __init__( def list_services( self, - request: metastore.ListServicesRequest = None, + request: Union[metastore.ListServicesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -443,7 +443,7 @@ def list_services( r"""Lists services in a project and location. Args: - request (google.cloud.metastore_v1.types.ListServicesRequest): + request (Union[google.cloud.metastore_v1.types.ListServicesRequest, dict]): The request object. Request message for [DataprocMetastore.ListServices][google.cloud.metastore.v1.DataprocMetastore.ListServices]. parent (str): @@ -515,7 +515,7 @@ def list_services( def get_service( self, - request: metastore.GetServiceRequest = None, + request: Union[metastore.GetServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -525,7 +525,7 @@ def get_service( r"""Gets the details of a single service. Args: - request (google.cloud.metastore_v1.types.GetServiceRequest): + request (Union[google.cloud.metastore_v1.types.GetServiceRequest, dict]): The request object. Request message for [DataprocMetastore.GetService][google.cloud.metastore.v1.DataprocMetastore.GetService]. name (str): @@ -588,7 +588,7 @@ def get_service( def create_service( self, - request: metastore.CreateServiceRequest = None, + request: Union[metastore.CreateServiceRequest, dict] = None, *, parent: str = None, service: metastore.Service = None, @@ -601,7 +601,7 @@ def create_service( location. Args: - request (google.cloud.metastore_v1.types.CreateServiceRequest): + request (Union[google.cloud.metastore_v1.types.CreateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.CreateService][google.cloud.metastore.v1.DataprocMetastore.CreateService]. parent (str): @@ -703,7 +703,7 @@ def create_service( def update_service( self, - request: metastore.UpdateServiceRequest = None, + request: Union[metastore.UpdateServiceRequest, dict] = None, *, service: metastore.Service = None, update_mask: field_mask_pb2.FieldMask = None, @@ -714,7 +714,7 @@ def update_service( r"""Updates the parameters of a single service. Args: - request (google.cloud.metastore_v1.types.UpdateServiceRequest): + request (Union[google.cloud.metastore_v1.types.UpdateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateService][google.cloud.metastore.v1.DataprocMetastore.UpdateService]. service (google.cloud.metastore_v1.types.Service): @@ -804,7 +804,7 @@ def update_service( def delete_service( self, - request: metastore.DeleteServiceRequest = None, + request: Union[metastore.DeleteServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -814,7 +814,7 @@ def delete_service( r"""Deletes a single service. Args: - request (google.cloud.metastore_v1.types.DeleteServiceRequest): + request (Union[google.cloud.metastore_v1.types.DeleteServiceRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteService][google.cloud.metastore.v1.DataprocMetastore.DeleteService]. name (str): @@ -898,7 +898,7 @@ def delete_service( def list_metadata_imports( self, - request: metastore.ListMetadataImportsRequest = None, + request: Union[metastore.ListMetadataImportsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -908,7 +908,7 @@ def list_metadata_imports( r"""Lists imports in a service. Args: - request (google.cloud.metastore_v1.types.ListMetadataImportsRequest): + request (Union[google.cloud.metastore_v1.types.ListMetadataImportsRequest, dict]): The request object. Request message for [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1.DataprocMetastore.ListMetadataImports]. parent (str): @@ -980,7 +980,7 @@ def list_metadata_imports( def get_metadata_import( self, - request: metastore.GetMetadataImportRequest = None, + request: Union[metastore.GetMetadataImportRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -990,7 +990,7 @@ def get_metadata_import( r"""Gets details of a single import. Args: - request (google.cloud.metastore_v1.types.GetMetadataImportRequest): + request (Union[google.cloud.metastore_v1.types.GetMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.GetMetadataImport][google.cloud.metastore.v1.DataprocMetastore.GetMetadataImport]. name (str): @@ -1053,7 +1053,7 @@ def get_metadata_import( def create_metadata_import( self, - request: metastore.CreateMetadataImportRequest = None, + request: Union[metastore.CreateMetadataImportRequest, dict] = None, *, parent: str = None, metadata_import: metastore.MetadataImport = None, @@ -1066,7 +1066,7 @@ def create_metadata_import( location. Args: - request (google.cloud.metastore_v1.types.CreateMetadataImportRequest): + request (Union[google.cloud.metastore_v1.types.CreateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.CreateMetadataImport][google.cloud.metastore.v1.DataprocMetastore.CreateMetadataImport]. parent (str): @@ -1167,7 +1167,7 @@ def create_metadata_import( def update_metadata_import( self, - request: metastore.UpdateMetadataImportRequest = None, + request: Union[metastore.UpdateMetadataImportRequest, dict] = None, *, metadata_import: metastore.MetadataImport = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1180,7 +1180,7 @@ def update_metadata_import( supported to be updated. Args: - request (google.cloud.metastore_v1.types.UpdateMetadataImportRequest): + request (Union[google.cloud.metastore_v1.types.UpdateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateMetadataImport][google.cloud.metastore.v1.DataprocMetastore.UpdateMetadataImport]. metadata_import (google.cloud.metastore_v1.types.MetadataImport): @@ -1270,7 +1270,7 @@ def update_metadata_import( def export_metadata( self, - request: metastore.ExportMetadataRequest = None, + request: Union[metastore.ExportMetadataRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1279,7 +1279,7 @@ def export_metadata( r"""Exports metadata from a service. Args: - request (google.cloud.metastore_v1.types.ExportMetadataRequest): + request (Union[google.cloud.metastore_v1.types.ExportMetadataRequest, dict]): The request object. Request message for [DataprocMetastore.ExportMetadata][google.cloud.metastore.v1.DataprocMetastore.ExportMetadata]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1331,7 +1331,7 @@ def export_metadata( def restore_service( self, - request: metastore.RestoreServiceRequest = None, + request: Union[metastore.RestoreServiceRequest, dict] = None, *, service: str = None, backup: str = None, @@ -1342,7 +1342,7 @@ def restore_service( r"""Restores a service from a backup. Args: - request (google.cloud.metastore_v1.types.RestoreServiceRequest): + request (Union[google.cloud.metastore_v1.types.RestoreServiceRequest, dict]): The request object. Request message for [DataprocMetastore.Restore][]. service (str): @@ -1427,7 +1427,7 @@ def restore_service( def list_backups( self, - request: metastore.ListBackupsRequest = None, + request: Union[metastore.ListBackupsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1437,7 +1437,7 @@ def list_backups( r"""Lists backups in a service. Args: - request (google.cloud.metastore_v1.types.ListBackupsRequest): + request (Union[google.cloud.metastore_v1.types.ListBackupsRequest, dict]): The request object. Request message for [DataprocMetastore.ListBackups][google.cloud.metastore.v1.DataprocMetastore.ListBackups]. parent (str): @@ -1509,7 +1509,7 @@ def list_backups( def get_backup( self, - request: metastore.GetBackupRequest = None, + request: Union[metastore.GetBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1519,7 +1519,7 @@ def get_backup( r"""Gets details of a single backup. Args: - request (google.cloud.metastore_v1.types.GetBackupRequest): + request (Union[google.cloud.metastore_v1.types.GetBackupRequest, dict]): The request object. Request message for [DataprocMetastore.GetBackup][google.cloud.metastore.v1.DataprocMetastore.GetBackup]. name (str): @@ -1580,7 +1580,7 @@ def get_backup( def create_backup( self, - request: metastore.CreateBackupRequest = None, + request: Union[metastore.CreateBackupRequest, dict] = None, *, parent: str = None, backup: metastore.Backup = None, @@ -1592,7 +1592,7 @@ def create_backup( r"""Creates a new backup in a given project and location. Args: - request (google.cloud.metastore_v1.types.CreateBackupRequest): + request (Union[google.cloud.metastore_v1.types.CreateBackupRequest, dict]): The request object. Request message for [DataprocMetastore.CreateBackup][google.cloud.metastore.v1.DataprocMetastore.CreateBackup]. parent (str): @@ -1691,7 +1691,7 @@ def create_backup( def delete_backup( self, - request: metastore.DeleteBackupRequest = None, + request: Union[metastore.DeleteBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1701,7 +1701,7 @@ def delete_backup( r"""Deletes a single backup. Args: - request (google.cloud.metastore_v1.types.DeleteBackupRequest): + request (Union[google.cloud.metastore_v1.types.DeleteBackupRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteBackup][google.cloud.metastore.v1.DataprocMetastore.DeleteBackup]. name (str): diff --git a/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py b/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py index ddd34dd..03a277a 100644 --- a/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py +++ b/google/cloud/metastore_v1/services/dataproc_metastore/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/metastore_v1/services/dataproc_metastore/transports/grpc.py b/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py index a21685c..770b5be 100644 --- a/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py +++ b/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py @@ -103,16 +103,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/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py b/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py index b5a31f2..ced06f9 100644 --- a/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py @@ -150,16 +150,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/metastore_v1alpha/services/dataproc_metastore/client.py b/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py index 25ef4c8..2f912a4 100644 --- a/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py +++ b/google/cloud/metastore_v1alpha/services/dataproc_metastore/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 @@ -434,7 +434,7 @@ def __init__( def list_services( self, - request: metastore.ListServicesRequest = None, + request: Union[metastore.ListServicesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -444,7 +444,7 @@ def list_services( r"""Lists services in a project and location. Args: - request (google.cloud.metastore_v1alpha.types.ListServicesRequest): + request (Union[google.cloud.metastore_v1alpha.types.ListServicesRequest, dict]): The request object. Request message for [DataprocMetastore.ListServices][google.cloud.metastore.v1alpha.DataprocMetastore.ListServices]. parent (str): @@ -516,7 +516,7 @@ def list_services( def get_service( self, - request: metastore.GetServiceRequest = None, + request: Union[metastore.GetServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -526,7 +526,7 @@ def get_service( r"""Gets the details of a single service. Args: - request (google.cloud.metastore_v1alpha.types.GetServiceRequest): + request (Union[google.cloud.metastore_v1alpha.types.GetServiceRequest, dict]): The request object. Request message for [DataprocMetastore.GetService][google.cloud.metastore.v1alpha.DataprocMetastore.GetService]. name (str): @@ -589,7 +589,7 @@ def get_service( def create_service( self, - request: metastore.CreateServiceRequest = None, + request: Union[metastore.CreateServiceRequest, dict] = None, *, parent: str = None, service: metastore.Service = None, @@ -602,7 +602,7 @@ def create_service( location. Args: - request (google.cloud.metastore_v1alpha.types.CreateServiceRequest): + request (Union[google.cloud.metastore_v1alpha.types.CreateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.CreateService][google.cloud.metastore.v1alpha.DataprocMetastore.CreateService]. parent (str): @@ -704,7 +704,7 @@ def create_service( def update_service( self, - request: metastore.UpdateServiceRequest = None, + request: Union[metastore.UpdateServiceRequest, dict] = None, *, service: metastore.Service = None, update_mask: field_mask_pb2.FieldMask = None, @@ -715,7 +715,7 @@ def update_service( r"""Updates the parameters of a single service. Args: - request (google.cloud.metastore_v1alpha.types.UpdateServiceRequest): + request (Union[google.cloud.metastore_v1alpha.types.UpdateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateService][google.cloud.metastore.v1alpha.DataprocMetastore.UpdateService]. service (google.cloud.metastore_v1alpha.types.Service): @@ -805,7 +805,7 @@ def update_service( def delete_service( self, - request: metastore.DeleteServiceRequest = None, + request: Union[metastore.DeleteServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -815,7 +815,7 @@ def delete_service( r"""Deletes a single service. Args: - request (google.cloud.metastore_v1alpha.types.DeleteServiceRequest): + request (Union[google.cloud.metastore_v1alpha.types.DeleteServiceRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteService][google.cloud.metastore.v1alpha.DataprocMetastore.DeleteService]. name (str): @@ -899,7 +899,7 @@ def delete_service( def list_metadata_imports( self, - request: metastore.ListMetadataImportsRequest = None, + request: Union[metastore.ListMetadataImportsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -909,7 +909,7 @@ def list_metadata_imports( r"""Lists imports in a service. Args: - request (google.cloud.metastore_v1alpha.types.ListMetadataImportsRequest): + request (Union[google.cloud.metastore_v1alpha.types.ListMetadataImportsRequest, dict]): The request object. Request message for [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1alpha.DataprocMetastore.ListMetadataImports]. parent (str): @@ -981,7 +981,7 @@ def list_metadata_imports( def get_metadata_import( self, - request: metastore.GetMetadataImportRequest = None, + request: Union[metastore.GetMetadataImportRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -991,7 +991,7 @@ def get_metadata_import( r"""Gets details of a single import. Args: - request (google.cloud.metastore_v1alpha.types.GetMetadataImportRequest): + request (Union[google.cloud.metastore_v1alpha.types.GetMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.GetMetadataImport][google.cloud.metastore.v1alpha.DataprocMetastore.GetMetadataImport]. name (str): @@ -1054,7 +1054,7 @@ def get_metadata_import( def create_metadata_import( self, - request: metastore.CreateMetadataImportRequest = None, + request: Union[metastore.CreateMetadataImportRequest, dict] = None, *, parent: str = None, metadata_import: metastore.MetadataImport = None, @@ -1067,7 +1067,7 @@ def create_metadata_import( location. Args: - request (google.cloud.metastore_v1alpha.types.CreateMetadataImportRequest): + request (Union[google.cloud.metastore_v1alpha.types.CreateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.CreateMetadataImport][google.cloud.metastore.v1alpha.DataprocMetastore.CreateMetadataImport]. parent (str): @@ -1168,7 +1168,7 @@ def create_metadata_import( def update_metadata_import( self, - request: metastore.UpdateMetadataImportRequest = None, + request: Union[metastore.UpdateMetadataImportRequest, dict] = None, *, metadata_import: metastore.MetadataImport = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1181,7 +1181,7 @@ def update_metadata_import( supported to be updated. Args: - request (google.cloud.metastore_v1alpha.types.UpdateMetadataImportRequest): + request (Union[google.cloud.metastore_v1alpha.types.UpdateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateMetadataImport][google.cloud.metastore.v1alpha.DataprocMetastore.UpdateMetadataImport]. metadata_import (google.cloud.metastore_v1alpha.types.MetadataImport): @@ -1271,7 +1271,7 @@ def update_metadata_import( def export_metadata( self, - request: metastore.ExportMetadataRequest = None, + request: Union[metastore.ExportMetadataRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1280,7 +1280,7 @@ def export_metadata( r"""Exports metadata from a service. Args: - request (google.cloud.metastore_v1alpha.types.ExportMetadataRequest): + request (Union[google.cloud.metastore_v1alpha.types.ExportMetadataRequest, dict]): The request object. Request message for [DataprocMetastore.ExportMetadata][google.cloud.metastore.v1alpha.DataprocMetastore.ExportMetadata]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1332,7 +1332,7 @@ def export_metadata( def restore_service( self, - request: metastore.RestoreServiceRequest = None, + request: Union[metastore.RestoreServiceRequest, dict] = None, *, service: str = None, backup: str = None, @@ -1343,7 +1343,7 @@ def restore_service( r"""Restores a service from a backup. Args: - request (google.cloud.metastore_v1alpha.types.RestoreServiceRequest): + request (Union[google.cloud.metastore_v1alpha.types.RestoreServiceRequest, dict]): The request object. Request message for [DataprocMetastore.Restore][]. service (str): @@ -1428,7 +1428,7 @@ def restore_service( def list_backups( self, - request: metastore.ListBackupsRequest = None, + request: Union[metastore.ListBackupsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1438,7 +1438,7 @@ def list_backups( r"""Lists backups in a service. Args: - request (google.cloud.metastore_v1alpha.types.ListBackupsRequest): + request (Union[google.cloud.metastore_v1alpha.types.ListBackupsRequest, dict]): The request object. Request message for [DataprocMetastore.ListBackups][google.cloud.metastore.v1alpha.DataprocMetastore.ListBackups]. parent (str): @@ -1510,7 +1510,7 @@ def list_backups( def get_backup( self, - request: metastore.GetBackupRequest = None, + request: Union[metastore.GetBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1520,7 +1520,7 @@ def get_backup( r"""Gets details of a single backup. Args: - request (google.cloud.metastore_v1alpha.types.GetBackupRequest): + request (Union[google.cloud.metastore_v1alpha.types.GetBackupRequest, dict]): The request object. Request message for [DataprocMetastore.GetBackup][google.cloud.metastore.v1alpha.DataprocMetastore.GetBackup]. name (str): @@ -1581,7 +1581,7 @@ def get_backup( def create_backup( self, - request: metastore.CreateBackupRequest = None, + request: Union[metastore.CreateBackupRequest, dict] = None, *, parent: str = None, backup: metastore.Backup = None, @@ -1593,7 +1593,7 @@ def create_backup( r"""Creates a new Backup in a given project and location. Args: - request (google.cloud.metastore_v1alpha.types.CreateBackupRequest): + request (Union[google.cloud.metastore_v1alpha.types.CreateBackupRequest, dict]): The request object. Request message for [DataprocMetastore.CreateBackup][google.cloud.metastore.v1alpha.DataprocMetastore.CreateBackup]. parent (str): @@ -1692,7 +1692,7 @@ def create_backup( def delete_backup( self, - request: metastore.DeleteBackupRequest = None, + request: Union[metastore.DeleteBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1702,7 +1702,7 @@ def delete_backup( r"""Deletes a single backup. Args: - request (google.cloud.metastore_v1alpha.types.DeleteBackupRequest): + request (Union[google.cloud.metastore_v1alpha.types.DeleteBackupRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteBackup][google.cloud.metastore.v1alpha.DataprocMetastore.DeleteBackup]. name (str): diff --git a/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py b/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py index ecf6a96..7a1fc1a 100644 --- a/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py +++ b/google/cloud/metastore_v1alpha/services/dataproc_metastore/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/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py b/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py index cd8a072..cf3ad80 100644 --- a/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py +++ b/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py @@ -104,16 +104,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/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py b/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py index a418e1d..8193b1c 100644 --- a/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py @@ -151,16 +151,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/metastore_v1beta/services/dataproc_metastore/client.py b/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py index d47e9ad..71da2b9 100644 --- a/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py +++ b/google/cloud/metastore_v1beta/services/dataproc_metastore/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 @@ -434,7 +434,7 @@ def __init__( def list_services( self, - request: metastore.ListServicesRequest = None, + request: Union[metastore.ListServicesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -444,7 +444,7 @@ def list_services( r"""Lists services in a project and location. Args: - request (google.cloud.metastore_v1beta.types.ListServicesRequest): + request (Union[google.cloud.metastore_v1beta.types.ListServicesRequest, dict]): The request object. Request message for [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]. parent (str): @@ -516,7 +516,7 @@ def list_services( def get_service( self, - request: metastore.GetServiceRequest = None, + request: Union[metastore.GetServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -526,7 +526,7 @@ def get_service( r"""Gets the details of a single service. Args: - request (google.cloud.metastore_v1beta.types.GetServiceRequest): + request (Union[google.cloud.metastore_v1beta.types.GetServiceRequest, dict]): The request object. Request message for [DataprocMetastore.GetService][google.cloud.metastore.v1beta.DataprocMetastore.GetService]. name (str): @@ -589,7 +589,7 @@ def get_service( def create_service( self, - request: metastore.CreateServiceRequest = None, + request: Union[metastore.CreateServiceRequest, dict] = None, *, parent: str = None, service: metastore.Service = None, @@ -602,7 +602,7 @@ def create_service( location. Args: - request (google.cloud.metastore_v1beta.types.CreateServiceRequest): + request (Union[google.cloud.metastore_v1beta.types.CreateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.CreateService][google.cloud.metastore.v1beta.DataprocMetastore.CreateService]. parent (str): @@ -704,7 +704,7 @@ def create_service( def update_service( self, - request: metastore.UpdateServiceRequest = None, + request: Union[metastore.UpdateServiceRequest, dict] = None, *, service: metastore.Service = None, update_mask: field_mask_pb2.FieldMask = None, @@ -715,7 +715,7 @@ def update_service( r"""Updates the parameters of a single service. Args: - request (google.cloud.metastore_v1beta.types.UpdateServiceRequest): + request (Union[google.cloud.metastore_v1beta.types.UpdateServiceRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateService][google.cloud.metastore.v1beta.DataprocMetastore.UpdateService]. service (google.cloud.metastore_v1beta.types.Service): @@ -805,7 +805,7 @@ def update_service( def delete_service( self, - request: metastore.DeleteServiceRequest = None, + request: Union[metastore.DeleteServiceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -815,7 +815,7 @@ def delete_service( r"""Deletes a single service. Args: - request (google.cloud.metastore_v1beta.types.DeleteServiceRequest): + request (Union[google.cloud.metastore_v1beta.types.DeleteServiceRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteService][google.cloud.metastore.v1beta.DataprocMetastore.DeleteService]. name (str): @@ -899,7 +899,7 @@ def delete_service( def list_metadata_imports( self, - request: metastore.ListMetadataImportsRequest = None, + request: Union[metastore.ListMetadataImportsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -909,7 +909,7 @@ def list_metadata_imports( r"""Lists imports in a service. Args: - request (google.cloud.metastore_v1beta.types.ListMetadataImportsRequest): + request (Union[google.cloud.metastore_v1beta.types.ListMetadataImportsRequest, dict]): The request object. Request message for [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1beta.DataprocMetastore.ListMetadataImports]. parent (str): @@ -981,7 +981,7 @@ def list_metadata_imports( def get_metadata_import( self, - request: metastore.GetMetadataImportRequest = None, + request: Union[metastore.GetMetadataImportRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -991,7 +991,7 @@ def get_metadata_import( r"""Gets details of a single import. Args: - request (google.cloud.metastore_v1beta.types.GetMetadataImportRequest): + request (Union[google.cloud.metastore_v1beta.types.GetMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.GetMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.GetMetadataImport]. name (str): @@ -1054,7 +1054,7 @@ def get_metadata_import( def create_metadata_import( self, - request: metastore.CreateMetadataImportRequest = None, + request: Union[metastore.CreateMetadataImportRequest, dict] = None, *, parent: str = None, metadata_import: metastore.MetadataImport = None, @@ -1067,7 +1067,7 @@ def create_metadata_import( location. Args: - request (google.cloud.metastore_v1beta.types.CreateMetadataImportRequest): + request (Union[google.cloud.metastore_v1beta.types.CreateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.CreateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.CreateMetadataImport]. parent (str): @@ -1168,7 +1168,7 @@ def create_metadata_import( def update_metadata_import( self, - request: metastore.UpdateMetadataImportRequest = None, + request: Union[metastore.UpdateMetadataImportRequest, dict] = None, *, metadata_import: metastore.MetadataImport = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1181,7 +1181,7 @@ def update_metadata_import( supported to be updated. Args: - request (google.cloud.metastore_v1beta.types.UpdateMetadataImportRequest): + request (Union[google.cloud.metastore_v1beta.types.UpdateMetadataImportRequest, dict]): The request object. Request message for [DataprocMetastore.UpdateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.UpdateMetadataImport]. metadata_import (google.cloud.metastore_v1beta.types.MetadataImport): @@ -1271,7 +1271,7 @@ def update_metadata_import( def export_metadata( self, - request: metastore.ExportMetadataRequest = None, + request: Union[metastore.ExportMetadataRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1280,7 +1280,7 @@ def export_metadata( r"""Exports metadata from a service. Args: - request (google.cloud.metastore_v1beta.types.ExportMetadataRequest): + request (Union[google.cloud.metastore_v1beta.types.ExportMetadataRequest, dict]): The request object. Request message for [DataprocMetastore.ExportMetadata][google.cloud.metastore.v1beta.DataprocMetastore.ExportMetadata]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1332,7 +1332,7 @@ def export_metadata( def restore_service( self, - request: metastore.RestoreServiceRequest = None, + request: Union[metastore.RestoreServiceRequest, dict] = None, *, service: str = None, backup: str = None, @@ -1343,7 +1343,7 @@ def restore_service( r"""Restores a service from a backup. Args: - request (google.cloud.metastore_v1beta.types.RestoreServiceRequest): + request (Union[google.cloud.metastore_v1beta.types.RestoreServiceRequest, dict]): The request object. Request message for [DataprocMetastore.Restore][]. service (str): @@ -1428,7 +1428,7 @@ def restore_service( def list_backups( self, - request: metastore.ListBackupsRequest = None, + request: Union[metastore.ListBackupsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1438,7 +1438,7 @@ def list_backups( r"""Lists backups in a service. Args: - request (google.cloud.metastore_v1beta.types.ListBackupsRequest): + request (Union[google.cloud.metastore_v1beta.types.ListBackupsRequest, dict]): The request object. Request message for [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups]. parent (str): @@ -1510,7 +1510,7 @@ def list_backups( def get_backup( self, - request: metastore.GetBackupRequest = None, + request: Union[metastore.GetBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1520,7 +1520,7 @@ def get_backup( r"""Gets details of a single backup. Args: - request (google.cloud.metastore_v1beta.types.GetBackupRequest): + request (Union[google.cloud.metastore_v1beta.types.GetBackupRequest, dict]): The request object. Request message for [DataprocMetastore.GetBackup][google.cloud.metastore.v1beta.DataprocMetastore.GetBackup]. name (str): @@ -1581,7 +1581,7 @@ def get_backup( def create_backup( self, - request: metastore.CreateBackupRequest = None, + request: Union[metastore.CreateBackupRequest, dict] = None, *, parent: str = None, backup: metastore.Backup = None, @@ -1593,7 +1593,7 @@ def create_backup( r"""Creates a new Backup in a given project and location. Args: - request (google.cloud.metastore_v1beta.types.CreateBackupRequest): + request (Union[google.cloud.metastore_v1beta.types.CreateBackupRequest, dict]): The request object. Request message for [DataprocMetastore.CreateBackup][google.cloud.metastore.v1beta.DataprocMetastore.CreateBackup]. parent (str): @@ -1692,7 +1692,7 @@ def create_backup( def delete_backup( self, - request: metastore.DeleteBackupRequest = None, + request: Union[metastore.DeleteBackupRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1702,7 +1702,7 @@ def delete_backup( r"""Deletes a single backup. Args: - request (google.cloud.metastore_v1beta.types.DeleteBackupRequest): + request (Union[google.cloud.metastore_v1beta.types.DeleteBackupRequest, dict]): The request object. Request message for [DataprocMetastore.DeleteBackup][google.cloud.metastore.v1beta.DataprocMetastore.DeleteBackup]. name (str): diff --git a/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py index c81376a..ea7aad8 100644 --- a/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py +++ b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py @@ -119,7 +119,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/metastore_v1beta/services/dataproc_metastore/transports/grpc.py b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py index eac7104..bc3d4f3 100644 --- a/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py +++ b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py @@ -104,16 +104,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/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py index eb12574..a723c39 100644 --- a/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py @@ -151,16 +151,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_metastore_v1_keywords.py b/scripts/fixup_metastore_v1_keywords.py index 2cdabbc..c53c88c 100644 --- a/scripts/fixup_metastore_v1_keywords.py +++ b/scripts/fixup_metastore_v1_keywords.py @@ -39,21 +39,21 @@ def partition( class metastoreCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), - 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), - 'create_service': ('parent', 'service_id', 'service', 'request_id', ), - 'delete_backup': ('name', 'request_id', ), - 'delete_service': ('name', 'request_id', ), - 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), - 'get_backup': ('name', ), - 'get_metadata_import': ('name', ), - 'get_service': ('name', ), - 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), - 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), - 'update_service': ('update_mask', 'service', 'request_id', ), + 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), + 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), + 'create_service': ('parent', 'service_id', 'service', 'request_id', ), + 'delete_backup': ('name', 'request_id', ), + 'delete_service': ('name', 'request_id', ), + 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), + 'get_backup': ('name', ), + 'get_metadata_import': ('name', ), + 'get_service': ('name', ), + 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), + 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), + 'update_service': ('update_mask', 'service', 'request_id', ), } 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 ) diff --git a/scripts/fixup_metastore_v1alpha_keywords.py b/scripts/fixup_metastore_v1alpha_keywords.py index 2cdabbc..c53c88c 100644 --- a/scripts/fixup_metastore_v1alpha_keywords.py +++ b/scripts/fixup_metastore_v1alpha_keywords.py @@ -39,21 +39,21 @@ def partition( class metastoreCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), - 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), - 'create_service': ('parent', 'service_id', 'service', 'request_id', ), - 'delete_backup': ('name', 'request_id', ), - 'delete_service': ('name', 'request_id', ), - 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), - 'get_backup': ('name', ), - 'get_metadata_import': ('name', ), - 'get_service': ('name', ), - 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), - 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), - 'update_service': ('update_mask', 'service', 'request_id', ), + 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), + 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), + 'create_service': ('parent', 'service_id', 'service', 'request_id', ), + 'delete_backup': ('name', 'request_id', ), + 'delete_service': ('name', 'request_id', ), + 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), + 'get_backup': ('name', ), + 'get_metadata_import': ('name', ), + 'get_service': ('name', ), + 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), + 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), + 'update_service': ('update_mask', 'service', 'request_id', ), } 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 ) diff --git a/scripts/fixup_metastore_v1beta_keywords.py b/scripts/fixup_metastore_v1beta_keywords.py index 2cdabbc..c53c88c 100644 --- a/scripts/fixup_metastore_v1beta_keywords.py +++ b/scripts/fixup_metastore_v1beta_keywords.py @@ -39,21 +39,21 @@ def partition( class metastoreCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), - 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), - 'create_service': ('parent', 'service_id', 'service', 'request_id', ), - 'delete_backup': ('name', 'request_id', ), - 'delete_service': ('name', 'request_id', ), - 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), - 'get_backup': ('name', ), - 'get_metadata_import': ('name', ), - 'get_service': ('name', ), - 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), - 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), - 'update_service': ('update_mask', 'service', 'request_id', ), + 'create_backup': ('parent', 'backup_id', 'backup', 'request_id', ), + 'create_metadata_import': ('parent', 'metadata_import_id', 'metadata_import', 'request_id', ), + 'create_service': ('parent', 'service_id', 'service', 'request_id', ), + 'delete_backup': ('name', 'request_id', ), + 'delete_service': ('name', 'request_id', ), + 'export_metadata': ('service', 'destination_gcs_folder', 'request_id', 'database_dump_type', ), + 'get_backup': ('name', ), + 'get_metadata_import': ('name', ), + 'get_service': ('name', ), + 'list_backups': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_metadata_imports': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_services': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'restore_service': ('service', 'backup', 'restore_type', 'request_id', ), + 'update_metadata_import': ('update_mask', 'metadata_import', 'request_id', ), + 'update_service': ('update_mask', 'service', 'request_id', ), } 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 )