google-cloud-pubsub 0.31.1 → 0.32.0

data/lib/google/cloud/pubsub/v1/doc/google/protobuf/duration.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/pubsub/v1/doc/google/protobuf/empty.rb

@@ -0,0 +1,28 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Protobuf
+    # A generic empty message that you can re-use to avoid defining duplicated
+    # empty messages in your APIs. A typical example is to use it as the request
+    # or the response type of an API method. For instance:
+    #
+    #     service Foo {
+    #       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+    #     }
+    #
+    # The JSON representation for +Empty+ is empty JSON object +{}+.
+    class Empty; end
+  end
+end

data/lib/google/cloud/pubsub/v1/doc/google/protobuf/field_mask.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/pubsub/v1/doc/google/protobuf/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/pubsub/v1/doc/google/pubsub/v1/pubsub.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,20 +14,17 @@
 
 module Google
   module Pubsub
-    ##
-    # # Google Cloud Pub/Sub API Contents
-    #
-    # | Class | Description |
-    # | ----- | ----------- |
-    # | [PublisherClient][] | Provides reliable, many-to-many, asynchronous messaging between applications. |
-    # | [SubscriberClient][] | Provides reliable, many-to-many, asynchronous messaging between applications. |
-    # | [Data Types][] | Data types for Google::Cloud::Pubsub::V1 |
-    #
-    # [PublisherClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/latest/google/pubsub/v1/publisherclient
-    # [SubscriberClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/latest/google/pubsub/v1/subscriberclient
-    # [Data Types]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/latest/google/pubsub/v1/datatypes
-    #
     module V1
+      # @!attribute [rw] allowed_persistence_regions
+      #   @return [Array<String>]
+      #     The list of GCP regions where messages that are published to the topic may
+      #     be persisted in storage. Messages published by publishers running in
+      #     non-allowed GCP regions (or running outside of GCP altogether) will be
+      #     routed for storage in one of the allowed regions. An empty list indicates a
+      #     misconfiguration at the project or organization level, which will result in
+      #     all Publish operations failing.
+      class MessageStoragePolicy; end
+
       # A topic resource.
       # @!attribute [rw] name
       #   @return [String]
@@ -40,6 +37,14 @@ module Google
       # @!attribute [rw] labels
       #   @return [Hash{String => String}]
       #     User labels.
+      # @!attribute [rw] message_storage_policy
+      #   @return [Google::Pubsub::V1::MessageStoragePolicy]
+      #     Policy constraining how messages published to the topic may be stored. It
+      #     is determined when the topic is created based on the policy configured at
+      #     the project level. It must not be set by the caller in the request to
+      #     CreateTopic or to UpdateTopic. This field will be populated in the
+      #     responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the
+      #     response, then no constraints are in effect.
       class Topic; end
 
       # A message data and its attributes. The message payload must not be empty;
@@ -73,11 +78,14 @@ module Google
       # Request for the UpdateTopic method.
       # @!attribute [rw] topic
       #   @return [Google::Pubsub::V1::Topic]
-      #     The topic to update.
+      #     The updated topic object.
       # @!attribute [rw] update_mask
       #   @return [Google::Protobuf::FieldMask]
-      #     Indicates which fields in the provided topic to update.
-      #     Must be specified and non-empty.
+      #     Indicates which fields in the provided topic to update. Must be specified
+      #     and non-empty. Note that if +update_mask+ contains
+      #     "message_storage_policy" then the new value will be determined based on the
+      #     policy configured at the project or organization level. The
+      #     +message_storage_policy+ must not be set in the +topic+ provided above.
       class UpdateTopicRequest; end
 
       # Request for the Publish method.
@@ -149,6 +157,38 @@ module Google
       #     +ListTopicSubscriptionsRequest+ to get more subscriptions.
       class ListTopicSubscriptionsResponse; end
 
