google-cloud-pubsub-v1 0.11.0 → 1.11.1

data/lib/google/cloud/pubsub/v1/{subscriber → subscription_admin}/client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 Google LLC
+# Copyright 2025 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,35 +18,42 @@
 
 require "google/cloud/errors"
 require "google/pubsub/v1/pubsub_pb"
+require "google/iam/v1"
 
 module Google
   module Cloud
     module PubSub
       module V1
-        module Subscriber
+        module SubscriptionAdmin
           ##
-          # Client for the Subscriber service.
+          # Client for the SubscriptionAdmin service.
           #
           # The service that an application uses to manipulate subscriptions and to
           # consume messages from a subscription via the `Pull` method or by
           # establishing a bi-directional stream using the `StreamingPull` method.
           #
           class Client
+            # @private
+            API_VERSION = ""
+
+            # @private
+            DEFAULT_ENDPOINT_TEMPLATE = "pubsub.$UNIVERSE_DOMAIN$"
+
             include Paths
 
             # @private
-            attr_reader :subscriber_stub
+            attr_reader :subscription_admin_stub
 
             ##
-            # Configure the Subscriber Client class.
+            # Configure the SubscriptionAdmin Client class.
             #
-            # See {::Google::Cloud::PubSub::V1::Subscriber::Client::Configuration}
+            # See {::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client::Configuration}
             # for a description of the configuration fields.
             #
             # @example
             #
-            #   # Modify the configuration for all Subscriber clients
-            #   ::Google::Cloud::PubSub::V1::Subscriber::Client.configure do |config|
+            #   # Modify the configuration for all SubscriptionAdmin clients
+            #   ::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.configure do |config|
             #     config.timeout = 10.0
             #   end
             #
