google-cloud-pubsub 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176ccfcca66573d1d858c76096cf3e2cbb437163aeaf0993df5e394594158a4d
-  data.tar.gz: 02c9e180e88ef9a5d87e68677fe40814b26a903fb65aa994ae50473080f2d27c
+  metadata.gz: f5faee5de29df83057422ad7029a047eb10e8408a9b4e87599d301bc1c907a06
+  data.tar.gz: bc9d9b75232d66b09b5d45310875fbbd734663cf226575e43656da47aa955204
 SHA512:
-  metadata.gz: 2a1b5a6de847eb054cf72ec388eca205cf5e3a03dc00b0125ef9a9a0eb2bcd94fb21389f3cef3b56983e59e9f2a11672d02f5a2b7005be7e2658a60633798896
-  data.tar.gz: 1c81891756ab4f80a54ed12663a9a339b0e1ba57f821e3ee7f5f0a545a60b6cec4b5c94828bc888bc5b51cf4ab947a642ce3895b8103bc4824ce3026fac56d49
+  metadata.gz: b59bc075932f2a592276a8e0472371a18a8cc6e835ccb6c36ece17f277528bf92813d978e06393cf384c54c282c8a04fa6ba1d2fcfab08214e3cb3a55d2724ac
+  data.tar.gz: 8a6fffc01ab630eaf960c3c87858f942fe6a0241cfdf024875d379f2a915be724ea209bcfdc07c7ab12a1299949785456c27f0725d6d4b4cac519749cbc6f1fc

data/AUTHENTICATION.md

@@ -76,7 +76,8 @@ The environment variables that google-cloud-pubsub checks for project ID are:
 1. `PUBSUB_PROJECT`
 2. `GOOGLE_CLOUD_PROJECT`
 
-The environment variables that google-cloud-pubsub checks for credentials are configured on {Google::Cloud::PubSub::V1::Credentials}:
+The environment variables that google-cloud-pubsub checks for credentials
+are configured on {Google::Cloud::PubSub::Credentials}:
 
 1. `PUBSUB_CREDENTIALS` - Path to JSON file, or JSON contents
 2. `PUBSUB_KEYFILE` - Path to JSON file, or JSON contents

data/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Release History
 
+### 2.0.0 / 2020-08-06
+
+This is a major update that removes the "low-level" client interface code, and
+instead adds the new `google-cloud-pubsub-v1` gem as a dependency.
+The new dependency is a rewritten low-level client, produced by a next-
+generation client code generator, with improved performance and stability.
+
+This change should have no effect on the high-level interface that most users
+will use. The one exception is that the (mostly undocumented) `client_config`
+argument, for adjusting low-level parameters such as RPC retry settings on
+client objects, has been removed. If you need to adjust these parameters, use
+the configuration interface in `google-cloud-pubsub-v1`.
+
+Substantial changes have been made in the low-level interfaces, however. If you
+are using the low-level classes under the `Google::Cloud::PubSub::V1` module,
+please review the docs for the new `google-cloud-pubsub-v1` gem. In
+particular:
+
+* Some classes have been renamed, notably the client classes themselves.
+* The client constructor takes a configuration block instead of configuration
+  keyword arguments.
+* All RPC method arguments are now keyword arguments.
+
+### 1.10.0 / 2020-07-23
+
+#### Features
+
+* Add Subscription#detach and #detached?
+
+### 1.9.0 / 2020-07-21
+
+#### Features
+
+* Add support for server-side flow control
+
+### 1.8.0 / 2020-06-29
+
+#### Features
+
+* Add Subscription#filter
+
+### 1.7.1 / 2020-05-28
+
+#### Documentation
+
+* Fix a few broken links
+
 ### 1.7.0 / 2020-05-21
 
 #### Features

data/TROUBLESHOOTING.md

@@ -24,14 +24,8 @@ improved, *please* create a new issue on GitHub so we can talk about it.
 
   - [New issue][gh-ruby]
 