+      # Request for the +ListTopicSnapshots+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
+      # @!attribute [rw] topic
+      #   @return [String]
+      #     The name of the topic that snapshots are attached to.
+      #     Format is +projects/{project}/topics/{topic}+.
+      # @!attribute [rw] page_size
+      #   @return [Integer]
+      #     Maximum number of snapshot names to return.
+      # @!attribute [rw] page_token
+      #   @return [String]
+      #     The value returned by the last +ListTopicSnapshotsResponse+; indicates
+      #     that this is a continuation of a prior +ListTopicSnapshots+ call, and
+      #     that the system should return the next page of data.
+      class ListTopicSnapshotsRequest; end
+
+      # Response for the +ListTopicSnapshots+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
+      # @!attribute [rw] snapshots
+      #   @return [Array<String>]
+      #     The names of the snapshots that match the request.
+      # @!attribute [rw] next_page_token
+      #   @return [String]
+      #     If not empty, indicates that there may be more snapshots that match
+      #     the request; this value should be passed in a new
+      #     +ListTopicSnapshotsRequest+ to get more snapshots.
+      class ListTopicSnapshotsResponse; end
+
       # Request for the +DeleteTopic+ method.
       # @!attribute [rw] topic
       #   @return [String]
@@ -164,7 +204,7 @@ module Google
       #     start with a letter, and contain only letters (+[A-Za-z]+), numbers
       #     (+[0-9]+), dashes (+-+), underscores (+_+), periods (+.+), tildes (+~+),
       #     plus (+++) or percent signs (+%+). It must be between 3 and 255 characters
-      #     in length, and it must not start with +"goog"+.
+      #     in length, and it must not start with +"goog"+
       # @!attribute [rw] topic
       #   @return [String]
       #     The name of the topic from which this subscription is receiving messages.
@@ -187,7 +227,8 @@ module Google
       #     For pull subscriptions, this value is used as the initial value for the ack
       #     deadline. To override this value for a given message, call
       #     +ModifyAckDeadline+ with the corresponding +ack_id+ if using
-      #     pull.
+      #     non-streaming pull or send the +ack_id+ in a
+      #     +StreamingModifyAckDeadlineRequest+ if using streaming pull.
       #     The minimum custom deadline you can specify is 10 seconds.
       #     The maximum custom deadline you can specify is 600 seconds (10 minutes).
       #     If this parameter is 0, a default value of 10 seconds is used.
@@ -202,7 +243,10 @@ module Google
       #     Indicates whether to retain acknowledged messages. If true, then
       #     messages are not expunged from the subscription's backlog, even if they are
       #     acknowledged, until they fall out of the +message_retention_duration+
-      #     window.
+      #     window.<br><br>
+      #     <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] message_retention_duration
       #   @return [Google::Protobuf::Duration]
       #     How long to retain unacknowledged messages in the subscription's backlog,
@@ -210,7 +254,10 @@ module Google
       #     If +retain_acked_messages+ is true, then this also configures the retention
       #     of acknowledged messages, and thus configures how far back in time a +Seek+
       #     can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10
-      #     minutes.
+      #     minutes.<br><br>
+      #     <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] labels
       #   @return [Hash{String => String}]
       #     User labels.
@@ -317,7 +364,7 @@ module Google
       #     An empty +pushConfig+ indicates that the Pub/Sub system should
       #     stop pushing messages from the given subscription and allow
       #     messages to be pulled and acknowledged - effectively pausing
-      #     the subscription if +Pull+ is not called.
+      #     the subscription if +Pull+ or +StreamingPull+ is not called.
       class ModifyPushConfigRequest; end
 
       # Request for the +Pull+ method.
@@ -429,7 +476,10 @@ module Google
       #     Received Pub/Sub messages. This will not be empty.
       class StreamingPullResponse; end
 
-      # Request for the +CreateSnapshot+ method.
+      # Request for the +CreateSnapshot+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] name
       #   @return [String]
       #     Optional user-provided name for this snapshot.
@@ -448,19 +498,28 @@ module Google
       #      (b) Any messages published to the subscription's topic following the
       #          successful completion of the CreateSnapshot request.
       #     Format is +projects/{project}/subscriptions/{sub}+.
+      # @!attribute [rw] labels
+      #   @return [Hash{String => String}]
+      #     User labels.
       class CreateSnapshotRequest; end
 
-      # Request for the UpdateSnapshot method.
+      # Request for the UpdateSnapshot method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] snapshot
       #   @return [Google::Pubsub::V1::Snapshot]
-      #     The updated snpashot object.
+      #     The updated snapshot object.
       # @!attribute [rw] update_mask
       #   @return [Google::Protobuf::FieldMask]
       #     Indicates which fields in the provided snapshot to update.
       #     Must be specified and non-empty.
       class UpdateSnapshotRequest; end
 