@@ -103,12 +110,12 @@ module Google
 
                 default_config.rpcs.pull.timeout = 60.0
                 default_config.rpcs.pull.retry_policy = {
-                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [2, 10, 14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [2, 10, 14, 13]
                 }
 
                 default_config.rpcs.streaming_pull.timeout = 900.0
                 default_config.rpcs.streaming_pull.retry_policy = {
-                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [4, 8, 10, 13, 14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 4, retry_codes: [4, 8, 10, 13, 14]
                 }
 
                 default_config.rpcs.modify_push_config.timeout = 60.0
@@ -153,13 +160,13 @@ module Google
             end
 
             ##
-            # Configure the Subscriber Client instance.
+            # Configure the SubscriptionAdmin Client instance.
             #
             # The configuration is set to the derived mode, meaning that values can be changed,
             # but structural changes (adding new fields, etc.) are not allowed. Structural changes
             # should be made on {Client.configure}.
             #
-            # See {::Google::Cloud::PubSub::V1::Subscriber::Client::Configuration}
+            # See {::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client::Configuration}
             # for a description of the configuration fields.
             #
             # @yield [config] Configure the Client client.
@@ -173,19 +180,28 @@ module Google
             end
 
             ##
-            # Create a new Subscriber client object.
+            # The effective universe domain
+            #
+            # @return [String]
+            #
+            def universe_domain
+              @subscription_admin_stub.universe_domain
+            end
+
+            ##
+            # Create a new SubscriptionAdmin client object.
             #
             # @example
             #
             #   # Create a client using the default configuration
-            #   client = ::Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = ::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a client using a custom configuration
-            #   client = ::Google::Cloud::PubSub::V1::Subscriber::Client.new do |config|
+            #   client = ::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new do |config|
             #     config.timeout = 10.0
             #   end
             #
-            # @yield [config] Configure the Subscriber client.
+            # @yield [config] Configure the SubscriptionAdmin client.
             # @yieldparam config [Client::Configuration]
             #
             def initialize
@@ -205,8 +221,9 @@ module Google
               credentials = @config.credentials
               # Use self-signed JWT if the endpoint is unchanged from default,
               # but only if the default endpoint does not have a region prefix.
-              enable_self_signed_jwt = @config.endpoint == Client.configure.endpoint &&
-                                       !@config.endpoint.split(".").first.include?("-")
+              enable_self_signed_jwt = @config.endpoint.nil? ||
+                                       (@config.endpoint == Configuration::DEFAULT_ENDPOINT &&
+                                       !@config.endpoint.split(".").first.include?("-"))
               credentials ||= Credentials.default scope: @config.scope,
                                                   enable_self_signed_jwt: enable_self_signed_jwt
               if credentials.is_a?(::String) || credentials.is_a?(::Hash)
@@ -215,29 +232,67 @@ module Google
               @quota_project_id = @config.quota_project
               @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
-              @subscriber_stub = ::Gapic::ServiceStub.new(
+              @subscription_admin_stub = ::Gapic::ServiceStub.new(
                 ::Google::Cloud::PubSub::V1::Subscriber::Stub,
-                credentials:  credentials,
-                endpoint:     @config.endpoint,
+                credentials: credentials,
+                endpoint: @config.endpoint,
+                endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
+                universe_domain: @config.universe_domain,
                 channel_args: @config.channel_args,
-                interceptors: @config.interceptors
+                interceptors: @config.interceptors,
+                channel_pool_config: @config.channel_pool,
+                logger: @config.logger
               )
+
+              @subscription_admin_stub.stub_logger&.info do |entry|
+                entry.set_system_name
+                entry.set_service
+                entry.message = "Created client for #{entry.service}"
+                entry.set_credentials_fields credentials
+                entry.set "customEndpoint", @config.endpoint if @config.endpoint
+                entry.set "defaultTimeout", @config.timeout if @config.timeout
+                entry.set "quotaProject", @quota_project_id if @quota_project_id
+              end
+
+              @iam_policy_client = Google::Iam::V1::IAMPolicy::Client.new do |config|
+                config.credentials = credentials
+                config.quota_project = @quota_project_id
+                config.endpoint = @subscription_admin_stub.endpoint
+                config.universe_domain = @subscription_admin_stub.universe_domain
+                config.logger = @subscription_admin_stub.logger if config.respond_to? :logger=
+              end
+            end
+
+            ##
+            # Get the associated client for mix-in of the IAMPolicy.
+            #
+            # @return [Google::Iam::V1::IAMPolicy::Client]
+            #
+            attr_reader :iam_policy_client
+
+            ##
+            # The logger used for request/response debug logging.
+            #
+            # @return [Logger]
+            #
+            def logger
+              @subscription_admin_stub.logger
             end
 
             # Service calls
 
             ##
             # Creates a subscription to a given topic. See the [resource name rules]
-            # (https://cloud.google.com/pubsub/docs/admin#resource_names).
+            # (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
             # If the subscription already exists, returns `ALREADY_EXISTS`.
             # If the corresponding topic doesn't exist, returns `NOT_FOUND`.
             #
             # If the name is not provided in the request, the server will assign a random
             # name for this subscription on the same project as the topic, conforming
             # to the [resource name format]
-            # (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-            # name is populated in the returned Subscription object. Note that for REST
-            # API requests, you must specify a name in the request.
+            # (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+            # generated name is populated in the returned Subscription object. Note that
+            # for REST API requests, you must specify a name in the request.
             #
             # @overload create_subscription(request, options = nil)
             #   Pass arguments to `create_subscription` via a request object, either of type
@@ -249,7 +304,7 @@ module Google
             #   @param options [::Gapic::CallOptions, ::Hash]
             #     Overrides the default settings for this call, e.g, timeout, retries, etc. Optional.
             #
-            # @overload create_subscription(name: nil, topic: nil, push_config: nil, bigquery_config: nil, ack_deadline_seconds: nil, retain_acked_messages: nil, message_retention_duration: nil, labels: nil, enable_message_ordering: nil, expiration_policy: nil, filter: nil, dead_letter_policy: nil, retry_policy: nil, detached: nil, enable_exactly_once_delivery: nil)
+            # @overload create_subscription(name: nil, topic: nil, push_config: nil, bigquery_config: nil, cloud_storage_config: nil, ack_deadline_seconds: nil, retain_acked_messages: nil, message_retention_duration: nil, labels: nil, enable_message_ordering: nil, expiration_policy: nil, filter: nil, dead_letter_policy: nil, retry_policy: nil, detached: nil, enable_exactly_once_delivery: nil, message_transforms: nil)
             #   Pass arguments to `create_subscription` via keyword arguments. Note that at
             #   least one keyword argument is required. To specify no parameters, or to keep all
             #   the default parameter values, pass an empty Hash as a request object (see above).
@@ -266,21 +321,20 @@ module Google
             #     messages. Format is `projects/{project}/topics/{topic}`. The value of this
             #     field will be `_deleted-topic_` if the topic has been deleted.
             #   @param push_config [::Google::Cloud::PubSub::V1::PushConfig, ::Hash]
-            #     If push delivery is used with this subscription, this field is
-            #     used to configure it. Either `pushConfig` or `bigQueryConfig` can be set,
-            #     but not both. If both are empty, then the subscriber will pull and ack
-            #     messages using API methods.
+            #     Optional. If push delivery is used with this subscription, this field is
+            #     used to configure it.
             #   @param bigquery_config [::Google::Cloud::PubSub::V1::BigQueryConfig, ::Hash]
-            #     If delivery to BigQuery is used with this subscription, this field is
-            #     used to configure it. Either `pushConfig` or `bigQueryConfig` can be set,
-            #     but not both. If both are empty, then the subscriber will pull and ack
-            #     messages using API methods.
+            #     Optional. If delivery to BigQuery is used with this subscription, this
+            #     field is used to configure it.
+            #   @param cloud_storage_config [::Google::Cloud::PubSub::V1::CloudStorageConfig, ::Hash]
+            #     Optional. If delivery to Google Cloud Storage is used with this
+            #     subscription, this field is used to configure it.
             #   @param ack_deadline_seconds [::Integer]
-            #     The approximate amount of time (on a best-effort basis) Pub/Sub waits for
-            #     the subscriber to acknowledge receipt before resending the message. In the
-            #     interval after the message is delivered and before it is acknowledged, it
-            #     is considered to be <i>outstanding</i>. During that time period, the
-            #     message will not be redelivered (on a best-effort basis).
+            #     Optional. The approximate amount of time (on a best-effort basis) Pub/Sub
+            #     waits for the subscriber to acknowledge receipt before resending the
+            #     message. In the interval after the message is delivered and before it is
+            #     acknowledged, it is considered to be _outstanding_. During that time
+            #     period, the message will not be redelivered (on a best-effort basis).
             #
             #     For pull subscriptions, this value is used as the initial value for the ack
             #     deadline. To override this value for a given message, call
@@ -297,75 +351,79 @@ module Google
             #     If the subscriber never acknowledges the message, the Pub/Sub
             #     system will eventually redeliver the message.
             #   @param retain_acked_messages [::Boolean]
-            #     Indicates whether to retain acknowledged messages. If true, then
+            #     Optional. 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. This must be true if you would like to [`Seek` to a timestamp]
             #     (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) in
             #     the past to replay previously-acknowledged messages.
             #   @param message_retention_duration [::Google::Protobuf::Duration, ::Hash]
-            #     How long to retain unacknowledged messages in the subscription's backlog,
-            #     from the moment a message is published.
-            #     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.
+            #     Optional. How long to retain unacknowledged messages in the subscription's
+            #     backlog, from the moment a message is published. 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 31 days or less than 10 minutes.
             #   @param labels [::Hash{::String => ::String}]
-            #     See <a href="https://cloud.google.com/pubsub/docs/labels"> Creating and
-            #     managing labels</a>.
+            #     Optional. See [Creating and managing
+            #     labels](https://cloud.google.com/pubsub/docs/labels).
             #   @param enable_message_ordering [::Boolean]
-            #     If true, messages published with the same `ordering_key` in `PubsubMessage`
-            #     will be delivered to the subscribers in the order in which they
-            #     are received by the Pub/Sub system. Otherwise, they may be delivered in
-            #     any order.
+            #     Optional. If true, messages published with the same `ordering_key` in
+            #     `PubsubMessage` will be delivered to the subscribers in the order in which
+            #     they are received by the Pub/Sub system. Otherwise, they may be delivered
+            #     in any order.
             #   @param expiration_policy [::Google::Cloud::PubSub::V1::ExpirationPolicy, ::Hash]
-            #     A policy that specifies the conditions for this subscription's expiration.
-            #     A subscription is considered active as long as any connected subscriber is
-            #     successfully consuming messages from the subscription or is issuing
-            #     operations on the subscription. If `expiration_policy` is not set, a
-            #     *default policy* with `ttl` of 31 days will be used. The minimum allowed
-            #     value for `expiration_policy.ttl` is 1 day.
+            #     Optional. A policy that specifies the conditions for this subscription's
+            #     expiration. A subscription is considered active as long as any connected
+            #     subscriber is successfully consuming messages from the subscription or is
+            #     issuing operations on the subscription. If `expiration_policy` is not set,
+            #     a *default policy* with `ttl` of 31 days will be used. The minimum allowed
+            #     value for `expiration_policy.ttl` is 1 day. If `expiration_policy` is set,
+            #     but `expiration_policy.ttl` is not set, the subscription never expires.
             #   @param filter [::String]
-            #     An expression written in the Pub/Sub [filter
+            #     Optional. An expression written in the Pub/Sub [filter
             #     language](https://cloud.google.com/pubsub/docs/filtering). If non-empty,
             #     then only `PubsubMessage`s whose `attributes` field matches the filter are
             #     delivered on this subscription. If empty, then no messages are filtered
             #     out.
             #   @param dead_letter_policy [::Google::Cloud::PubSub::V1::DeadLetterPolicy, ::Hash]
-            #     A policy that specifies the conditions for dead lettering messages in
-            #     this subscription. If dead_letter_policy is not set, dead lettering
-            #     is disabled.
+            #     Optional. A policy that specifies the conditions for dead lettering
+            #     messages in this subscription. If dead_letter_policy is not set, dead
+            #     lettering is disabled.
             #
-            #     The Cloud Pub/Sub service account associated with this subscriptions's
+            #     The Pub/Sub service account associated with this subscriptions's
             #     parent project (i.e.,
             #     service-\\{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have
             #     permission to Acknowledge() messages on this subscription.
             #   @param retry_policy [::Google::Cloud::PubSub::V1::RetryPolicy, ::Hash]
-            #     A policy that specifies how Pub/Sub retries message delivery for this
-            #     subscription.
+            #     Optional. A policy that specifies how Pub/Sub retries message delivery for
+            #     this subscription.
             #
             #     If not set, the default retry policy is applied. This generally implies
             #     that messages will be retried as soon as possible for healthy subscribers.
-            #     RetryPolicy will be triggered on NACKs or acknowledgement deadline
-            #     exceeded events for a given message.
+            #     RetryPolicy will be triggered on NACKs or acknowledgment deadline exceeded
+            #     events for a given message.
             #   @param detached [::Boolean]
-            #     Indicates whether the subscription is detached from its topic. Detached
-            #     subscriptions don't receive messages from their topic and don't retain any
-            #     backlog. `Pull` and `StreamingPull` requests will return
+            #     Optional. Indicates whether the subscription is detached from its topic.
+            #     Detached subscriptions don't receive messages from their topic and don't
+            #     retain any backlog. `Pull` and `StreamingPull` requests will return
             #     FAILED_PRECONDITION. If the subscription is a push subscription, pushes to
             #     the endpoint will not be made.
             #   @param enable_exactly_once_delivery [::Boolean]
-            #     If true, Pub/Sub provides the following guarantees for the delivery of
-            #     a message with a given value of `message_id` on this subscription:
+            #     Optional. If true, Pub/Sub provides the following guarantees for the
+            #     delivery of a message with a given value of `message_id` on this
+            #     subscription:
             #
             #     * The message sent to a subscriber is guaranteed not to be resent
-            #     before the message's acknowledgement deadline expires.
+            #     before the message's acknowledgment deadline expires.
             #     * An acknowledged message will not be resent to a subscriber.
             #
             #     Note that subscribers may still receive multiple copies of a message
             #     when `enable_exactly_once_delivery` is true if the message was published
             #     multiple times by a publisher client. These copies are  considered distinct
             #     by Pub/Sub and have distinct `message_id` values.
+            #   @param message_transforms [::Array<::Google::Cloud::PubSub::V1::MessageTransform, ::Hash>]
+            #     Optional. Transforms to be applied to messages before they are delivered to
+            #     subscribers. Transforms are applied in the order specified.
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Google::Cloud::PubSub::V1::Subscription]
@@ -379,7 +437,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::Subscription.new
@@ -401,10 +459,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.create_subscription.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -423,9 +482,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :create_subscription, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :create_subscription, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -465,7 +523,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::GetSubscriptionRequest.new
@@ -487,10 +545,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.get_subscription.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -509,17 +568,17 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :get_subscription, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :get_subscription, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
             end
 
             ##
-            # Updates an existing subscription. Note that certain properties of a
-            # subscription, such as its topic, are not modifiable.
+            # Updates an existing subscription by updating the fields specified in the
+            # update mask. Note that certain properties of a subscription, such as its
+            # topic, are not modifiable.
             #
             # @overload update_subscription(request, options = nil)
             #   Pass arguments to `update_subscription` via a request object, either of type
@@ -554,7 +613,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::UpdateSubscriptionRequest.new
@@ -576,10 +635,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.update_subscription.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -598,9 +658,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :update_subscription, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :update_subscription, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -628,11 +687,11 @@ module Google
             #     Required. The name of the project in which to list subscriptions.
             #     Format is `projects/{project-id}`.
             #   @param page_size [::Integer]
-            #     Maximum number of subscriptions to return.
+            #     Optional. Maximum number of subscriptions to return.
             #   @param page_token [::String]
-            #     The value returned by the last `ListSubscriptionsResponse`; indicates that
-            #     this is a continuation of a prior `ListSubscriptions` call, and that the
-            #     system should return the next page of data.
+            #     Optional. The value returned by the last `ListSubscriptionsResponse`;
+            #     indicates that this is a continuation of a prior `ListSubscriptions` call,
+            #     and that the system should return the next page of data.
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Gapic::PagedEnumerable<::Google::Cloud::PubSub::V1::Subscription>]
@@ -646,7 +705,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::ListSubscriptionsRequest.new
@@ -654,13 +713,11 @@ module Google
             #   # Call the list_subscriptions method.
             #   result = client.list_subscriptions request
             #
-            #   # The returned object is of type Gapic::PagedEnumerable. You can
-            #   # iterate over all elements by calling #each, and the enumerable
-            #   # will lazily make API calls to fetch subsequent pages. Other
-            #   # methods are also available for managing paging directly.
-            #   result.each do |response|
+            #   # The returned object is of type Gapic::PagedEnumerable. You can iterate
+            #   # over elements, and API calls will be issued to fetch pages as needed.
+            #   result.each do |item|
             #     # Each element is of type ::Google::Cloud::PubSub::V1::Subscription.
-            #     p response
+            #     p item
             #   end
             #
             def list_subscriptions request, options = nil
@@ -674,10 +731,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.list_subscriptions.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -696,10 +754,10 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :list_subscriptions, request, options: options do |response, operation|
-                response = ::Gapic::PagedEnumerable.new @subscriber_stub, :list_subscriptions, request, response, operation, options
+              @subscription_admin_stub.call_rpc :list_subscriptions, request, options: options do |response, operation|
+                response = ::Gapic::PagedEnumerable.new @subscription_admin_stub, :list_subscriptions, request, response, operation, options
                 yield response, operation if block_given?
-                return response
+                throw :response, response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -743,7 +801,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::DeleteSubscriptionRequest.new
@@ -765,10 +823,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.delete_subscription.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -787,9 +846,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :delete_subscription, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :delete_subscription, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -830,7 +888,8 @@ module Google
             #     delivery to another subscriber client. This typically results in an
             #     increase in the rate of message redeliveries (that is, duplicates).
             #     The minimum deadline you can specify is 0 seconds.
-            #     The maximum deadline you can specify is 600 seconds (10 minutes).
+            #     The maximum deadline you can specify in a single request is 600 seconds
+            #     (10 minutes).
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Google::Protobuf::Empty]
@@ -844,7 +903,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::ModifyAckDeadlineRequest.new
@@ -866,10 +925,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.modify_ack_deadline.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -888,9 +948,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :modify_ack_deadline, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :modify_ack_deadline, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -940,7 +999,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::AcknowledgeRequest.new
@@ -962,10 +1021,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.acknowledge.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -984,18 +1044,15 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :acknowledge, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :acknowledge, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
             end
 
             ##