-Or, you can ask questions on the [Google Cloud Platform Slack][slack-ruby]. You
-can use the "ruby" channel for general Ruby questions, or use the
-"google-cloud-ruby" channel if you have questions about this gem in particular.
-
 [so-ruby]: http://stackoverflow.com/questions/tagged/google-cloud-platform+ruby+pubsub
 
-[gh-search-ruby]: https://github.com/googlecloudplatform/google-cloud-ruby/issues?q=label%3A%22api%3A+pubsub%22
-
-[gh-ruby]: https://github.com/googlecloudplatform/google-cloud-ruby/issues/new
+[gh-search-ruby]: https://github.com/googleapis/google-cloud-ruby/issues?q=label%3A%22api%3A+pubsub%22
 
-[slack-ruby]: https://gcp-slack.appspot.com/
+[gh-ruby]: https://github.com/googleapis/google-cloud-ruby/issues/new

data/lib/google-cloud-pubsub.rb

@@ -42,8 +42,6 @@ module Google
     #
     #   * `https://www.googleapis.com/auth/pubsub`
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     #
     # @return [Google::Cloud::PubSub::Project]
     #
@@ -62,9 +60,9 @@ module Google
     #   platform_scope = "https://www.googleapis.com/auth/cloud-platform"
     #   pubsub = gcloud.pubsub scope: platform_scope
     #
-    def pubsub scope: nil, timeout: nil, client_config: nil
+    def pubsub scope: nil, timeout: nil
       timeout ||= @timeout
-      Google::Cloud.pubsub @project, @keyfile, scope: scope, timeout: timeout, client_config: client_config
+      Google::Cloud.pubsub @project, @keyfile, scope: scope, timeout: timeout
     end
 
     ##
@@ -90,8 +88,6 @@ module Google
     #
     #   * `https://www.googleapis.com/auth/pubsub`
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     #
     # @return [Google::Cloud::PubSub::Project]
     #
@@ -103,11 +99,12 @@ module Google
     #   topic = pubsub.topic "my-topic"
     #   topic.publish "task completed"
     #
-    def self.pubsub project_id = nil, credentials = nil, scope: nil,
-                    timeout: nil, client_config: nil
+    def self.pubsub project_id = nil,
+                    credentials = nil,
+                    scope: nil,
+                    timeout: nil
       require "google/cloud/pubsub"
-      Google::Cloud::PubSub.new project_id: project_id, credentials: credentials,
-                                scope: scope, timeout: timeout, client_config: client_config
+      Google::Cloud::PubSub.new project_id: project_id, credentials: credentials, scope: scope, timeout: timeout
     end
   end
 end
@@ -125,15 +122,18 @@ Google::Cloud.configure.add_config! :pubsub do |config|
   default_emulator = Google::Cloud::Config.deferred do
     ENV["PUBSUB_EMULATOR_HOST"]
   end
+  default_scopes = [
+    "https://www.googleapis.com/auth/cloud-platform",
+    "https://www.googleapis.com/auth/pubsub"
+  ]
 
   config.add_field! :project_id, default_project, match: String, allow_nil: true
   config.add_alias! :project, :project_id
   config.add_field! :credentials, default_creds, match: [String, Hash, Google::Auth::Credentials], allow_nil: true
   config.add_alias! :keyfile, :credentials
-  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :scope, default_scopes, match: [String, Array]
   config.add_field! :timeout, nil, match: Integer
-  config.add_field! :client_config, nil, match: Hash
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :on_error, nil, match: Proc
-  config.add_field! :endpoint, nil, match: String
+  config.add_field! :endpoint, "pubsub.googleapis.com", match: String
 end

data/lib/google/cloud/pubsub.rb

@@ -57,8 +57,6 @@ module Google
       #
       #   * `https://www.googleapis.com/auth/pubsub`
       # @param [Integer] timeout Default timeout to use in requests. Optional.
-      # @param [Hash] client_config A hash of values to override the default
-      #   behavior of the API client. Optional.
       # @param [String] endpoint Override of the endpoint host name. Optional.
       #   If the param is nil, uses the default endpoint.
       # @param [String] emulator_host Pub/Sub emulator host. Optional.