-      # A snapshot resource.
+      # A snapshot resource.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] name
       #   @return [String]
       #     The name of the snapshot.
@@ -477,13 +536,27 @@ module Google
       #     For example, consider a subscription whose oldest unacked message is 3 days
       #     old. If a snapshot is created from this subscription, the snapshot -- which
       #     will always capture this 3-day-old backlog as long as the snapshot
-      #     exists -- will expire in 4 days.
+      #     exists -- will expire in 4 days. The service will refuse to create a
+      #     snapshot that would expire in less than 1 hour after creation.
       # @!attribute [rw] labels
       #   @return [Hash{String => String}]
       #     User labels.
       class Snapshot; end
 
-      # Request for the +ListSnapshots+ method.
+      # Request for the GetSnapshot method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
+      # @!attribute [rw] snapshot
+      #   @return [String]
+      #     The name of the snapshot to get.
+      #     Format is +projects/{project}/snapshots/{snap}+.
+      class GetSnapshotRequest; end
+
+      # Request for the +ListSnapshots+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] project
       #   @return [String]
       #     The name of the cloud project that snapshots belong to.
@@ -498,7 +571,10 @@ module Google
       #     should return the next page of data.
       class ListSnapshotsRequest; end
 
-      # Response for the +ListSnapshots+ method.
+      # Response for the +ListSnapshots+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] snapshots
       #   @return [Array<Google::Pubsub::V1::Snapshot>]
       #     The resulting snapshots.
@@ -508,14 +584,20 @@ module Google
       #     request; this value should be passed in a new +ListSnapshotsRequest+.
       class ListSnapshotsResponse; end
 
-      # Request for the +DeleteSnapshot+ method.
+      # Request for the +DeleteSnapshot+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] snapshot
       #   @return [String]
       #     The name of the snapshot to delete.
       #     Format is +projects/{project}/snapshots/{snap}+.
       class DeleteSnapshotRequest; end
 
-      # Request for the +Seek+ method.
+      # Request for the +Seek+ method.<br><br>
+      # <b>ALPHA:</b> This feature is part of an 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.
       # @!attribute [rw] subscription
       #   @return [String]
       #     The subscription to affect.

data/lib/google/cloud/pubsub/v1/publisher_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 # and updates to that file get reflected here through a refresh process.
 # For the short term, the refresh process will only be runnable by Google
 # engineers.
-#
-# The only allowed edits are to method and file documentation. A 3-way
-# merge preserves those additions if the generated source changes.
 
 require "json"
 require "pathname"
@@ -29,7 +26,7 @@ require "google/gax"
 
 require "google/iam/v1/iam_policy_pb"
 require "google/pubsub/v1/pubsub_pb"
-require "google/cloud/pubsub/credentials"
+require "google/cloud/pubsub/v1/credentials"
 
 module Google
   module Cloud
@@ -51,6 +48,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           PAGE_DESCRIPTORS = {
@@ -84,11 +84,6 @@ module Google
             "https://www.googleapis.com/auth/pubsub"
           ].freeze
 
-          PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "projects/{project}"
-          )
-
-          private_constant :PROJECT_PATH_TEMPLATE
 
           TOPIC_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "projects/{project}/topics/{topic}"
@@ -96,14 +91,11 @@ module Google
 
           private_constant :TOPIC_PATH_TEMPLATE
 
-          # Returns a fully-qualified project resource name string.
-          # @param project [String]
-          # @return [String]
-          def self.project_path project
-            PROJECT_PATH_TEMPLATE.render(
-              :"project" => project
-            )
-          end
+          PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
+            "projects/{project}"
+          )
+
+          private_constant :PROJECT_PATH_TEMPLATE
 
           # Returns a fully-qualified topic resource name string.
           # @param project [String]
@@ -116,6 +108,15 @@ module Google
             )
           end
 
+          # Returns a fully-qualified project resource name string.
+          # @param project [String]
+          # @return [String]
+          def self.project_path project
+            PROJECT_PATH_TEMPLATE.render(
+              :"project" => project
+            )
+          end
+
           # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
           #   Provides the means for authenticating requests made by the client. This parameter can
           #   be many types.