-            # Pulls messages from the server. The server may return `UNAVAILABLE` if
-            # there are too many concurrent pull requests pending for the given
-            # subscription.
+            # Pulls messages from the server.
             #
             # @overload pull(request, options = nil)
             #   Pass arguments to `pull` via a request object, either of type
@@ -1040,7 +1097,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::PullRequest.new
@@ -1062,10 +1119,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.pull.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1084,9 +1142,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :pull, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :pull, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1094,7 +1151,7 @@ module Google
 
             ##
             # Establishes a stream with the server, which sends messages down to the
-            # client. The client streams acknowledgements and ack deadline modifications
+            # client. The client streams acknowledgments and ack deadline modifications
             # back to the server. The server will close the stream and return the status
             # on any error. The server may close the stream with status `UNAVAILABLE` to
             # reassign server-side resources, in which case, the client should
@@ -1118,24 +1175,24 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
-            #   # Create an input stream
+            #   # Create an input stream.
             #   input = Gapic::StreamInput.new
             #
             #   # Call the streaming_pull method to start streaming.
             #   output = client.streaming_pull input
             #
-            #   # Send requests on the stream. For each request, pass in keyword
-            #   # arguments to set fields. Be sure to close the stream when done.
+            #   # Send requests on the stream. For each request object, set fields by
+            #   # passing keyword arguments. Be sure to close the stream when done.
             #   input << Google::Cloud::PubSub::V1::StreamingPullRequest.new
             #   input << Google::Cloud::PubSub::V1::StreamingPullRequest.new
             #   input.close
             #