@@ -77,12 +75,17 @@ module Google
       #   topic = pubsub.topic "my-topic"
       #   topic.publish "task completed"
       #
-      def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil, client_config: nil, endpoint: nil,
-                   emulator_host: nil, project: nil, keyfile: nil
+      def self.new project_id: nil,
+                   credentials: nil,
+                   scope: nil,
+                   timeout: nil,
+                   endpoint: nil,
+                   emulator_host: nil,
+                   project: nil,
+                   keyfile: nil
         project_id    ||= (project || default_project_id)
         scope         ||= configure.scope
         timeout       ||= configure.timeout
-        client_config ||= configure.client_config
         endpoint      ||= configure.endpoint
         emulator_host ||= configure.emulator_host
 
@@ -90,11 +93,8 @@ module Google
           project_id = project_id.to_s # Always cast to a string
           raise ArgumentError, "project_id is missing" if project_id.empty?
 
-          return PubSub::Project.new(
-            PubSub::Service.new(
-              project_id, :this_channel_is_insecure, host: emulator_host, timeout: timeout, client_config: client_config
-            )
-          )
+          service = PubSub::Service.new project_id, :this_channel_is_insecure, host: emulator_host, timeout: timeout
+          return PubSub::Project.new service
         end
 
         credentials ||= (keyfile || default_credentials(scope: scope))
@@ -106,11 +106,8 @@ module Google
         project_id = project_id.to_s # Always cast to a string
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        PubSub::Project.new(
-          PubSub::Service.new(
-            project_id, credentials, timeout: timeout, host: endpoint, client_config: client_config
-          )
-        )
+        service = PubSub::Service.new project_id, credentials, host: endpoint, timeout: timeout
+        PubSub::Project.new service
       end
 
       # rubocop:enable Metrics/AbcSize
@@ -131,8 +128,6 @@ module Google
       # * `retries` - (Integer) Number of times to retry requests on server
       #   error.
       # * `timeout` - (Integer) Default timeout to use in requests.
-      # * `client_config` - (Hash) A hash of values to override the default
-      #   behavior of the API client.
       # * `endpoint` - (String) Override of the endpoint host name, or `nil`
       #   to use the default endpoint.
       # * `emulator_host` - (String) Host name of the emulator. Defaults to
@@ -167,7 +162,9 @@ module Google
       end
     end
 
-    ## Legacy namespace
+    ## Legacy veneer namespace
     Pubsub = PubSub unless const_defined? :Pubsub
   end
+  ## Legacy generated client namespace
+  Pubsub = Cloud::PubSub unless const_defined? :Pubsub
 end

data/lib/google/cloud/pubsub/async_publisher.rb

@@ -374,8 +374,7 @@ module Google
 
         PUBLISH_RETRY_ERRORS = [
           GRPC::Cancelled, GRPC::DeadlineExceeded, GRPC::Internal,
-          GRPC::ResourceExhausted, GRPC::Unauthenticated, GRPC::Unavailable,
-          GRPC::Core::CallError
+          GRPC::ResourceExhausted, GRPC::Unauthenticated, GRPC::Unavailable
         ].freeze
 
         def publish_batch_error_retryable? error

data/lib/google/cloud/pubsub/credentials.rb

@@ -14,7 +14,7 @@
 
 
 require "googleauth"
-require "google/cloud/pubsub/v1/credentials.rb"
+require "google/cloud/pubsub/v1/publisher/credentials.rb"
 
 module Google
   module Cloud
@@ -38,7 +38,7 @@ module Google
       #
       #   pubsub.project_id #=> "my-project"
       #
-      class Credentials < Google::Cloud::PubSub::V1::Credentials
+      class Credentials < Google::Cloud::PubSub::V1::Publisher::Credentials
       end
     end
 

data/lib/google/cloud/pubsub/service.rb