@@ -140,16 +141,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
-              service_path: SERVICE_ADDRESS,
-              port: DEFAULT_SERVICE_PORT,
-              channel: nil,
-              chan_creds: nil,
-              updater_proc: nil,
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -159,21 +162,10 @@ module Google
             require "google/iam/v1/iam_policy_services_pb"
             require "google/pubsub/v1/pubsub_services_pb"
 
-            if channel || chan_creds || updater_proc
-              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
-                "on 2017/09/08"
-              credentials ||= channel
-              credentials ||= chan_creds
-              credentials ||= updater_proc
-            end
-            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
-              warn "`service_path` and `port` parameters are deprecated and will be removed"
-            end
-
-            credentials ||= Google::Cloud::Pubsub::Credentials.default
+            credentials ||= Google::Cloud::Pubsub::V1::Credentials.default
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Pubsub::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Pubsub::V1::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -188,13 +180,16 @@ module Google
               updater_proc = credentials.updater_proc
             end
 
+            package_version = Gem.loaded_specs['google-cloud-pubsub'].version.version
+
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/#{package_version} gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "publisher_client_config.json"
             )
@@ -208,9 +203,14 @@ module Google
                 bundle_descriptors: BUNDLE_DESCRIPTORS,
                 page_descriptors: PAGE_DESCRIPTORS,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
+
+            # Allow overriding the service path/port in subclasses.
+            service_path = self.class::SERVICE_ADDRESS
+            port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @iam_policy_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -218,6 +218,7 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Iam::V1::IAMPolicy::Stub.method(:new)
             )
             @publisher_stub = Google::Gax::Grpc.create_stub(
@@ -227,54 +228,66 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Pubsub::V1::Publisher::Stub.method(:new)
             )
 
-            @set_iam_policy = Google::Gax.create_api_call(
-              @iam_policy_stub.method(:set_iam_policy),
-              defaults["set_iam_policy"]
-            )
-            @get_iam_policy = Google::Gax.create_api_call(
-              @iam_policy_stub.method(:get_iam_policy),
-              defaults["get_iam_policy"]
-            )
-            @test_iam_permissions = Google::Gax.create_api_call(
-              @iam_policy_stub.method(:test_iam_permissions),
-              defaults["test_iam_permissions"]
-            )
             @create_topic = Google::Gax.create_api_call(
               @publisher_stub.method(:create_topic),
-              defaults["create_topic"]
+              defaults["create_topic"],
+              exception_transformer: exception_transformer
             )
             @update_topic = Google::Gax.create_api_call(
               @publisher_stub.method(:update_topic),
-              defaults["update_topic"]
+              defaults["update_topic"],
+              exception_transformer: exception_transformer
             )
             @publish = Google::Gax.create_api_call(
               @publisher_stub.method(:publish),
-              defaults["publish"]
+              defaults["publish"],
+              exception_transformer: exception_transformer
             )
             @get_topic = Google::Gax.create_api_call(
               @publisher_stub.method(:get_topic),
-              defaults["get_topic"]
+              defaults["get_topic"],
+              exception_transformer: exception_transformer
             )
             @list_topics = Google::Gax.create_api_call(
               @publisher_stub.method(:list_topics),
-              defaults["list_topics"]
+              defaults["list_topics"],
+              exception_transformer: exception_transformer
             )
             @list_topic_subscriptions = Google::Gax.create_api_call(
               @publisher_stub.method(:list_topic_subscriptions),
-              defaults["list_topic_subscriptions"]
+              defaults["list_topic_subscriptions"],
+              exception_transformer: exception_transformer
             )
             @delete_topic = Google::Gax.create_api_call(
               @publisher_stub.method(:delete_topic),
-              defaults["delete_topic"]
+              defaults["delete_topic"],
+              exception_transformer: exception_transformer
+            )
+            @set_iam_policy = Google::Gax.create_api_call(
+              @iam_policy_stub.method(:set_iam_policy),
+              defaults["set_iam_policy"],
+              exception_transformer: exception_transformer
+            )
+            @get_iam_policy = Google::Gax.create_api_call(
+              @iam_policy_stub.method(:get_iam_policy),
+              defaults["get_iam_policy"],
+              exception_transformer: exception_transformer
+            )
+            @test_iam_permissions = Google::Gax.create_api_call(
+              @iam_policy_stub.method(:test_iam_permissions),
+              defaults["test_iam_permissions"],
+              exception_transformer: exception_transformer
             )
           end
 
           # Service calls
 