-            #   # Handle streamed responses. These may be interleaved with inputs.
-            #   # Each response is of type ::Google::Cloud::PubSub::V1::StreamingPullResponse.
-            #   output.each do |response|
-            #     p response
+            #   # The returned object is a streamed enumerable yielding elements of type
+            #   # ::Google::Cloud::PubSub::V1::StreamingPullResponse
+            #   output.each do |current_response|
+            #     p current_response
             #   end
             #
             def streaming_pull request, options = nil
@@ -1154,10 +1211,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.streaming_pull.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               options.apply_defaults timeout:      @config.rpcs.streaming_pull.timeout,
@@ -1168,9 +1226,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :streaming_pull, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :streaming_pull, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1222,7 +1279,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::ModifyPushConfigRequest.new
@@ -1244,10 +1301,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.modify_push_config.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1266,9 +1324,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :modify_push_config, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :modify_push_config, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1276,10 +1333,10 @@ module Google
 
             ##
             # Gets the configuration details of a snapshot. Snapshots are used in
-            # <a href="https://cloud.google.com/pubsub/docs/replay-overview">Seek</a>
-            # operations, which allow you to manage message acknowledgments in bulk. That
-            # is, you can set the acknowledgment state of messages in an existing
-            # subscription to the state captured by a snapshot.
+            # [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations,
+            # which allow you to manage message acknowledgments in bulk. That is, you can
+            # set the acknowledgment state of messages in an existing subscription to the
+            # state captured by a snapshot.
             #
             # @overload get_snapshot(request, options = nil)
             #   Pass arguments to `get_snapshot` via a request object, either of type