@@ -18,17 +18,15 @@ require "google/cloud/pubsub/credentials"
 require "google/cloud/pubsub/convert"
 require "google/cloud/pubsub/version"
 require "google/cloud/pubsub/v1"
-require "google/gax/errors"
 require "securerandom"
 
 module Google
   module Cloud
     module PubSub
       ##
-      # @private Represents the GAX Pub/Sub service, including all the API
-      # methods.
+      # @private Represents the Pub/Sub service API, including IAM mixins.
       class Service
-        attr_accessor :project, :credentials, :host, :timeout, :client_config
+        attr_accessor :project, :credentials, :host, :timeout
         ###
         # The same client_id is used across all streaming pull connections that are created by this client. This is
         # intentional, as it indicates to the server that any guarantees, such as message ordering, made for a stream
@@ -38,44 +36,25 @@ module Google
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil,
-                       client_config: nil
+        def initialize project, credentials, host: nil, timeout: nil
           @project = project
           @credentials = credentials
-          @host = host || V1::PublisherClient::SERVICE_ADDRESS
+          @host = host
           @timeout = timeout
-          @client_config = client_config || {}
           @client_id = SecureRandom.uuid.freeze
         end
 
-        def channel
-          require "grpc"
-          GRPC::Core::Channel.new host, chan_args, chan_creds
-        end
-
-        def chan_args
-          { "grpc.max_send_message_length"           => -1,
-            "grpc.max_receive_message_length"        => -1,
-            "grpc.keepalive_time_ms"                 => 300_000,
-            "grpc.service_config_disable_resolution" => 1 }
-        end
-
-        def chan_creds
-          return credentials if insecure?
-          require "grpc"
-          GRPC::Core::ChannelCredentials.new.compose GRPC::Core::CallCredentials.new credentials.client.updater_proc
-        end
-
         def subscriber
           return mocked_subscriber if mocked_subscriber
           @subscriber ||= begin
-            V1::SubscriberClient.new(
-              credentials:   channel,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::PubSub::VERSION
-            )
+            V1::Subscriber::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::PubSub::VERSION
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            end
           end
         end
         attr_accessor :mocked_subscriber
@@ -83,20 +62,32 @@ module Google
         def publisher
           return mocked_publisher if mocked_publisher
           @publisher ||= begin
-            V1::PublisherClient.new(
-              credentials:   channel,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::PubSub::VERSION
-            )
+            V1::Publisher::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::PubSub::VERSION
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            end
           end
         end
         attr_accessor :mocked_publisher
 
-        def insecure?
-          credentials == :this_channel_is_insecure
+        def iam
+          return mocked_iam if mocked_iam
+          @iam ||= begin
+            V1::IAMPolicy::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::PubSub::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
+          end
         end
+        attr_accessor :mocked_iam
 
         ##
         # Gets the configuration of a topic.
@@ -105,30 +96,17 @@ module Google
         # If other attributes are added in the future,
         # they will be returned here.
         def get_topic topic_name, options = {}
-          execute do
-            publisher.get_topic topic_path(topic_name, options),
-                                options: default_options
-          end
+          publisher.get_topic topic: topic_path(topic_name, options)
         end
 
         ##
         # Lists matching topics.
         def list_topics options = {}
-          call_options = default_options
-          if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
+          paged_enum = publisher.list_topics project:    project_path(options),
+                                             page_size:  options[:max],
+                                             page_token: options[:token]
 
-          execute do
-            paged_enum = publisher.list_topics project_path(options),
-                                               page_size: options[:max],
-                                               options:   call_options
-
-            paged_enum.page.response
-          end
+          paged_enum.response
         end
 
         ##
@@ -140,21 +118,16 @@ module Google
             }
           end
 
-          execute do
-            publisher.create_topic \
-              topic_path(topic_name, options),
-              labels:                 labels,
-              kms_key_name:           kms_key_name,
-              message_storage_policy: message_storage_policy,
-              options:                default_options
-          end
+          publisher.create_topic \
+            name:                   topic_path(topic_name, options),
+            labels:                 labels,
+            kms_key_name:           kms_key_name,
+            message_storage_policy: message_storage_policy
         end
 
         def update_topic topic_obj, *fields
           mask = Google::Protobuf::FieldMask.new paths: fields.map(&:to_s)
