feat: add StreamingPullRequest.client_id field (via synth)

Additionally, the copyright year is bumped to 2020 in some of the files.

Author: yoshi-automation

google/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/pubsub.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/pubsub_v1/gapic/publisher_client.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,10 +51,10 @@
 
 
 # TODO: remove conditional import after Python 2 support is dropped
-if six.PY3:
-    from collections.abc import Mapping
-else:
+if six.PY2:
     from collections import Mapping
+else:
+    from collections.abc import Mapping
 
 
 def _merge_dict(d1, d2):

google/cloud/pubsub_v1/gapic/subscriber_client.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -1307,11 +1307,11 @@ def create_snapshot(
             >>> response = client.create_snapshot(name, subscription)
 
         Args:
-            name (str): Optional user-provided name for this snapshot. If the name is not
-                provided in the request, the server will assign a random name for this
-                snapshot on the same project as the subscription. Note that for REST API
-                requests, you must specify a name. See the resource name rules. Format
-                is ``projects/{project}/snapshots/{snap}``.
+            name (str): User-provided name for this snapshot. If the name is not provided in the
+                request, the server will assign a random name for this snapshot on the
+                same project as the subscription. Note that for REST API requests, you
+                must specify a name. See the resource name rules. Format is
+                ``projects/{project}/snapshots/{snap}``.
             subscription (str): The subscription whose backlog the snapshot retains. Specifically, the
                 created snapshot is guaranteed to retain: (a) The existing backlog on
                 the subscription. More precisely, this is defined as the messages in the

google/cloud/pubsub_v1/gapic/transports/publisher_grpc_transport.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/pubsub_v1/gapic/transports/subscriber_grpc_transport.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/pubsub_v1/proto/pubsub.proto

@@ -164,7 +164,8 @@ message PubsubMessage {
   // at least one attribute.
   bytes data = 1;
 
-  // Optional attributes for this message.
+  // Attributes for this message. If this field is empty, the message must
+  // contain non-empty data.
   map<string, string> attributes = 2;
 
   // ID of this message, assigned by the server when the message is published.
@@ -178,10 +179,12 @@ message PubsubMessage {
   // publisher in a `Publish` call.
   google.protobuf.Timestamp publish_time = 4;
 
-  // Identifies related messages for which publish order should be respected.
-  // If a `Subscription` has `enable_message_ordering` set to `true`, messages
-  // published with the same `ordering_key` value will be delivered to
-  // subscribers in the order in which they are received by the Pub/Sub system.
+  // If non-empty, identifies related messages for which publish order should be
+  // respected. If a `Subscription` has `enable_message_ordering` set to `true`,
+  // messages published with the same non-empty `ordering_key` value will be
+  // delivered to subscribers in the order in which they are received by the
+  // Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest`
+  // must specify the same `ordering_key` value.
   // <b>EXPERIMENTAL:</b> This feature is part of a closed alpha release. This
   // API might be changed in backward-incompatible ways and is not recommended
   // for production use. It is not subject to any SLA or deprecation policy.
@@ -922,6 +925,14 @@ message StreamingPullRequest {
   // requests from client to server. The minimum deadline you can specify is 10
   // seconds. The maximum deadline you can specify is 600 seconds (10 minutes).
   int32 stream_ack_deadline_seconds = 5;
+
+  // A unique identifier that is used to distinguish client instances from each
+  // other. Only needs to be provided on the initial request. When a stream
+  // disconnects and reconnects for the same stream, the client_id should be set
+  // to the same value so that state associated with the old stream can be
+  // transferred to the new stream. The same client_id should not be used for
+  // different client instances.
+  string client_id = 6;
 }
 
 // Response for the `StreamingPull` method. This response is used to stream
@@ -933,13 +944,12 @@ message StreamingPullResponse {
 
 // Request for the `CreateSnapshot` method.
 message CreateSnapshotRequest {
-  // Optional user-provided name for this snapshot.
-  // If the name is not provided in the request, the server will assign a random
-  // name for this snapshot on the same project as the subscription.
-  // Note that for REST API requests, you must specify a name.  See the
-  // <a href="https://cloud.google.com/pubsub/docs/admin#resource_names">
-  // resource name rules</a>.
-  // Format is `projects/{project}/snapshots/{snap}`.
+  // User-provided name for this snapshot. If the name is not provided in the
+  // request, the server will assign a random name for this snapshot on the same
+  // project as the subscription. Note that for REST API requests, you must
+  // specify a name.  See the <a
+  // href="https://cloud.google.com/pubsub/docs/admin#resource_names"> resource
+  // name rules</a>. Format is `projects/{project}/snapshots/{snap}`.
   string name = 1;
 
   // The subscription whose backlog the snapshot retains.

google/cloud/pubsub_v1/proto/pubsub_pb2.py

@@ -72,6 +72,7 @@ def default(session):
     session.run(
         "py.test",
         "--quiet",
+        "--cov=google.cloud.pubsub",
         "--cov=google.cloud",
         "--cov=tests.unit",
         "--cov-append",
@@ -110,7 +111,7 @@ def system(session):
     # Install all test dependencies, then install this package into the
     # virtualenv's dist-packages.
     session.install("mock", "pytest")
-    # session.install("-e", "../test_utils/")
+
     session.install("-e", "test_utils")
     session.install("-e", ".")