@@ -1312,7 +1369,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::GetSnapshotRequest.new
@@ -1334,10 +1391,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.get_snapshot.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1356,9 +1414,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :get_snapshot, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :get_snapshot, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1390,11 +1447,11 @@ module Google
             #     Required. The name of the project in which to list snapshots.
             #     Format is `projects/{project-id}`.
             #   @param page_size [::Integer]
-            #     Maximum number of snapshots to return.
+            #     Optional. Maximum number of snapshots to return.
             #   @param page_token [::String]
-            #     The value returned by the last `ListSnapshotsResponse`; indicates that this
-            #     is a continuation of a prior `ListSnapshots` call, and that the system
-            #     should return the next page of data.
+            #     Optional. The value returned by the last `ListSnapshotsResponse`; indicates
+            #     that this is a continuation of a prior `ListSnapshots` call, and that the
+            #     system should return the next page of data.
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Gapic::PagedEnumerable<::Google::Cloud::PubSub::V1::Snapshot>]
@@ -1408,7 +1465,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::ListSnapshotsRequest.new
@@ -1416,13 +1473,11 @@ module Google
             #   # Call the list_snapshots method.
             #   result = client.list_snapshots request
             #
-            #   # The returned object is of type Gapic::PagedEnumerable. You can
-            #   # iterate over all elements by calling #each, and the enumerable
-            #   # will lazily make API calls to fetch subsequent pages. Other
-            #   # methods are also available for managing paging directly.
-            #   result.each do |response|
+            #   # The returned object is of type Gapic::PagedEnumerable. You can iterate
+            #   # over elements, and API calls will be issued to fetch pages as needed.
+            #   result.each do |item|
             #     # Each element is of type ::Google::Cloud::PubSub::V1::Snapshot.