-          # Creates the given topic with the given name.
+          # Creates the given topic with the given name. See the
+          # <a href="/pubsub/docs/admin#resource_names"> resource name rules</a>.
           #
           # @param name [String]
           #   The name of the topic. It must have the format
@@ -285,69 +298,91 @@ module Google
           #   must not start with +"goog"+.
           # @param labels [Hash{String => String}]
           #   User labels.
+          # @param message_storage_policy [Google::Pubsub::V1::MessageStoragePolicy | Hash]
+          #   Policy constraining how messages published to the topic may be stored. It
+          #   is determined when the topic is created based on the policy configured at
+          #   the project level. It must not be set by the caller in the request to
+          #   CreateTopic or to UpdateTopic. This field will be populated in the
+          #   responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the
+          #   response, then no constraints are in effect.
+          #   A hash of the same form as `Google::Pubsub::V1::MessageStoragePolicy`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Pubsub::V1::Topic]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Pubsub::V1::Topic]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_name = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #   response = publisher_client.create_topic(formatted_name)
 
           def create_topic \
               name,
               labels: nil,
-              options: nil
+              message_storage_policy: nil,
+              options: nil,
+              &block
             req = {
               name: name,
-              labels: labels
+              labels: labels,
+              message_storage_policy: message_storage_policy
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::Topic)
-            @create_topic.call(req, options)
+            @create_topic.call(req, options, &block)
           end
 
-          # Updates an existing topic. Note that certain properties of a topic are not
-          # modifiable.  Options settings follow the style guide:
-          # NOTE:  The style guide requires body: "topic" instead of body: "*".
-          # Keeping the latter for internal consistency in V1, however it should be
-          # corrected in V2.  See
-          # https://cloud.google.com/apis/design/standard_methods#update for details.
+          # Updates an existing topic. Note that certain properties of a
+          # topic are not modifiable.
           #
           # @param topic [Google::Pubsub::V1::Topic | Hash]
-          #   The topic to update.
+          #   The updated topic object.
           #   A hash of the same form as `Google::Pubsub::V1::Topic`
           #   can also be provided.
           # @param update_mask [Google::Protobuf::FieldMask | Hash]
-          #   Indicates which fields in the provided topic to update.
-          #   Must be specified and non-empty.
+          #   Indicates which fields in the provided topic to update. Must be specified
+          #   and non-empty. Note that if +update_mask+ contains
+          #   "message_storage_policy" then the new value will be determined based on the
+          #   policy configured at the project or organization level. The
+          #   +message_storage_policy+ must not be set in the +topic+ provided above.
           #   A hash of the same form as `Google::Protobuf::FieldMask`
           #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Pubsub::V1::Topic]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Pubsub::V1::Topic]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
+          #
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   # TODO: Initialize +topic+:
           #   topic = {}
+          #
+          #   # TODO: Initialize +update_mask+:
           #   update_mask = {}
           #   response = publisher_client.update_topic(topic, update_mask)
 
           def update_topic \
               topic,
               update_mask,
-              options: nil
+              options: nil,
+              &block
             req = {
               topic: topic,
               update_mask: update_mask
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::UpdateTopicRequest)
-            @update_topic.call(req, options)
+            @update_topic.call(req, options, &block)
           end
 
           # Adds one or more messages to the topic. Returns +NOT_FOUND+ if the topic
@@ -364,12 +399,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Pubsub::V1::PublishResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Pubsub::V1::PublishResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_topic = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #   data = ''
           #   messages_element = { data: data }
@@ -379,13 +417,14 @@ module Google
           def publish \
               topic,
               messages,
-              options: nil
+              options: nil,
+              &block
             req = {
               topic: topic,
               messages: messages
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::PublishRequest)
-            @publish.call(req, options)
+            @publish.call(req, options, &block)
           end
 
           # Gets the configuration of a topic.
@@ -396,23 +435,27 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Pubsub::V1::Topic]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Pubsub::V1::Topic]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_topic = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #   response = publisher_client.get_topic(formatted_topic)
 
           def get_topic \
               topic,
