diff --git a/google/pubsub_v1/services/publisher/client.py b/google/pubsub_v1/services/publisher/client.py index bbfe870db..af0f1d8fe 100644 --- a/google/pubsub_v1/services/publisher/client.py +++ b/google/pubsub_v1/services/publisher/client.py @@ -18,7 +18,7 @@ import functools 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 @@ -407,7 +407,7 @@ def __init__( def create_topic( self, - request: pubsub.Topic = None, + request: Union[pubsub.Topic, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -420,7 +420,7 @@ def create_topic( Args: - request (google.pubsub_v1.types.Topic): + request (Union[google.pubsub_v1.types.Topic, dict]): The request object. A topic resource. name (str): Required. The name of the topic. It must have the format @@ -485,7 +485,7 @@ def create_topic( def update_topic( self, - request: pubsub.UpdateTopicRequest = None, + request: Union[pubsub.UpdateTopicRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: TimeoutType = gapic_v1.method.DEFAULT, @@ -496,7 +496,7 @@ def update_topic( Args: - request (google.pubsub_v1.types.UpdateTopicRequest): + request (Union[google.pubsub_v1.types.UpdateTopicRequest, dict]): The request object. Request for the UpdateTopic method. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -537,7 +537,7 @@ def update_topic( def publish( self, - request: pubsub.PublishRequest = None, + request: Union[pubsub.PublishRequest, dict] = None, *, topic: str = None, messages: Sequence[pubsub.PubsubMessage] = None, @@ -550,7 +550,7 @@ def publish( Args: - request (google.pubsub_v1.types.PublishRequest): + request (Union[google.pubsub_v1.types.PublishRequest, dict]): The request object. Request for the Publish method. topic (str): Required. The messages in the request will be published @@ -617,7 +617,7 @@ def publish( def get_topic( self, - request: pubsub.GetTopicRequest = None, + request: Union[pubsub.GetTopicRequest, dict] = None, *, topic: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -628,7 +628,7 @@ def get_topic( Args: - request (google.pubsub_v1.types.GetTopicRequest): + request (Union[google.pubsub_v1.types.GetTopicRequest, dict]): The request object. Request for the GetTopic method. topic (str): Required. The name of the topic to get. Format is @@ -687,7 +687,7 @@ def get_topic( def list_topics( self, - request: pubsub.ListTopicsRequest = None, + request: Union[pubsub.ListTopicsRequest, dict] = None, *, project: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -698,7 +698,7 @@ def list_topics( Args: - request (google.pubsub_v1.types.ListTopicsRequest): + request (Union[google.pubsub_v1.types.ListTopicsRequest, dict]): The request object. Request for the `ListTopics` method. project (str): Required. The name of the project in which to list @@ -767,7 +767,7 @@ def list_topics( def list_topic_subscriptions( self, - request: pubsub.ListTopicSubscriptionsRequest = None, + request: Union[pubsub.ListTopicSubscriptionsRequest, dict] = None, *, topic: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -779,7 +779,7 @@ def list_topic_subscriptions( Args: - request (google.pubsub_v1.types.ListTopicSubscriptionsRequest): + request (Union[google.pubsub_v1.types.ListTopicSubscriptionsRequest, dict]): The request object. Request for the `ListTopicSubscriptions` method. topic (str): @@ -850,7 +850,7 @@ def list_topic_subscriptions( def list_topic_snapshots( self, - request: pubsub.ListTopicSnapshotsRequest = None, + request: Union[pubsub.ListTopicSnapshotsRequest, dict] = None, *, topic: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -866,7 +866,7 @@ def list_topic_snapshots( Args: - request (google.pubsub_v1.types.ListTopicSnapshotsRequest): + request (Union[google.pubsub_v1.types.ListTopicSnapshotsRequest, dict]): The request object. Request for the `ListTopicSnapshots` method. topic (str): @@ -937,7 +937,7 @@ def list_topic_snapshots( def delete_topic( self, - request: pubsub.DeleteTopicRequest = None, + request: Union[pubsub.DeleteTopicRequest, dict] = None, *, topic: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -953,7 +953,7 @@ def delete_topic( Args: - request (google.pubsub_v1.types.DeleteTopicRequest): + request (Union[google.pubsub_v1.types.DeleteTopicRequest, dict]): The request object. Request for the `DeleteTopic` method. topic (str): @@ -1008,7 +1008,7 @@ def delete_topic( def detach_subscription( self, - request: pubsub.DetachSubscriptionRequest = None, + request: Union[pubsub.DetachSubscriptionRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: TimeoutType = gapic_v1.method.DEFAULT, @@ -1022,7 +1022,7 @@ def detach_subscription( Args: - request (google.pubsub_v1.types.DetachSubscriptionRequest): + request (Union[google.pubsub_v1.types.DetachSubscriptionRequest, dict]): The request object. Request for the DetachSubscription method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/pubsub_v1/services/publisher/transports/base.py b/google/pubsub_v1/services/publisher/transports/base.py index af526eea7..a19d43568 100644 --- a/google/pubsub_v1/services/publisher/transports/base.py +++ b/google/pubsub_v1/services/publisher/transports/base.py @@ -123,7 +123,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/pubsub_v1/services/publisher/transports/grpc.py b/google/pubsub_v1/services/publisher/transports/grpc.py index d6c127d10..1dca72721 100644 --- a/google/pubsub_v1/services/publisher/transports/grpc.py +++ b/google/pubsub_v1/services/publisher/transports/grpc.py @@ -84,16 +84,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/pubsub_v1/services/publisher/transports/grpc_asyncio.py b/google/pubsub_v1/services/publisher/transports/grpc_asyncio.py index d98b8fc1c..38b81b4e2 100644 --- a/google/pubsub_v1/services/publisher/transports/grpc_asyncio.py +++ b/google/pubsub_v1/services/publisher/transports/grpc_asyncio.py @@ -131,16 +131,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/pubsub_v1/services/schema_service/client.py b/google/pubsub_v1/services/schema_service/client.py index 985676012..7bd0bd30a 100644 --- a/google/pubsub_v1/services/schema_service/client.py +++ b/google/pubsub_v1/services/schema_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 @@ -350,7 +350,7 @@ def __init__( def create_schema( self, - request: gp_schema.CreateSchemaRequest = None, + request: Union[gp_schema.CreateSchemaRequest, dict] = None, *, parent: str = None, schema: gp_schema.Schema = None, @@ -362,7 +362,7 @@ def create_schema( r"""Creates a schema. Args: - request (google.pubsub_v1.types.CreateSchemaRequest): + request (Union[google.pubsub_v1.types.CreateSchemaRequest, dict]): The request object. Request for the CreateSchema method. parent (str): Required. The name of the project in which to create the @@ -445,7 +445,7 @@ def create_schema( def get_schema( self, - request: schema.GetSchemaRequest = None, + request: Union[schema.GetSchemaRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -455,7 +455,7 @@ def get_schema( r"""Gets a schema. Args: - request (google.pubsub_v1.types.GetSchemaRequest): + request (Union[google.pubsub_v1.types.GetSchemaRequest, dict]): The request object. Request for the GetSchema method. name (str): Required. The name of the schema to get. Format is @@ -513,7 +513,7 @@ def get_schema( def list_schemas( self, - request: schema.ListSchemasRequest = None, + request: Union[schema.ListSchemasRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -523,7 +523,7 @@ def list_schemas( r"""Lists schemas in a project. Args: - request (google.pubsub_v1.types.ListSchemasRequest): + request (Union[google.pubsub_v1.types.ListSchemasRequest, dict]): The request object. Request for the `ListSchemas` method. parent (str): @@ -592,7 +592,7 @@ def list_schemas( def delete_schema( self, - request: schema.DeleteSchemaRequest = None, + request: Union[schema.DeleteSchemaRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -602,7 +602,7 @@ def delete_schema( r"""Deletes a schema. Args: - request (google.pubsub_v1.types.DeleteSchemaRequest): + request (Union[google.pubsub_v1.types.DeleteSchemaRequest, dict]): The request object. Request for the `DeleteSchema` method. name (str): @@ -656,7 +656,7 @@ def delete_schema( def validate_schema( self, - request: gp_schema.ValidateSchemaRequest = None, + request: Union[gp_schema.ValidateSchemaRequest, dict] = None, *, parent: str = None, schema: gp_schema.Schema = None, @@ -667,7 +667,7 @@ def validate_schema( r"""Validates a schema. Args: - request (google.pubsub_v1.types.ValidateSchemaRequest): + request (Union[google.pubsub_v1.types.ValidateSchemaRequest, dict]): The request object. Request for the `ValidateSchema` method. parent (str): @@ -737,7 +737,7 @@ def validate_schema( def validate_message( self, - request: schema.ValidateMessageRequest = None, + request: Union[schema.ValidateMessageRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -746,7 +746,7 @@ def validate_message( r"""Validates a message against a schema. Args: - request (google.pubsub_v1.types.ValidateMessageRequest): + request (Union[google.pubsub_v1.types.ValidateMessageRequest, dict]): The request object. Request for the `ValidateMessage` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/pubsub_v1/services/schema_service/transports/base.py b/google/pubsub_v1/services/schema_service/transports/base.py index 1044166cc..e37b92881 100644 --- a/google/pubsub_v1/services/schema_service/transports/base.py +++ b/google/pubsub_v1/services/schema_service/transports/base.py @@ -124,7 +124,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/pubsub_v1/services/schema_service/transports/grpc.py b/google/pubsub_v1/services/schema_service/transports/grpc.py index c99633ca2..a58a4df32 100644 --- a/google/pubsub_v1/services/schema_service/transports/grpc.py +++ b/google/pubsub_v1/services/schema_service/transports/grpc.py @@ -84,16 +84,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/pubsub_v1/services/schema_service/transports/grpc_asyncio.py b/google/pubsub_v1/services/schema_service/transports/grpc_asyncio.py index 0f4c93370..41baacfa7 100644 --- a/google/pubsub_v1/services/schema_service/transports/grpc_asyncio.py +++ b/google/pubsub_v1/services/schema_service/transports/grpc_asyncio.py @@ -131,16 +131,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/pubsub_v1/services/subscriber/client.py b/google/pubsub_v1/services/subscriber/client.py index 7f3c3a9dc..540b4b8ae 100644 --- a/google/pubsub_v1/services/subscriber/client.py +++ b/google/pubsub_v1/services/subscriber/client.py @@ -18,17 +18,7 @@ import functools import os import re -from typing import ( - Callable, - Dict, - Optional, - Iterable, - Iterator, - Sequence, - Tuple, - Type, - Union, -) +from typing import Dict, Optional, Iterable, Iterator, Sequence, Tuple, Type, Union import warnings import pkg_resources @@ -419,7 +409,7 @@ def __init__( def create_subscription( self, - request: pubsub.Subscription = None, + request: Union[pubsub.Subscription, dict] = None, *, name: str = None, topic: str = None, @@ -445,7 +435,7 @@ def create_subscription( Args: - request (google.pubsub_v1.types.Subscription): + request (Union[google.pubsub_v1.types.Subscription, dict]): The request object. A subscription resource. name (str): Required. The name of the subscription. It must have the @@ -564,7 +554,7 @@ def create_subscription( def get_subscription( self, - request: pubsub.GetSubscriptionRequest = None, + request: Union[pubsub.GetSubscriptionRequest, dict] = None, *, subscription: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -575,7 +565,7 @@ def get_subscription( Args: - request (google.pubsub_v1.types.GetSubscriptionRequest): + request (Union[google.pubsub_v1.types.GetSubscriptionRequest, dict]): The request object. Request for the GetSubscription method. subscription (str): @@ -636,7 +626,7 @@ def get_subscription( def update_subscription( self, - request: pubsub.UpdateSubscriptionRequest = None, + request: Union[pubsub.UpdateSubscriptionRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -648,7 +638,7 @@ def update_subscription( Args: - request (google.pubsub_v1.types.UpdateSubscriptionRequest): + request (Union[google.pubsub_v1.types.UpdateSubscriptionRequest, dict]): The request object. Request for the UpdateSubscription method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -689,7 +679,7 @@ def update_subscription( def list_subscriptions( self, - request: pubsub.ListSubscriptionsRequest = None, + request: Union[pubsub.ListSubscriptionsRequest, dict] = None, *, project: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -700,7 +690,7 @@ def list_subscriptions( Args: - request (google.pubsub_v1.types.ListSubscriptionsRequest): + request (Union[google.pubsub_v1.types.ListSubscriptionsRequest, dict]): The request object. Request for the `ListSubscriptions` method. project (str): @@ -769,7 +759,7 @@ def list_subscriptions( def delete_subscription( self, - request: pubsub.DeleteSubscriptionRequest = None, + request: Union[pubsub.DeleteSubscriptionRequest, dict] = None, *, subscription: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -785,7 +775,7 @@ def delete_subscription( Args: - request (google.pubsub_v1.types.DeleteSubscriptionRequest): + request (Union[google.pubsub_v1.types.DeleteSubscriptionRequest, dict]): The request object. Request for the DeleteSubscription method. subscription (str): @@ -841,7 +831,7 @@ def delete_subscription( def modify_ack_deadline( self, - request: pubsub.ModifyAckDeadlineRequest = None, + request: Union[pubsub.ModifyAckDeadlineRequest, dict] = None, *, subscription: str = None, ack_ids: Sequence[str] = None, @@ -859,7 +849,7 @@ def modify_ack_deadline( Args: - request (google.pubsub_v1.types.ModifyAckDeadlineRequest): + request (Union[google.pubsub_v1.types.ModifyAckDeadlineRequest, dict]): The request object. Request for the ModifyAckDeadline method. subscription (str): @@ -940,7 +930,7 @@ def modify_ack_deadline( def acknowledge( self, - request: pubsub.AcknowledgeRequest = None, + request: Union[pubsub.AcknowledgeRequest, dict] = None, *, subscription: str = None, ack_ids: Sequence[str] = None, @@ -959,7 +949,7 @@ def acknowledge( Args: - request (google.pubsub_v1.types.AcknowledgeRequest): + request (Union[google.pubsub_v1.types.AcknowledgeRequest, dict]): The request object. Request for the Acknowledge method. subscription (str): Required. The subscription whose message is being @@ -1025,7 +1015,7 @@ def acknowledge( def pull( self, - request: pubsub.PullRequest = None, + request: Union[pubsub.PullRequest, dict] = None, *, subscription: str = None, return_immediately: bool = None, @@ -1040,7 +1030,7 @@ def pull( Args: - request (google.pubsub_v1.types.PullRequest): + request (Union[google.pubsub_v1.types.PullRequest, dict]): The request object. Request for the `Pull` method. subscription (str): Required. The subscription from which messages should be @@ -1188,7 +1178,7 @@ def streaming_pull( def modify_push_config( self, - request: pubsub.ModifyPushConfigRequest = None, + request: Union[pubsub.ModifyPushConfigRequest, dict] = None, *, subscription: str = None, push_config: pubsub.PushConfig = None, @@ -1206,7 +1196,7 @@ def modify_push_config( Args: - request (google.pubsub_v1.types.ModifyPushConfigRequest): + request (Union[google.pubsub_v1.types.ModifyPushConfigRequest, dict]): The request object. Request for the ModifyPushConfig method. subscription (str): @@ -1276,7 +1266,7 @@ def modify_push_config( def get_snapshot( self, - request: pubsub.GetSnapshotRequest = None, + request: Union[pubsub.GetSnapshotRequest, dict] = None, *, snapshot: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1293,7 +1283,7 @@ def get_snapshot( Args: - request (google.pubsub_v1.types.GetSnapshotRequest): + request (Union[google.pubsub_v1.types.GetSnapshotRequest, dict]): The request object. Request for the GetSnapshot method. snapshot (str): Required. The name of the snapshot to get. Format is @@ -1357,7 +1347,7 @@ def get_snapshot( def list_snapshots( self, - request: pubsub.ListSnapshotsRequest = None, + request: Union[pubsub.ListSnapshotsRequest, dict] = None, *, project: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1372,7 +1362,7 @@ def list_snapshots( Args: - request (google.pubsub_v1.types.ListSnapshotsRequest): + request (Union[google.pubsub_v1.types.ListSnapshotsRequest, dict]): The request object. Request for the `ListSnapshots` method. project (str): @@ -1441,7 +1431,7 @@ def list_snapshots( def create_snapshot( self, - request: pubsub.CreateSnapshotRequest = None, + request: Union[pubsub.CreateSnapshotRequest, dict] = None, *, name: str = None, subscription: str = None, @@ -1471,7 +1461,7 @@ def create_snapshot( Args: - request (google.pubsub_v1.types.CreateSnapshotRequest): + request (Union[google.pubsub_v1.types.CreateSnapshotRequest, dict]): The request object. Request for the `CreateSnapshot` method. name (str): @@ -1558,7 +1548,7 @@ def create_snapshot( def update_snapshot( self, - request: pubsub.UpdateSnapshotRequest = None, + request: Union[pubsub.UpdateSnapshotRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1574,7 +1564,7 @@ def update_snapshot( Args: - request (google.pubsub_v1.types.UpdateSnapshotRequest): + request (Union[google.pubsub_v1.types.UpdateSnapshotRequest, dict]): The request object. Request for the UpdateSnapshot method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1621,7 +1611,7 @@ def update_snapshot( def delete_snapshot( self, - request: pubsub.DeleteSnapshotRequest = None, + request: Union[pubsub.DeleteSnapshotRequest, dict] = None, *, snapshot: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1641,7 +1631,7 @@ def delete_snapshot( Args: - request (google.pubsub_v1.types.DeleteSnapshotRequest): + request (Union[google.pubsub_v1.types.DeleteSnapshotRequest, dict]): The request object. Request for the `DeleteSnapshot` method. snapshot (str): @@ -1695,7 +1685,7 @@ def delete_snapshot( def seek( self, - request: pubsub.SeekRequest = None, + request: Union[pubsub.SeekRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1713,7 +1703,7 @@ def seek( Args: - request (google.pubsub_v1.types.SeekRequest): + request (Union[google.pubsub_v1.types.SeekRequest, dict]): The request object. Request for the `Seek` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. diff --git a/google/pubsub_v1/services/subscriber/transports/base.py b/google/pubsub_v1/services/subscriber/transports/base.py index 7100e5849..96322b3a4 100644 --- a/google/pubsub_v1/services/subscriber/transports/base.py +++ b/google/pubsub_v1/services/subscriber/transports/base.py @@ -123,7 +123,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/pubsub_v1/services/subscriber/transports/grpc.py b/google/pubsub_v1/services/subscriber/transports/grpc.py index b116b018c..604277eab 100644 --- a/google/pubsub_v1/services/subscriber/transports/grpc.py +++ b/google/pubsub_v1/services/subscriber/transports/grpc.py @@ -86,16 +86,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/pubsub_v1/services/subscriber/transports/grpc_asyncio.py b/google/pubsub_v1/services/subscriber/transports/grpc_asyncio.py index 91d557790..1b1704e17 100644 --- a/google/pubsub_v1/services/subscriber/transports/grpc_asyncio.py +++ b/google/pubsub_v1/services/subscriber/transports/grpc_asyncio.py @@ -133,16 +133,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_pubsub_v1_keywords.py b/scripts/fixup_pubsub_v1_keywords.py index da668f42f..ab7623917 100644 --- a/scripts/fixup_pubsub_v1_keywords.py +++ b/scripts/fixup_pubsub_v1_keywords.py @@ -39,37 +39,37 @@ def partition( class pubsubCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'acknowledge': ('subscription', 'ack_ids', ), - 'create_schema': ('parent', 'schema', 'schema_id', ), - 'create_snapshot': ('name', 'subscription', 'labels', ), - 'create_subscription': ('name', 'topic', 'push_config', 'ack_deadline_seconds', 'retain_acked_messages', 'message_retention_duration', 'labels', 'enable_message_ordering', 'expiration_policy', 'filter', 'dead_letter_policy', 'retry_policy', 'detached', 'topic_message_retention_duration', ), - 'create_topic': ('name', 'labels', 'message_storage_policy', 'kms_key_name', 'schema_settings', 'satisfies_pzs', 'message_retention_duration', ), - 'delete_schema': ('name', ), - 'delete_snapshot': ('snapshot', ), - 'delete_subscription': ('subscription', ), - 'delete_topic': ('topic', ), - 'detach_subscription': ('subscription', ), - 'get_schema': ('name', 'view', ), - 'get_snapshot': ('snapshot', ), - 'get_subscription': ('subscription', ), - 'get_topic': ('topic', ), - 'list_schemas': ('parent', 'view', 'page_size', 'page_token', ), - 'list_snapshots': ('project', 'page_size', 'page_token', ), - 'list_subscriptions': ('project', 'page_size', 'page_token', ), - 'list_topics': ('project', 'page_size', 'page_token', ), - 'list_topic_snapshots': ('topic', 'page_size', 'page_token', ), - 'list_topic_subscriptions': ('topic', 'page_size', 'page_token', ), - 'modify_ack_deadline': ('subscription', 'ack_ids', 'ack_deadline_seconds', ), - 'modify_push_config': ('subscription', 'push_config', ), - 'publish': ('topic', 'messages', ), - 'pull': ('subscription', 'max_messages', 'return_immediately', ), - 'seek': ('subscription', 'time', 'snapshot', ), - 'streaming_pull': ('subscription', 'stream_ack_deadline_seconds', 'ack_ids', 'modify_deadline_seconds', 'modify_deadline_ack_ids', 'client_id', 'max_outstanding_messages', 'max_outstanding_bytes', ), - 'update_snapshot': ('snapshot', 'update_mask', ), - 'update_subscription': ('subscription', 'update_mask', ), - 'update_topic': ('topic', 'update_mask', ), - 'validate_message': ('parent', 'name', 'schema', 'message', 'encoding', ), - 'validate_schema': ('parent', 'schema', ), + 'acknowledge': ('subscription', 'ack_ids', ), + 'create_schema': ('parent', 'schema', 'schema_id', ), + 'create_snapshot': ('name', 'subscription', 'labels', ), + 'create_subscription': ('name', 'topic', 'push_config', 'ack_deadline_seconds', 'retain_acked_messages', 'message_retention_duration', 'labels', 'enable_message_ordering', 'expiration_policy', 'filter', 'dead_letter_policy', 'retry_policy', 'detached', 'topic_message_retention_duration', ), + 'create_topic': ('name', 'labels', 'message_storage_policy', 'kms_key_name', 'schema_settings', 'satisfies_pzs', 'message_retention_duration', ), + 'delete_schema': ('name', ), + 'delete_snapshot': ('snapshot', ), + 'delete_subscription': ('subscription', ), + 'delete_topic': ('topic', ), + 'detach_subscription': ('subscription', ), + 'get_schema': ('name', 'view', ), + 'get_snapshot': ('snapshot', ), + 'get_subscription': ('subscription', ), + 'get_topic': ('topic', ), + 'list_schemas': ('parent', 'view', 'page_size', 'page_token', ), + 'list_snapshots': ('project', 'page_size', 'page_token', ), + 'list_subscriptions': ('project', 'page_size', 'page_token', ), + 'list_topics': ('project', 'page_size', 'page_token', ), + 'list_topic_snapshots': ('topic', 'page_size', 'page_token', ), + 'list_topic_subscriptions': ('topic', 'page_size', 'page_token', ), + 'modify_ack_deadline': ('subscription', 'ack_ids', 'ack_deadline_seconds', ), + 'modify_push_config': ('subscription', 'push_config', ), + 'publish': ('topic', 'messages', ), + 'pull': ('subscription', 'max_messages', 'return_immediately', ), + 'seek': ('subscription', 'time', 'snapshot', ), + 'streaming_pull': ('subscription', 'stream_ack_deadline_seconds', 'ack_ids', 'modify_deadline_seconds', 'modify_deadline_ack_ids', 'client_id', 'max_outstanding_messages', 'max_outstanding_bytes', ), + 'update_snapshot': ('snapshot', 'update_mask', ), + 'update_subscription': ('subscription', 'update_mask', ), + 'update_topic': ('topic', 'update_mask', ), + 'validate_message': ('parent', 'name', 'schema', 'message', 'encoding', ), + 'validate_schema': ('parent', 'schema', ), 'get_iam_policy': ('resource', 'options', ), 'set_iam_policy': ('resource', 'policy', ), 'test_iam_permissions': ('resource', 'permissions', ), @@ -91,7 +91,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 )