-            #     p response
+            #     p item
             #   end
             #
             def list_snapshots request, options = nil
@@ -1436,10 +1491,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.list_snapshots.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1458,10 +1514,10 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :list_snapshots, request, options: options do |response, operation|
-                response = ::Gapic::PagedEnumerable.new @subscriber_stub, :list_snapshots, request, response, operation, options
+              @subscription_admin_stub.call_rpc :list_snapshots, request, options: options do |response, operation|
+                response = ::Gapic::PagedEnumerable.new @subscription_admin_stub, :list_snapshots, request, response, operation, options
                 yield response, operation if block_given?
-                return response
+                throw :response, response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1481,7 +1537,7 @@ module Google
             # the request, the server will assign a random
             # name for this snapshot on the same project as the subscription, conforming
             # to the [resource name format]
-            # (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+            # (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
             # generated name is populated in the returned Snapshot object. Note that for
             # REST API requests, you must specify a name in the request.
             #
@@ -1504,9 +1560,9 @@ module Google
             #     Required. 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}`.
+            #     must specify a name.  See the [resource name
+            #     rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+            #     Format is `projects/{project}/snapshots/{snap}`.
             #   @param subscription [::String]
             #     Required. The subscription whose backlog the snapshot retains.
             #     Specifically, the created snapshot is guaranteed to retain:
@@ -1518,8 +1574,8 @@ module Google
             #          successful completion of the CreateSnapshot request.
             #     Format is `projects/{project}/subscriptions/{sub}`.
             #   @param labels [::Hash{::String => ::String}]
-            #     See <a href="https://cloud.google.com/pubsub/docs/labels"> Creating and
-            #     managing labels</a>.
+            #     Optional. See [Creating and managing
+            #     labels](https://cloud.google.com/pubsub/docs/labels).
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Google::Cloud::PubSub::V1::Snapshot]
@@ -1533,7 +1589,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::CreateSnapshotRequest.new
@@ -1555,10 +1611,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.create_snapshot.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1577,21 +1634,20 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :create_snapshot, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :create_snapshot, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
             end
 
             ##
