From 1026e45ed6c6da35a9cbd54ed1598bb7c294d3a0 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Sat, 30 Mar 2019 05:13:59 -0700 Subject: [PATCH] [CHANGE ME] Re-generated pubsub to pick up changes in the API or client library generator. --- .../cloud/pubsub_v1/gapic/publisher_client.py | 131 +++++++++++ .../pubsub_v1/gapic/subscriber_client.py | 222 ++++++++++++++++++ pubsub/synth.metadata | 10 +- 3 files changed, 358 insertions(+), 5 deletions(-) diff --git a/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py b/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py index 43a24555a577..a308af5d13fd 100644 --- a/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py +++ b/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py @@ -24,6 +24,7 @@ import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method import google.api_core.path_template +import google.api_core.gapic_v1.routing_header import google.api_core.grpc_helpers import google.api_core.page_iterator import google.api_core.path_template @@ -267,6 +268,19 @@ def create_topic( request = pubsub_pb2.Topic( name=name, labels=labels, message_storage_policy=message_storage_policy ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["create_topic"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -341,6 +355,19 @@ def update_topic( ) request = pubsub_pb2.UpdateTopicRequest(topic=topic, update_mask=update_mask) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("topic.name", topic.name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["update_topic"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -407,6 +434,19 @@ def publish( ) request = pubsub_pb2.PublishRequest(topic=topic, messages=messages) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("topic", topic)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["publish"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -464,6 +504,19 @@ def get_topic( ) request = pubsub_pb2.GetTopicRequest(topic=topic) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("topic", topic)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_topic"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -542,6 +595,19 @@ def list_topics( ) request = pubsub_pb2.ListTopicsRequest(project=project, page_size=page_size) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("project", project)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -633,6 +699,19 @@ def list_topic_subscriptions( request = pubsub_pb2.ListTopicSubscriptionsRequest( topic=topic, page_size=page_size ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("topic", topic)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -703,6 +782,19 @@ def delete_topic( ) request = pubsub_pb2.DeleteTopicRequest(topic=topic) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("topic", topic)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["delete_topic"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -773,6 +865,19 @@ def set_iam_policy( ) request = iam_policy_pb2.SetIamPolicyRequest(resource=resource, policy=policy) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["set_iam_policy"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -833,6 +938,19 @@ def get_iam_policy( ) request = iam_policy_pb2.GetIamPolicyRequest(resource=resource) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_iam_policy"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -903,6 +1021,19 @@ def test_iam_permissions( request = iam_policy_pb2.TestIamPermissionsRequest( resource=resource, permissions=permissions ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["test_iam_permissions"]( request, retry=retry, timeout=timeout, metadata=metadata ) diff --git a/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py b/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py index 31ce68db82e9..5cd288ade084 100644 --- a/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py +++ b/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py @@ -23,6 +23,7 @@ import google.api_core.gapic_v1.client_info import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method +import google.api_core.gapic_v1.routing_header import google.api_core.grpc_helpers import google.api_core.page_iterator import google.api_core.path_template @@ -370,6 +371,19 @@ def create_subscription( enable_message_ordering=enable_message_ordering, expiration_policy=expiration_policy, ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["create_subscription"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -427,6 +441,19 @@ def get_subscription( ) request = pubsub_pb2.GetSubscriptionRequest(subscription=subscription) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_subscription"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -499,6 +526,19 @@ def update_subscription( request = pubsub_pb2.UpdateSubscriptionRequest( subscription=subscription, update_mask=update_mask ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription.name", subscription.name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["update_subscription"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -579,6 +619,19 @@ def list_subscriptions( request = pubsub_pb2.ListSubscriptionsRequest( project=project, page_size=page_size ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("project", project)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -649,6 +702,19 @@ def delete_subscription( ) request = pubsub_pb2.DeleteSubscriptionRequest(subscription=subscription) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["delete_subscription"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -728,6 +794,19 @@ def modify_ack_deadline( ack_ids=ack_ids, ack_deadline_seconds=ack_deadline_seconds, ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["modify_ack_deadline"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -797,6 +876,19 @@ def acknowledge( request = pubsub_pb2.AcknowledgeRequest( subscription=subscription, ack_ids=ack_ids ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["acknowledge"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -869,6 +961,19 @@ def pull( max_messages=max_messages, return_immediately=return_immediately, ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["pull"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1015,6 +1120,19 @@ def modify_push_config( request = pubsub_pb2.ModifyPushConfigRequest( subscription=subscription, push_config=push_config ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["modify_push_config"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1101,6 +1219,19 @@ def list_snapshots( ) request = pubsub_pb2.ListSnapshotsRequest(project=project, page_size=page_size) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("project", project)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + iterator = google.api_core.page_iterator.GRPCIterator( client=None, method=functools.partial( @@ -1203,6 +1334,19 @@ def create_snapshot( request = pubsub_pb2.CreateSnapshotRequest( name=name, subscription=subscription, labels=labels ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("name", name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["create_snapshot"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1284,6 +1428,19 @@ def update_snapshot( request = pubsub_pb2.UpdateSnapshotRequest( snapshot=snapshot, update_mask=update_mask ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("snapshot.name", snapshot.name)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["update_snapshot"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1350,6 +1507,19 @@ def delete_snapshot( ) request = pubsub_pb2.DeleteSnapshotRequest(snapshot=snapshot) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("snapshot", snapshot)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + self._inner_api_calls["delete_snapshot"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1438,6 +1608,19 @@ def seek( request = pubsub_pb2.SeekRequest( subscription=subscription, time=time, snapshot=snapshot ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("subscription", subscription)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["seek"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1508,6 +1691,19 @@ def set_iam_policy( ) request = iam_policy_pb2.SetIamPolicyRequest(resource=resource, policy=policy) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["set_iam_policy"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1568,6 +1764,19 @@ def get_iam_policy( ) request = iam_policy_pb2.GetIamPolicyRequest(resource=resource) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["get_iam_policy"]( request, retry=retry, timeout=timeout, metadata=metadata ) @@ -1638,6 +1847,19 @@ def test_iam_permissions( request = iam_policy_pb2.TestIamPermissionsRequest( resource=resource, permissions=permissions ) + if metadata is None: + metadata = [] + metadata = list(metadata) + try: + routing_header = [("resource", resource)] + except AttributeError: + pass + else: + routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata( + routing_header + ) + metadata.append(routing_metadata) + return self._inner_api_calls["test_iam_permissions"]( request, retry=retry, timeout=timeout, metadata=metadata ) diff --git a/pubsub/synth.metadata b/pubsub/synth.metadata index 4a27eece2b29..1495d2973449 100644 --- a/pubsub/synth.metadata +++ b/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-23T12:20:50.408656Z", + "updateTime": "2019-03-30T12:13:59.579900Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.19", - "dockerImage": "googleapis/artman@sha256:70ba28fda87e032ae44e6df41b7fc342c1b0cce1ed90658c4890eb4f613038c2" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e80435a132c53da26f46daf0787035ee63fb942b", - "internalRef": "239938670" + "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } }, {