-          execute do
-            publisher.update_topic topic_obj, mask, options: default_options
-          end
+          publisher.update_topic topic: topic_obj, update_mask: mask
         end
 
         ##
@@ -163,10 +136,7 @@ module Google
         # exist. After a topic is deleted, a new topic may be created with the
         # same name.
         def delete_topic topic_name
-          execute do
-            publisher.delete_topic topic_path(topic_name),
-                                   options: default_options
-          end
+          publisher.delete_topic topic: topic_path(topic_name)
         end
 
         ##
@@ -175,143 +145,98 @@ module Google
         # The messages parameter is an array of arrays.
         # The first element is the data, second is attributes hash.
         def publish topic, messages
-          execute do
-            publisher.publish topic_path(topic), messages,
-                              options: default_options
-          end
+          publisher.publish topic: topic_path(topic), messages: messages
         end
 
         ##
         # Gets the details of a subscription.
         def get_subscription subscription_name, options = {}
-          subscription = subscription_path subscription_name, options
-          execute do
-            subscriber.get_subscription subscription, options: default_options
-          end
+          subscriber.get_subscription subscription: subscription_path(subscription_name, options)
         end
 
         ##
         # Lists matching subscriptions by project and topic.
         def list_topics_subscriptions topic, options = {}
-          call_options = default_options
-          if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = publisher.list_topic_subscriptions \
-              topic_path(topic, options),
-              page_size: options[:max],
-              options:   call_options
-
-            paged_enum.page.response
-          end
+          publisher.list_topic_subscriptions topic:      topic_path(topic, options),
+                                             page_size:  options[:max],
+                                             page_token: options[:token]
         end
 
         ##
         # Lists matching subscriptions by project.
         def list_subscriptions options = {}
-          call_options = default_options
-          if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
+          paged_enum = subscriber.list_subscriptions project:    project_path(options),
+                                                     page_size:  options[:max],
+                                                     page_token: options[:token]
 
-          execute do
-            paged_enum = subscriber.list_subscriptions project_path(options),
-                                                       page_size: options[:max],
-                                                       options:   call_options
-
-            paged_enum.page.response
-          end
+          paged_enum.response
         end
 
         ##
         # Creates a subscription on a given topic for a given subscriber.
         def create_subscription topic, subscription_name, options = {}
-          name = subscription_path subscription_name, options
-          topic = topic_path topic
           push_config = if options[:endpoint]
                           Google::Cloud::PubSub::V1::PushConfig.new \
                             push_endpoint: options[:endpoint],
                             attributes:    (options[:attributes] || {}).to_h
                         end
-          deadline = options[:deadline]
-          retain_acked = options[:retain_acked]
-          mrd = Convert.number_to_duration options[:retention]
-          labels = options[:labels]
-          message_ordering = options[:message_ordering]
-          execute do
-            subscriber.create_subscription \
-              name, topic,
-              push_config:                push_config,
-              ack_deadline_seconds:       deadline,
-              retain_acked_messages:      retain_acked,
-              message_retention_duration: mrd,
-              labels:                     labels,
-              enable_message_ordering:    message_ordering,
-              dead_letter_policy:         dead_letter_policy(options),
-              retry_policy:               options[:retry_policy],
-              options:                    default_options
-          end
+          subscriber.create_subscription \
+            name:                       subscription_path(subscription_name, options),
+            topic:                      topic_path(topic),
+            push_config:                push_config,
+            ack_deadline_seconds:       options[:deadline],
+            retain_acked_messages:      options[:retain_acked],
+            message_retention_duration: Convert.number_to_duration(options[:retention]),
+            labels:                     options[:labels],
+            enable_message_ordering:    options[:message_ordering],
+            filter:                     options[:filter],
+            dead_letter_policy:         dead_letter_policy(options),
+            retry_policy:               options[:retry_policy]
         end
 
         def update_subscription subscription_obj, *fields
           mask = Google::Protobuf::FieldMask.new paths: fields.map(&:to_s)