-            # Updates an existing snapshot. Snapshots are used in
-            # <a href="https://cloud.google.com/pubsub/docs/replay-overview">Seek</a>
-            # operations, which allow
-            # you to manage message acknowledgments in bulk. That is, you can set the
-            # acknowledgment state of messages in an existing subscription to the state
-            # captured by a snapshot.
+            # Updates an existing snapshot by updating the fields specified in the update
+            # mask. Snapshots are used in
+            # [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations,
+            # which allow you to manage message acknowledgments in bulk. That is, you can
+            # set the acknowledgment state of messages in an existing subscription to the
+            # state captured by a snapshot.
             #
             # @overload update_snapshot(request, options = nil)
             #   Pass arguments to `update_snapshot` via a request object, either of type
@@ -1626,7 +1682,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::UpdateSnapshotRequest.new
@@ -1648,10 +1704,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.update_snapshot.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1670,9 +1727,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :update_snapshot, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :update_snapshot, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1720,7 +1776,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::DeleteSnapshotRequest.new
@@ -1742,10 +1798,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.delete_snapshot.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1764,9 +1821,8 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :delete_snapshot, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :delete_snapshot, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
@@ -1799,7 +1855,7 @@ module Google
             #   @param subscription [::String]
             #     Required. The subscription to affect.
             #   @param time [::Google::Protobuf::Timestamp, ::Hash]
-            #     The time to seek to.
+            #     Optional. The time to seek to.
             #     Messages retained in the subscription that were published before this
             #     time are marked as acknowledged, and messages retained in the
             #     subscription that were published after this time are marked as
@@ -1810,10 +1866,14 @@ module Google
             #     window (or to a point before the system's notion of the subscription
             #     creation time), only retained messages will be marked as unacknowledged,
             #     and already-expunged messages will not be restored.
+            #
+            #     Note: The following parameters are mutually exclusive: `time`, `snapshot`. At most one of these parameters can be set. If more than one is set, only one will be used, and it is not defined which one.
             #   @param snapshot [::String]
-            #     The snapshot to seek to. The snapshot's topic must be the same as that of
-            #     the provided subscription.
-            #     Format is `projects/{project}/snapshots/{snap}`.
+            #     Optional. The snapshot to seek to. The snapshot's topic must be the same
+            #     as that of the provided subscription. Format is
+            #     `projects/{project}/snapshots/{snap}`.
+            #
+            #     Note: The following parameters are mutually exclusive: `snapshot`, `time`. At most one of these parameters can be set. If more than one is set, only one will be used, and it is not defined which one.
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Google::Cloud::PubSub::V1::SeekResponse]
@@ -1827,7 +1887,7 @@ module Google
             #   require "google/cloud/pubsub/v1"
             #
             #   # Create a client object. The client can be reused for multiple calls.
-            #   client = Google::Cloud::PubSub::V1::Subscriber::Client.new
+            #   client = Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new
             #
             #   # Create a request. To set request fields, pass in keyword arguments.
             #   request = Google::Cloud::PubSub::V1::SeekRequest.new
@@ -1849,10 +1909,11 @@ module Google
               # Customize the options with defaults
               metadata = @config.rpcs.seek.metadata.to_h
 
-              # Set x-goog-api-client and x-goog-user-project headers
+              # Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
               metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
                 lib_name: @config.lib_name, lib_version: @config.lib_version,
                 gapic_version: ::Google::Cloud::PubSub::V1::VERSION
+              metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
               metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 
               header_params = {}
@@ -1871,22 +1932,21 @@ module Google
                                      metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
-              @subscriber_stub.call_rpc :seek, request, options: options do |response, operation|
+              @subscription_admin_stub.call_rpc :seek, request, options: options do |response, operation|
                 yield response, operation if block_given?
-                return response
               end
             rescue ::GRPC::BadStatus => e
               raise ::Google::Cloud::Error.from_error(e)
             end
 
             ##
-            # Configuration class for the Subscriber API.
+            # Configuration class for the SubscriptionAdmin API.
             #
-            # This class represents the configuration for Subscriber,
+            # This class represents the configuration for SubscriptionAdmin,
             # providing control over timeouts, retry behavior, logging, transport
             # parameters, and other low-level controls. Certain parameters can also be
             # applied individually to specific RPCs. See
-            # {::Google::Cloud::PubSub::V1::Subscriber::Client::Configuration::Rpcs}
+            # {::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client::Configuration::Rpcs}
             # for a list of RPCs that can be configured independently.
             #
             # Configuration can be applied globally to all clients, or to a single client
@@ -1897,32 +1957,39 @@ module Google
             #   # Modify the global config, setting the timeout for
             #   # create_subscription to 20 seconds,
             #   # and all remaining timeouts to 10 seconds.
-            #   ::Google::Cloud::PubSub::V1::Subscriber::Client.configure do |config|
+            #   ::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.configure do |config|
             #     config.timeout = 10.0
             #     config.rpcs.create_subscription.timeout = 20.0
             #   end
             #
             #   # Apply the above configuration only to a new client.
