diff --git a/google/cloud/clouddms_v1/services/data_migration_service/client.py b/google/cloud/clouddms_v1/services/data_migration_service/client.py index 907dd82..18e7a3a 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/client.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/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 @@ -380,7 +380,7 @@ def __init__( def list_migration_jobs( self, - request: clouddms.ListMigrationJobsRequest = None, + request: Union[clouddms.ListMigrationJobsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -390,7 +390,7 @@ def list_migration_jobs( r"""Lists migration jobs in a given project and location. Args: - request (google.cloud.clouddms_v1.types.ListMigrationJobsRequest): + request (Union[google.cloud.clouddms_v1.types.ListMigrationJobsRequest, dict]): The request object. Retrieve a list of all migration jobs in a given project and location. parent (str): @@ -460,7 +460,7 @@ def list_migration_jobs( def get_migration_job( self, - request: clouddms.GetMigrationJobRequest = None, + request: Union[clouddms.GetMigrationJobRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -470,7 +470,7 @@ def get_migration_job( r"""Gets details of a single migration job. Args: - request (google.cloud.clouddms_v1.types.GetMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.GetMigrationJobRequest, dict]): The request object. Request message for 'GetMigrationJob' request. name (str): @@ -531,7 +531,7 @@ def get_migration_job( def create_migration_job( self, - request: clouddms.CreateMigrationJobRequest = None, + request: Union[clouddms.CreateMigrationJobRequest, dict] = None, *, parent: str = None, migration_job: clouddms_resources.MigrationJob = None, @@ -544,7 +544,7 @@ def create_migration_job( location. Args: - request (google.cloud.clouddms_v1.types.CreateMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.CreateMigrationJobRequest, dict]): The request object. Request message to create a new Database Migration Service migration job in the specified project and region. @@ -637,7 +637,7 @@ def create_migration_job( def update_migration_job( self, - request: clouddms.UpdateMigrationJobRequest = None, + request: Union[clouddms.UpdateMigrationJobRequest, dict] = None, *, migration_job: clouddms_resources.MigrationJob = None, update_mask: field_mask_pb2.FieldMask = None, @@ -648,7 +648,7 @@ def update_migration_job( r"""Updates the parameters of a single migration job. Args: - request (google.cloud.clouddms_v1.types.UpdateMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.UpdateMigrationJobRequest, dict]): The request object. Request message for 'UpdateMigrationJob' request. migration_job (google.cloud.clouddms_v1.types.MigrationJob): @@ -734,7 +734,7 @@ def update_migration_job( def delete_migration_job( self, - request: clouddms.DeleteMigrationJobRequest = None, + request: Union[clouddms.DeleteMigrationJobRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -744,7 +744,7 @@ def delete_migration_job( r"""Deletes a single migration job. Args: - request (google.cloud.clouddms_v1.types.DeleteMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.DeleteMigrationJobRequest, dict]): The request object. Request message for 'DeleteMigrationJob' request. name (str): @@ -826,7 +826,7 @@ def delete_migration_job( def start_migration_job( self, - request: clouddms.StartMigrationJobRequest = None, + request: Union[clouddms.StartMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -835,7 +835,7 @@ def start_migration_job( r"""Start an already created migration job. Args: - request (google.cloud.clouddms_v1.types.StartMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.StartMigrationJobRequest, dict]): The request object. Request message for 'StartMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -888,7 +888,7 @@ def start_migration_job( def stop_migration_job( self, - request: clouddms.StopMigrationJobRequest = None, + request: Union[clouddms.StopMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -897,7 +897,7 @@ def stop_migration_job( r"""Stops a running migration job. Args: - request (google.cloud.clouddms_v1.types.StopMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.StopMigrationJobRequest, dict]): The request object. Request message for 'StopMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -950,7 +950,7 @@ def stop_migration_job( def resume_migration_job( self, - request: clouddms.ResumeMigrationJobRequest = None, + request: Union[clouddms.ResumeMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -960,7 +960,7 @@ def resume_migration_job( is resumable (was stopped during CDC phase). Args: - request (google.cloud.clouddms_v1.types.ResumeMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.ResumeMigrationJobRequest, dict]): The request object. Request message for 'ResumeMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1013,7 +1013,7 @@ def resume_migration_job( def promote_migration_job( self, - request: clouddms.PromoteMigrationJobRequest = None, + request: Union[clouddms.PromoteMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1024,7 +1024,7 @@ def promote_migration_job( standalone database. Args: - request (google.cloud.clouddms_v1.types.PromoteMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.PromoteMigrationJobRequest, dict]): The request object. Request message for 'PromoteMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1077,7 +1077,7 @@ def promote_migration_job( def verify_migration_job( self, - request: clouddms.VerifyMigrationJobRequest = None, + request: Union[clouddms.VerifyMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1088,7 +1088,7 @@ def verify_migration_job( prerequisites are met. Args: - request (google.cloud.clouddms_v1.types.VerifyMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.VerifyMigrationJobRequest, dict]): The request object. Request message for 'VerifyMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1141,7 +1141,7 @@ def verify_migration_job( def restart_migration_job( self, - request: clouddms.RestartMigrationJobRequest = None, + request: Union[clouddms.RestartMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1152,7 +1152,7 @@ def restart_migration_job( starting the migration process from scratch. Args: - request (google.cloud.clouddms_v1.types.RestartMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.RestartMigrationJobRequest, dict]): The request object. Request message for 'RestartMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1205,7 +1205,7 @@ def restart_migration_job( def generate_ssh_script( self, - request: clouddms.GenerateSshScriptRequest = None, + request: Union[clouddms.GenerateSshScriptRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1215,7 +1215,7 @@ def generate_ssh_script( reverse SSH connectivity. Args: - request (google.cloud.clouddms_v1.types.GenerateSshScriptRequest): + request (Union[google.cloud.clouddms_v1.types.GenerateSshScriptRequest, dict]): The request object. Request message for 'GenerateSshScript' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1258,7 +1258,7 @@ def generate_ssh_script( def list_connection_profiles( self, - request: clouddms.ListConnectionProfilesRequest = None, + request: Union[clouddms.ListConnectionProfilesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1269,7 +1269,7 @@ def list_connection_profiles( project and location. Args: - request (google.cloud.clouddms_v1.types.ListConnectionProfilesRequest): + request (Union[google.cloud.clouddms_v1.types.ListConnectionProfilesRequest, dict]): The request object. Request message for 'ListConnectionProfiles' request. parent (str): @@ -1339,7 +1339,7 @@ def list_connection_profiles( def get_connection_profile( self, - request: clouddms.GetConnectionProfileRequest = None, + request: Union[clouddms.GetConnectionProfileRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1349,7 +1349,7 @@ def get_connection_profile( r"""Gets details of a single connection profile. Args: - request (google.cloud.clouddms_v1.types.GetConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.GetConnectionProfileRequest, dict]): The request object. Request message for 'GetConnectionProfile' request. name (str): @@ -1408,7 +1408,7 @@ def get_connection_profile( def create_connection_profile( self, - request: clouddms.CreateConnectionProfileRequest = None, + request: Union[clouddms.CreateConnectionProfileRequest, dict] = None, *, parent: str = None, connection_profile: clouddms_resources.ConnectionProfile = None, @@ -1421,7 +1421,7 @@ def create_connection_profile( and location. Args: - request (google.cloud.clouddms_v1.types.CreateConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.CreateConnectionProfileRequest, dict]): The request object. Request message for 'CreateConnectionProfile' request. parent (str): @@ -1513,7 +1513,7 @@ def create_connection_profile( def update_connection_profile( self, - request: clouddms.UpdateConnectionProfileRequest = None, + request: Union[clouddms.UpdateConnectionProfileRequest, dict] = None, *, connection_profile: clouddms_resources.ConnectionProfile = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1525,7 +1525,7 @@ def update_connection_profile( profile. Args: - request (google.cloud.clouddms_v1.types.UpdateConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.UpdateConnectionProfileRequest, dict]): The request object. Request message for 'UpdateConnectionProfile' request. connection_profile (google.cloud.clouddms_v1.types.ConnectionProfile): @@ -1612,7 +1612,7 @@ def update_connection_profile( def delete_connection_profile( self, - request: clouddms.DeleteConnectionProfileRequest = None, + request: Union[clouddms.DeleteConnectionProfileRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1625,7 +1625,7 @@ def delete_connection_profile( jobs. Args: - request (google.cloud.clouddms_v1.types.DeleteConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.DeleteConnectionProfileRequest, dict]): The request object. Request message for 'DeleteConnectionProfile' request. name (str): diff --git a/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py index 5ce5eaa..7a2dae7 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py @@ -118,7 +118,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/clouddms_v1/services/data_migration_service/transports/grpc.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py index 4784c30..f65599c 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py @@ -83,16 +83,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/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py index 9e4229b..82ef9d2 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py @@ -130,16 +130,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_clouddms_v1_keywords.py b/scripts/fixup_clouddms_v1_keywords.py index c537a49..ff5aca3 100644 --- a/scripts/fixup_clouddms_v1_keywords.py +++ b/scripts/fixup_clouddms_v1_keywords.py @@ -39,23 +39,23 @@ def partition( class clouddmsCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_connection_profile': ('parent', 'connection_profile_id', 'connection_profile', 'request_id', ), - 'create_migration_job': ('parent', 'migration_job_id', 'migration_job', 'request_id', ), - 'delete_connection_profile': ('name', 'request_id', 'force', ), - 'delete_migration_job': ('name', 'request_id', 'force', ), - 'generate_ssh_script': ('vm', 'migration_job', 'vm_creation_config', 'vm_selection_config', 'vm_port', ), - 'get_connection_profile': ('name', ), - 'get_migration_job': ('name', ), - 'list_connection_profiles': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_migration_jobs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'promote_migration_job': ('name', ), - 'restart_migration_job': ('name', ), - 'resume_migration_job': ('name', ), - 'start_migration_job': ('name', ), - 'stop_migration_job': ('name', ), - 'update_connection_profile': ('update_mask', 'connection_profile', 'request_id', ), - 'update_migration_job': ('update_mask', 'migration_job', 'request_id', ), - 'verify_migration_job': ('name', ), + 'create_connection_profile': ('parent', 'connection_profile_id', 'connection_profile', 'request_id', ), + 'create_migration_job': ('parent', 'migration_job_id', 'migration_job', 'request_id', ), + 'delete_connection_profile': ('name', 'request_id', 'force', ), + 'delete_migration_job': ('name', 'request_id', 'force', ), + 'generate_ssh_script': ('vm', 'migration_job', 'vm_creation_config', 'vm_selection_config', 'vm_port', ), + 'get_connection_profile': ('name', ), + 'get_migration_job': ('name', ), + 'list_connection_profiles': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_migration_jobs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'promote_migration_job': ('name', ), + 'restart_migration_job': ('name', ), + 'resume_migration_job': ('name', ), + 'start_migration_job': ('name', ), + 'stop_migration_job': ('name', ), + 'update_connection_profile': ('update_mask', 'connection_profile', 'request_id', ), + 'update_migration_job': ('update_mask', 'migration_job', 'request_id', ), + 'verify_migration_job': ('name', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -74,7 +74,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 )