-          execute do
-            subscriber.update_subscription subscription_obj, mask, options: default_options
-          end
+          subscriber.update_subscription subscription: subscription_obj, update_mask: mask
         end
 
         ##
-        # Deletes an existing subscription.
-        # All pending messages in the subscription are immediately dropped.
+        # Deletes an existing subscription. All pending messages in the subscription are immediately dropped.
         def delete_subscription subscription
-          execute do
-            subscriber.delete_subscription subscription_path(subscription),
-                                           options: default_options
-          end
+          subscriber.delete_subscription subscription: subscription_path(subscription)
+        end
+
+        ##
+        # Detaches a subscription from its topic. All messages retained in the subscription are dropped. Subsequent
+        # `Pull` and `StreamingPull` requests will raise `FAILED_PRECONDITION`. If the subscription is a push
+        # subscription, pushes to the endpoint will stop.
+        def detach_subscription subscription
+          publisher.detach_subscription subscription: subscription_path(subscription)
         end
 
         ##
         # Pulls a single message from the server.
         def pull subscription, options = {}
-          subscription = subscription_path subscription, options
           max_messages = options.fetch(:max, 100).to_i
           return_immediately = !(!options.fetch(:immediate, true))
 
-          execute do
-            subscriber.pull subscription,
-                            max_messages,
-                            return_immediately: return_immediately,
-                            options:            default_options
-          end
+          subscriber.pull subscription:       subscription_path(subscription, options),
+                          max_messages:       max_messages,
+                          return_immediately: return_immediately
         end
 
         def streaming_pull request_enum
-          execute do
-            subscriber.streaming_pull request_enum, options: default_options
-          end
+          subscriber.streaming_pull request_enum
         end
 
         ##
         # Acknowledges receipt of a message.
         def acknowledge subscription, *ack_ids
-          execute do
-            subscriber.acknowledge subscription_path(subscription), ack_ids,
-                                   options: default_options
-          end
+          subscriber.acknowledge subscription: subscription_path(subscription), ack_ids: ack_ids
         end
 
         ##
         # Modifies the PushConfig for a specified subscription.
         def modify_push_config subscription, endpoint, attributes
-          subscription = subscription_path subscription
           # Convert attributes to strings to match the protobuf definition
           attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
           push_config = Google::Cloud::PubSub::V1::PushConfig.new(
@@ -319,138 +244,83 @@ module Google
             attributes:    attributes
           )
 
-          execute do
-            subscriber.modify_push_config subscription, push_config,
-                                          options: default_options
-          end
+          subscriber.modify_push_config subscription: subscription_path(subscription),
+                                        push_config:  push_config
         end
 
         ##
         # Modifies the ack deadline for a specific message.
         def modify_ack_deadline subscription, ids, deadline
-          execute do
-            subscriber.modify_ack_deadline subscription_path(subscription),
-                                           Array(ids),
-                                           deadline, options: default_options
-          end
+          subscriber.modify_ack_deadline subscription:         subscription_path(subscription),
+                                         ack_ids:              Array(ids),
+                                         ack_deadline_seconds: deadline
         end
 
         ##
         # Lists snapshots by project.
         def list_snapshots options = {}
-          call_options = default_options
-          if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = subscriber.list_snapshots project_path(options),
-                                                   page_size: options[:max],
-                                                   options:   call_options
+          paged_enum = subscriber.list_snapshots project:    project_path(options),
+                                                 page_size:  options[:max],
+                                                 page_token: options[:token]
 
-            paged_enum.page.response
-          end
+          paged_enum.response
         end
 
         ##
         # Creates a snapshot on a given subscription.
         def create_snapshot subscription, snapshot_name, labels: nil