-            #   client = ::Google::Cloud::PubSub::V1::Subscriber::Client.new do |config|
+            #   client = ::Google::Cloud::PubSub::V1::SubscriptionAdmin::Client.new do |config|
             #     config.timeout = 10.0
             #     config.rpcs.create_subscription.timeout = 20.0
             #   end
             #
             # @!attribute [rw] endpoint
-            #   The hostname or hostname:port of the service endpoint.
-            #   Defaults to `"pubsub.googleapis.com"`.
-            #   @return [::String]
+            #   A custom service endpoint, as a hostname or hostname:port. The default is
+            #   nil, indicating to use the default endpoint in the current universe domain.
+            #   @return [::String,nil]
             # @!attribute [rw] credentials
             #   Credentials to send with calls. You may provide any of the following types:
             #    *  (`String`) The path to a service account key file in JSON format
             #    *  (`Hash`) A service account key as a Hash
             #    *  (`Google::Auth::Credentials`) A googleauth credentials object
-            #       (see the [googleauth docs](https://googleapis.dev/ruby/googleauth/latest/index.html))
+            #       (see the [googleauth docs](https://rubydoc.info/gems/googleauth/Google/Auth/Credentials))
             #    *  (`Signet::OAuth2::Client`) A signet oauth2 client object
-            #       (see the [signet docs](https://googleapis.dev/ruby/signet/latest/Signet/OAuth2/Client.html))
+            #       (see the [signet docs](https://rubydoc.info/gems/signet/Signet/OAuth2/Client))
             #    *  (`GRPC::Core::Channel`) a gRPC channel with included credentials
             #    *  (`GRPC::Core::ChannelCredentials`) a gRPC credentails object
             #    *  (`nil`) indicating no credentials
+            #
+            #   Warning: If you accept a credential configuration (JSON file or Hash) from an
+            #   external source for authentication to Google Cloud, you must validate it before
+            #   providing it to a Google API client library. Providing an unvalidated credential
+            #   configuration to Google APIs can compromise the security of your systems and data.
+            #   For more information, refer to [Validate credential configurations from external
+            #   sources](https://cloud.google.com/docs/authentication/external/externally-sourced-credentials).
             #   @return [::Object]
             # @!attribute [rw] scope
             #   The OAuth scopes
@@ -1957,14 +2024,28 @@ module Google
             # @!attribute [rw] quota_project
             #   A separate project against which to charge quota.
             #   @return [::String]
+            # @!attribute [rw] universe_domain
+            #   The universe domain within which to make requests. This determines the
+            #   default endpoint URL. The default value of nil uses the environment
+            #   universe (usually the default "googleapis.com" universe).
+            #   @return [::String,nil]
+            # @!attribute [rw] logger
+            #   A custom logger to use for request/response debug logging, or the value
+            #   `:default` (the default) to construct a default logger, or `nil` to
+            #   explicitly disable logging.
+            #   @return [::Logger,:default,nil]
             #
             class Configuration
               extend ::Gapic::Config
 
-              config_attr :endpoint,      "pubsub.googleapis.com", ::String
+              # @private
+              # The endpoint specific to the default "googleapis.com" universe. Deprecated.
+              DEFAULT_ENDPOINT = "pubsub.googleapis.com"
+
+              config_attr :endpoint,      nil, ::String, nil
               config_attr :credentials,   nil do |value|
-                allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
-                allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
+                allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Google::Auth::BaseClient, ::Signet::OAuth2::Client, nil]
+                allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC::Core::Channel
                 allowed.any? { |klass| klass === value }
               end
               config_attr :scope,         nil, ::String, ::Array, nil
@@ -1976,6 +2057,8 @@ module Google
               config_attr :metadata,      nil, ::Hash, nil
               config_attr :retry_policy,  nil, ::Hash, ::Proc, nil
               config_attr :quota_project, nil, ::String, nil
+              config_attr :universe_domain, nil, ::String, nil
+              config_attr :logger, :default, ::Logger, nil, :default
 
               # @private
               def initialize parent_config = nil
@@ -1997,7 +2080,15 @@ module Google
               end
 
               ##
-              # Configuration RPC class for the Subscriber API.
+              # Configuration for the channel pool
+              # @return [::Gapic::ServiceStub::ChannelPool::Configuration]
+              #
+              def channel_pool
+                @channel_pool ||= ::Gapic::ServiceStub::ChannelPool::Configuration.new
+              end
+
+              ##
+              # Configuration RPC class for the SubscriptionAdmin API.
               #
               # Includes fields providing the configuration for each RPC in this service.
               # Each configuration object is of type `Gapic::Config::Method` and includes