-              options: nil
+              options: nil,
+              &block
             req = {
               topic: topic
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::GetTopicRequest)
-            @get_topic.call(req, options)
+            @get_topic.call(req, options, &block)
           end
 
           # Lists matching topics.
@@ -429,6 +472,9 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Gax::PagedEnumerable<Google::Pubsub::V1::Topic>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Pubsub::V1::Topic>]
           #   An enumerable of Google::Pubsub::V1::Topic instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -436,9 +482,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_project = Google::Cloud::Pubsub::V1::PublisherClient.project_path("[PROJECT]")
           #
           #   # Iterate over all results.
@@ -457,16 +503,17 @@ module Google
           def list_topics \
               project,
               page_size: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               project: project,
               page_size: page_size
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::ListTopicsRequest)
-            @list_topics.call(req, options)
+            @list_topics.call(req, options, &block)
           end
 
-          # Lists the name of the subscriptions for this topic.
+          # Lists the names of the subscriptions on this topic.
           #
           # @param topic [String]
           #   The name of the topic that subscriptions are attached to.
@@ -480,6 +527,9 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Gax::PagedEnumerable<String>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<String>]
           #   An enumerable of String instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -487,9 +537,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_topic = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #
           #   # Iterate over all results.
@@ -508,13 +558,14 @@ module Google
           def list_topic_subscriptions \
               topic,
               page_size: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               topic: topic,
               page_size: page_size
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::ListTopicSubscriptionsRequest)
-            @list_topic_subscriptions.call(req, options)
+            @list_topic_subscriptions.call(req, options, &block)
           end
 
           # Deletes the topic with the given name. Returns +NOT_FOUND+ if the topic
@@ -529,22 +580,26 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result []
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_topic = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #   publisher_client.delete_topic(formatted_topic)
 
           def delete_topic \
               topic,
-              options: nil
+              options: nil,
+              &block
             req = {
               topic: topic
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Pubsub::V1::DeleteTopicRequest)
-            @delete_topic.call(req, options)
+            @delete_topic.call(req, options, &block)
             nil
           end
 
@@ -565,26 +620,32 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Iam::V1::Policy]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Iam::V1::Policy]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_resource = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
+          #
+          #   # TODO: Initialize +policy+:
           #   policy = {}
           #   response = publisher_client.set_iam_policy(formatted_resource, policy)
 
           def set_iam_policy \
               resource,
               policy,
-              options: nil
+              options: nil,
+              &block
             req = {
               resource: resource,
               policy: policy
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Iam::V1::SetIamPolicyRequest)
-            @set_iam_policy.call(req, options)
+            @set_iam_policy.call(req, options, &block)
           end
 
           # Gets the access control policy for a resource.
@@ -598,23 +659,27 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Iam::V1::Policy]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Iam::V1::Policy]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_resource = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
           #   response = publisher_client.get_iam_policy(formatted_resource)
 
           def get_iam_policy \
               resource,
-              options: nil
+              options: nil,
+              &block
             req = {
               resource: resource
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Iam::V1::GetIamPolicyRequest)
-            @get_iam_policy.call(req, options)
+            @get_iam_policy.call(req, options, &block)
           end
 
           # Returns permissions that a caller has on the specified resource.
@@ -633,26 +698,32 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Iam::V1::TestIamPermissionsResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Iam::V1::TestIamPermissionsResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/pubsub/v1"
+          #   require "google/cloud/pubsub"
           #
-          #   publisher_client = Google::Cloud::Pubsub::V1::Publisher.new
+          #   publisher_client = Google::Cloud::Pubsub::Publisher.new(version: :v1)
           #   formatted_resource = Google::Cloud::Pubsub::V1::PublisherClient.topic_path("[PROJECT]", "[TOPIC]")
+          #
+          #   # TODO: Initialize +permissions+:
           #   permissions = []
           #   response = publisher_client.test_iam_permissions(formatted_resource, permissions)
 
           def test_iam_permissions \
               resource,
               permissions,
-              options: nil
+              options: nil,
+              &block
             req = {
               resource: resource,
               permissions: permissions
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Iam::V1::TestIamPermissionsRequest)
-            @test_iam_permissions.call(req, options)
+            @test_iam_permissions.call(req, options, &block)
           end
         end
       end