-          name = snapshot_path snapshot_name
-          execute do
-            subscriber.create_snapshot name,
-                                       subscription_path(subscription),
-                                       labels:  labels,
-                                       options: default_options
-          end
+          subscriber.create_snapshot name:         snapshot_path(snapshot_name),
+                                     subscription: subscription_path(subscription),
+                                     labels:       labels
         end
 
         def update_snapshot snapshot_obj, *fields
           mask = Google::Protobuf::FieldMask.new paths: fields.map(&:to_s)
-          execute do
-            subscriber.update_snapshot snapshot_obj, mask, options: default_options
-          end
+          subscriber.update_snapshot snapshot: snapshot_obj, update_mask: mask
         end
 
         ##
         # Deletes an existing snapshot.
         # All pending messages in the snapshot are immediately dropped.
         def delete_snapshot snapshot
-          execute do
-            subscriber.delete_snapshot snapshot_path(snapshot),
-                                       options: default_options
-          end
+          subscriber.delete_snapshot snapshot: snapshot_path(snapshot)
         end
 
         ##
         # Adjusts the given subscription to a time or snapshot.
         def seek subscription, time_or_snapshot
-          subscription = subscription_path subscription
-          execute do
-            if a_time? time_or_snapshot
-              time = Convert.time_to_timestamp time_or_snapshot
-              subscriber.seek subscription, time: time, options: default_options
-            else
-              time_or_snapshot = time_or_snapshot.name if time_or_snapshot.is_a? Snapshot
-              subscriber.seek subscription,
-                              snapshot: snapshot_path(time_or_snapshot),
-                              options:  default_options
-            end
+          if a_time? time_or_snapshot
+            time = Convert.time_to_timestamp time_or_snapshot
+            subscriber.seek subscription: subscription, time: time
+          else
+            time_or_snapshot = time_or_snapshot.name if time_or_snapshot.is_a? Snapshot
+            subscriber.seek subscription: subscription_path(subscription),
+                            snapshot:     snapshot_path(time_or_snapshot)
           end
         end
 
         def get_topic_policy topic_name, options = {}
-          execute do
-            publisher.get_iam_policy topic_path(topic_name, options),
-                                     options: default_options
-          end
+          iam.get_iam_policy resource: topic_path(topic_name, options)
         end
 
         def set_topic_policy topic_name, new_policy, options = {}
-          resource = topic_path topic_name, options
-
-          execute do
-            publisher.set_iam_policy resource, new_policy,
-                                     options: default_options
-          end
+          iam.set_iam_policy resource: topic_path(topic_name, options), policy: new_policy
         end
 
         def test_topic_permissions topic_name, permissions, options = {}
-          resource = topic_path topic_name, options
-
-          execute do
-            publisher.test_iam_permissions resource, permissions,
-                                           options: default_options
-          end
+          iam.test_iam_permissions resource: topic_path(topic_name, options), permissions: permissions
         end
 
         def get_subscription_policy subscription_name, options = {}
-          resource = subscription_path subscription_name, options
-
-          execute do
-            subscriber.get_iam_policy resource, options: default_options
-          end
+          iam.get_iam_policy resource: subscription_path(subscription_name, options)
         end
 
         def set_subscription_policy subscription_name, new_policy, options = {}
-          resource = subscription_path subscription_name, options
-
-          execute do
-            subscriber.set_iam_policy resource, new_policy,
-                                      options: default_options
-          end
+          iam.set_iam_policy resource: subscription_path(subscription_name, options), policy: new_policy
         end
 
-        def test_subscription_permissions subscription_name,
-                                          permissions, options = {}
-          resource = subscription_path subscription_name, options
-
-          execute do
-            subscriber.test_iam_permissions resource, permissions,
-                                            options: default_options
-          end
+        def test_subscription_permissions subscription_name, permissions, options = {}
+          iam.test_iam_permissions resource: subscription_path(subscription_name, options), permissions: permissions
         end
 
         def project_path options = {}
@@ -494,21 +364,6 @@ module Google
           end
           policy
         end
-
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        end
       end
     end