google-cloud-pubsub 0.20.1 → 0.21.0

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

@@ -29,10 +29,9 @@ module Google
       # delayed.
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/pubsub"
       #
-      #   gcloud = Google::Cloud.new
-      #   pubsub = gcloud.pubsub
+      #   pubsub = Google::Cloud::Pubsub.new
       #
       #   # Publish a message
       #   topic = pubsub.topic "my-topic"

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

@@ -42,7 +42,7 @@ module Google
       #
       # @see https://cloud.google.com/iam/docs/managing-policies Managing
       #   policies
-      # @see https://cloud.google.com/pubsub/reference/rpc/google.iam.v1#iampolicy
+      # @see https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#iampolicy
       #   google.iam.v1.IAMPolicy
       #
       # @attr [String] etag Used to verify whether the policy has changed since
@@ -52,14 +52,13 @@ module Google
       #   roles with an array of members. See [Understanding
       #   Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
       #   listing of primitive and curated roles.
-      #   See [Binding](https://cloud.google.com/pubsub/reference/rpc/google.iam.v1#binding)
+      #   See [Binding](https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#binding)
       #   for a listing of values and patterns for members.
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/pubsub"
       #
-      #   gcloud = Google::Cloud.new
-      #   pubsub = gcloud.pubsub
+      #   pubsub = Google::Cloud::Pubsub.new
       #   topic = pubsub.topic "my-topic"
       #
       #   policy = topic.policy # API call
@@ -85,7 +84,7 @@ module Google
         # See [Understanding
         # Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
         # listing of primitive and curated roles.
-        # See [Binding](https://cloud.google.com/pubsub/reference/rpc/google.iam.v1#binding)
+        # See [Binding](https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#binding)
         # for a listing of values and patterns for members.
         #
         # @param [String] role_name A Cloud IAM role, such as
@@ -94,10 +93,9 @@ module Google
         #   `"user:owner@example.com"`.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "my-topic"
         #
         #   policy = topic.policy # API call
@@ -115,7 +113,7 @@ module Google
         # policy. See [Understanding
         # Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
         # listing of primitive and curated roles. See
-        # [Binding](https://cloud.google.com/pubsub/reference/rpc/google.iam.v1#binding)
+        # [Binding](https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#binding)
         # for a listing of values and patterns for members.
         #
         # @param [String] role_name A Cloud IAM role, such as
@@ -124,10 +122,9 @@ module Google
         #   `"user:owner@example.com"`.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "my-topic"
         #
         #   policy = topic.policy # API call
@@ -146,16 +143,15 @@ module Google
         # {#roles}. See [Understanding
         # Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
         # listing of primitive and curated roles. See
-        # [Binding](https://cloud.google.com/pubsub/reference/rpc/google.iam.v1#binding)
+        # [Binding](https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#binding)
         # for a listing of values and patterns for members.
         #
         # @return [Array<String>] The members strings, or an empty array.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "my-topic"
         #
         #   policy = topic.policy

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

@@ -14,7 +14,7 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/core/gce"
+require "google/cloud/core/environment"
 require "google/cloud/pubsub/service"
 require "google/cloud/pubsub/credentials"
 require "google/cloud/pubsub/topic"
@@ -36,17 +36,16 @@ module Google
       # See {Google::Cloud#pubsub}
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/pubsub"
       #
-      #   gcloud = Google::Cloud.new
-      #   pubsub = gcloud.pubsub
+      #   pubsub = Google::Cloud::Pubsub.new
       #
       #   topic = pubsub.topic "my-topic"
       #   topic.publish "task completed"
       #
       class Project
         ##
-        # @private The gRPC Service object.
+        # @private The Service object.
         attr_accessor :service
 
         ##
@@ -58,11 +57,12 @@ module Google
         # The Pub/Sub project connected to.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new "my-todo-project",
-        #                       "/path/to/keyfile.json"
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new(
+        #     project: "my-todo-project",
+        #     keyfile: "/path/to/keyfile.json"
+        #   )
         #
         #   pubsub.project #=> "my-todo-project"
         #
@@ -76,7 +76,7 @@ module Google
           ENV["PUBSUB_PROJECT"] ||
             ENV["GOOGLE_CLOUD_PROJECT"] ||
             ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud::Core::GCE.project_id
+            Google::Cloud::Core::Environment.project_id
         end
 
         ##
@@ -103,38 +103,33 @@ module Google
         #   `autocreate` is set to `true`.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "existing-topic"
         #
         # @example By default `nil` will be returned if topic does not exist.
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "non-existing-topic" #=> nil
         #
         # @example With the `autocreate` option set to `true`.
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "non-existing-topic", autocreate: true
         #
         # @example Create topic in a different project with the `project` flag.
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "another-topic", project: "another-project"
         #
         # @example Skip the lookup against the service with `skip_lookup`:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.topic "another-topic", skip_lookup: true
         #
         def topic topic_name, autocreate: nil, project: nil, skip_lookup: nil
@@ -158,10 +153,9 @@ module Google
         # @return [Google::Cloud::Pubsub::Topic]
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #   topic = pubsub.create_topic "my-topic"
         #
         def create_topic topic_name
@@ -183,10 +177,9 @@ module Google
         #   {Google::Cloud::Pubsub::Topic::List})
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   topics = pubsub.topics
         #   topics.each do |topic|
@@ -194,10 +187,9 @@ module Google
         #   end
         #
         # @example Retrieve all topics: (See {Topic::List#all})
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   topics = pubsub.topics
         #   topics.all do |topic|
@@ -235,35 +227,31 @@ module Google
         #   block.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   msg = pubsub.publish "my-topic", "new-message"
         #
         # @example A message can be published using a File object:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   msg = pubsub.publish "my-topic", File.open("message.txt")
         #
         # @example Additionally, a message can be published with attributes:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   msg = pubsub.publish "my-topic", "new-message", foo: :bar,
         #                                                   this: :that
         #
         # @example Multiple messages can be sent at the same time using a block:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   msgs = pubsub.publish "my-topic" do |p|
         #     p.publish "new-message-1", foo: :bar
@@ -272,10 +260,9 @@ module Google
         #   end
         #
         # @example With `autocreate`:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   msg = pubsub.publish "new-topic", "new-message", autocreate: true
         #
@@ -316,38 +303,34 @@ module Google
         # @return [Google::Cloud::Pubsub::Subscription]
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscribe "my-topic", "my-topic-sub"
         #   puts sub.name # => "my-topic-sub"
         #
         # @example The name is optional, and will be generated if not given.
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscribe "my-topic"
         #   puts sub.name # => "generated-sub-name"
         #
         # @example Wait 2 minutes for acknowledgement and push all to endpoint:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscribe "my-topic", "my-topic-sub",
         #                          deadline: 120,
         #                          endpoint: "https://example.com/push"
         #
         # @example With `autocreate`:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscribe "new-topic", "new-topic-sub",
         #                          autocreate: true
@@ -387,19 +370,17 @@ module Google
         #   the subscription does not exist
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   subscription = pubsub.subscription "my-sub"
         #   puts subscription.name
         #
         # @example Skip the lookup against the service with `skip_lookup`:
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   # No API call is made to retrieve the subscription information.
         #   subscription = pubsub.subscription "my-sub", skip_lookup: true
@@ -430,10 +411,9 @@ module Google
         #   {Google::Cloud::Pubsub::Subscription::List})
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   subscriptions = pubsub.subscriptions
         #   subscriptions.each do |subscription|
@@ -441,10 +421,9 @@ module Google
         #   end
         #
         # @example Retrieve all subscriptions: (See {Subscription::List#all})
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   subscriptions = pubsub.subscriptions
         #   subscriptions.all do |subscription|

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

@@ -25,10 +25,9 @@ module Google
       # Represents a Pub/Sub {Message} that can be acknowledged or delayed.
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/pubsub"
       #
-      #   gcloud = Google::Cloud.new
-      #   pubsub = gcloud.pubsub
+      #   pubsub = Google::Cloud::Pubsub.new
       #
       #   sub = pubsub.subscription "my-topic-sub"
       #   received_message = sub.pull.first
@@ -90,10 +89,9 @@ module Google
         # Acknowledges receipt of the message.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_message = sub.pull.first
@@ -121,10 +119,9 @@ module Google
         #   the message available for another pull request.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/pubsub"
         #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
+        #   pubsub = Google::Cloud::Pubsub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_message = sub.pull.first

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

@@ -14,34 +14,39 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/core/grpc_backoff"
-require "google/pubsub/v1/pubsub_pb"
-require "google/iam/v1/iam_policy"
-require "google/cloud/core/grpc_utils"
-require "json"
+require "google/cloud/pubsub/credentials"
+require "google/cloud/pubsub/version"
+require "google/cloud/pubsub/v1"
+require "google/gax/errors"
 
 module Google
   module Cloud
     module Pubsub
       ##
-      # @private Represents the gRPC Pub/Sub service, including all the API
+      # @private Represents the GAX Pub/Sub service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :host, :retries, :timeout
+        attr_accessor :project, :credentials, :host, :timeout, :client_config
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, retries: nil,
-                       timeout: nil
+        def initialize project, credentials, host: nil, timeout: nil,
+                       client_config: nil
           @project = project
           @credentials = credentials
           @host = host || "pubsub.googleapis.com"
-          @retries = retries
           @timeout = timeout
+          @client_config = client_config || {}
         end
 
-        def creds
+        def channel
+          require "grpc"
+          GRPC::Core::Channel.new host, nil, chan_creds
+        end
+
+        def chan_creds
           return credentials if insecure?
+          require "grpc"
           GRPC::Core::ChannelCredentials.new.compose \
             GRPC::Core::CallCredentials.new credentials.client.updater_proc
         end
@@ -49,10 +54,13 @@ module Google
         def subscriber
           return mocked_subscriber if mocked_subscriber
           @subscriber ||= begin
-            require "google/pubsub/v1/pubsub_services_pb"
-
-            Google::Pubsub::V1::Subscriber::Stub.new(
-              host, creds, timeout: timeout)
+            V1::SubscriberApi.new(
+              service_path: host,
+              channel: channel,
+              timeout: timeout,
+              client_config: client_config,
+              app_name: "gcloud-ruby",
+              app_version: Google::Cloud::Pubsub::VERSION)
           end
         end
         attr_accessor :mocked_subscriber
@@ -60,25 +68,16 @@ module Google
         def publisher
           return mocked_publisher if mocked_publisher
           @publisher ||= begin
-            require "google/pubsub/v1/pubsub_services_pb"
-
-            Google::Pubsub::V1::Publisher::Stub.new(
-              host, creds, timeout: timeout)
+            V1::PublisherApi.new(
+              service_path: host,
+              channel: channel,
+              timeout: timeout,
+              app_name: "gcloud-ruby",
+              app_version: Google::Cloud::Pubsub::VERSION)
           end
         end
         attr_accessor :mocked_publisher
 
-        def iam
-          return mocked_iam if mocked_iam
-          @iam ||= begin
-            require "google/iam/v1/iam_policy_services"
-
-            Google::Iam::V1::IAMPolicy::Stub.new(
-              host, creds, timeout: timeout)
-          end
-        end
-        attr_accessor :mocked_iam
-
         def insecure?
           credentials == :this_channel_is_insecure
         end
@@ -90,33 +89,37 @@ module Google
         # If other attributes are added in the future,
         # they will be returned here.
         def get_topic topic_name, options = {}
-          topic_req = Google::Pubsub::V1::GetTopicRequest.new.tap do |r|
-            r.topic = topic_path(topic_name, options)
+          execute do
+            publisher.get_topic topic_path(topic_name, options),
+                                options: default_options
           end
-
-          execute { publisher.get_topic topic_req }
         end
 
         ##
         # Lists matching topics.
         def list_topics options = {}
-          topics_req = Google::Pubsub::V1::ListTopicsRequest.new.tap do |r|
-            r.project = project_path(options)
-            r.page_token = options[:token] if options[:token]
-            r.page_size = options[:max] if options[:max]
+          call_options = default_options
+          if (token = options[:token])
+            call_options = Google::Gax::CallOptions.new kwargs: default_headers,
+                                                        page_token: token
           end
 
-          execute { publisher.list_topics topics_req }
+          execute do
+            paged_enum = publisher.list_topics project_path(options),
+                                               page_size: options[:max],
+                                               options: call_options
+
+            paged_enum.page.response
+          end
         end
 
         ##
         # Creates the given topic with the given name.
         def create_topic topic_name, options = {}
-          topic_req = Google::Pubsub::V1::Topic.new.tap do |r|
-            r.name = topic_path(topic_name, options)
+          execute do
+            publisher.create_topic topic_path(topic_name, options),
+                                   options: default_options
           end
-
-          execute { publisher.create_topic topic_req }
         end
 
         ##
@@ -125,11 +128,10 @@ module Google
         # exist. After a topic is deleted, a new topic may be created with the
         # same name.
         def delete_topic topic_name
-          topic_req = Google::Pubsub::V1::DeleteTopicRequest.new.tap do |r|
-            r.topic = topic_path(topic_name)
+          execute do
+            publisher.delete_topic topic_path(topic_name),
+                                   options: default_options
           end
-
-          execute { publisher.delete_topic topic_req }
         end
 
         ##
@@ -138,184 +140,195 @@ module Google
         # The messages parameter is an array of arrays.
         # The first element is the data, second is attributes hash.
         def publish topic, messages
-          publish_req = Google::Pubsub::V1::PublishRequest.new(
-            topic: topic_path(topic),
-            messages: messages.map do |data, attributes|
-              Google::Pubsub::V1::PubsubMessage.new(
-                data: data, attributes: attributes)
-            end
-          )
+          messages = messages.map do |data, attributes|
+            Google::Pubsub::V1::PubsubMessage.new(
+              data: data, attributes: attributes)
+          end
 
-          execute { publisher.publish publish_req }
+          execute do
+            publisher.publish topic_path(topic), messages,
+                              options: default_options
+          end
         end
 
         ##
         # Gets the details of a subscription.
         def get_subscription subscription_name, options = {}
-          sub_req = Google::Pubsub::V1::GetSubscriptionRequest.new(
-            subscription: subscription_path(subscription_name, options)
-          )
-
-          execute { subscriber.get_subscription sub_req }
+          subscription = subscription_path(subscription_name, options)
+          execute do
+            subscriber.get_subscription subscription, options: default_options
+          end
         end
 
         ##
         # Lists matching subscriptions by project and topic.
         def list_topics_subscriptions topic, options = {}
-          list_params = { topic:     topic_path(topic, options),
-                          page_token: options[:token],
-                          page_size:  options[:max]
-                        }.delete_if { |_, v| v.nil? }
-          list_req = Google::Pubsub::V1::ListTopicSubscriptionsRequest.new \
-            list_params
+          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
 
-          execute { publisher.list_topic_subscriptions list_req }
+            paged_enum.page.response
+          end
         end
 
         ##
         # Lists matching subscriptions by project.
         def list_subscriptions options = {}
-          list_params = { project:    project_path(options),
-                          page_token: options[:token],
-                          page_size:  options[:max]
-                        }.delete_if { |_, v| v.nil? }
-          list_req = Google::Pubsub::V1::ListSubscriptionsRequest.new(
-            list_params)
+          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_subscriptions project_path(options),
+                                                       page_size: options[:max],
+                                                       options: call_options
 
-          execute { subscriber.list_subscriptions list_req }
+            paged_enum.page.response
+          end
         end
 
         ##
         # Creates a subscription on a given topic for a given subscriber.
         def create_subscription topic, subscription_name, options = {}
-          sub_params = { name: subscription_path(subscription_name, options),
-                         topic: topic_path(topic),
-                         ack_deadline_seconds: options[:deadline]
-                       }.delete_if { |_, v| v.nil? }
-          sub_req = Google::Pubsub::V1::Subscription.new sub_params
-          if options[:endpoint]
-            sub_req.push_config = Google::Pubsub::V1::PushConfig.new(
-              push_endpoint: options[:endpoint],
-              attributes: (options[:attributes] || {}).to_h)
+          name = subscription_path(subscription_name, options)
+          topic = topic_path(topic)
+          push_config = if options[:endpoint]
+                          Google::Pubsub::V1::PushConfig.new \
+                            push_endpoint: options[:endpoint],
+                            attributes: (options[:attributes] || {}).to_h
+                        end
+          deadline = options[:deadline]
+
+          execute do
+            subscriber.create_subscription name,
+                                           topic,
+                                           push_config: push_config,
+                                           ack_deadline_seconds: deadline,
+                                           options: default_options
           end
-
-          execute { subscriber.create_subscription sub_req }
         end
 
         ##
         # Deletes an existing subscription.
         # All pending messages in the subscription are immediately dropped.
         def delete_subscription subscription
-          del_req = Google::Pubsub::V1::DeleteSubscriptionRequest.new(
-            subscription: subscription_path(subscription)
-          )
-
-          execute { subscriber.delete_subscription del_req }
+          execute do
+            subscriber.delete_subscription subscription_path(subscription),
+                                           options: default_options
+          end
         end
 
         ##
         # Pulls a single message from the server.
         def pull subscription, options = {}
-          pull_req = Google::Pubsub::V1::PullRequest.new(
-            subscription: subscription_path(subscription, options),
-            return_immediately: !(!options.fetch(:immediate, true)),
-            max_messages: options.fetch(:max, 100).to_i
-          )
-
-          execute { subscriber.pull pull_req }
+          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
         end
 
         ##
         # Acknowledges receipt of a message.
         def acknowledge subscription, *ack_ids
-          ack_req = Google::Pubsub::V1::AcknowledgeRequest.new(
-            subscription: subscription_path(subscription),
-            ack_ids: ack_ids
-          )
-
-          execute { subscriber.acknowledge ack_req }
+          execute do
+            subscriber.acknowledge subscription_path(subscription), ack_ids,
+                                   options: default_options
+          end
         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)] }]
-
-          mpc_req = Google::Pubsub::V1::ModifyPushConfigRequest.new(
-            subscription: subscription_path(subscription),
-            push_config: Google::Pubsub::V1::PushConfig.new(
-              push_endpoint: endpoint,
-              attributes: attributes
-            )
+          push_config = Google::Pubsub::V1::PushConfig.new(
+            push_endpoint: endpoint,
+            attributes: attributes
           )
 
-          execute { subscriber.modify_push_config mpc_req }
+          execute do
+            subscriber.modify_push_config subscription, push_config,
+                                          options: default_options
+          end
         end
 
         ##
         # Modifies the ack deadline for a specific message.
         def modify_ack_deadline subscription, ids, deadline
-          mad_req = Google::Pubsub::V1::ModifyAckDeadlineRequest.new(
-            subscription: subscription_path(subscription),
-            ack_ids: Array(ids),
-            ack_deadline_seconds: deadline
-          )
-
-          execute { subscriber.modify_ack_deadline mad_req }
+          execute do
+            subscriber.modify_ack_deadline subscription_path(subscription),
+                                           Array(ids),
+                                           deadline, options: default_options
+          end
         end
 
         def get_topic_policy topic_name, options = {}
-          get_req = Google::Iam::V1::GetIamPolicyRequest.new(
-            resource: topic_path(topic_name, options)
-          )
-
-          execute { iam.get_iam_policy get_req }
+          execute do
+            publisher.get_iam_policy topic_path(topic_name, options),
+                                     options: default_options
+          end
         end
 
         def set_topic_policy topic_name, new_policy, options = {}
-          set_req = Google::Iam::V1::SetIamPolicyRequest.new(
-            resource: topic_path(topic_name, options),
-            policy: new_policy
-          )
+          resource = topic_path(topic_name, options)
 
-          execute { iam.set_iam_policy set_req }
+          execute do
+            publisher.set_iam_policy resource, new_policy,
+                                     options: default_options
+          end
         end
 
         def test_topic_permissions topic_name, permissions, options = {}
-          test_req = Google::Iam::V1::TestIamPermissionsRequest.new(
-            resource: topic_path(topic_name, options),
-            permissions: permissions
-          )
+          resource = topic_path(topic_name, options)
 
-          execute { iam.test_iam_permissions test_req }
+          execute do
+            publisher.test_iam_permissions resource, permissions,
+                                           options: default_options
+          end
         end
 
         def get_subscription_policy subscription_name, options = {}
-          get_req = Google::Iam::V1::GetIamPolicyRequest.new(
-            resource: subscription_path(subscription_name, options)
-          )
+          resource = subscription_path(subscription_name, options)
 
-          execute { iam.get_iam_policy get_req }
+          execute do
+            subscriber.get_iam_policy resource, options: default_options
+          end
         end
 
         def set_subscription_policy subscription_name, new_policy, options = {}
-          set_req = Google::Iam::V1::SetIamPolicyRequest.new(
-            resource: subscription_path(subscription_name, options),
-            policy: new_policy
-          )
+          resource = subscription_path(subscription_name, options)
 
-          execute { iam.set_iam_policy set_req }
+          execute do
+            subscriber.set_iam_policy resource, new_policy,
+                                      options: default_options
+          end
         end
 
         def test_subscription_permissions subscription_name,
                                           permissions, options = {}
-          test_req = Google::Iam::V1::TestIamPermissionsRequest.new(
-            resource: subscription_path(subscription_name, options),
-            permissions: permissions
-          )
+          resource = subscription_path(subscription_name, options)
 
-          execute { iam.test_iam_permissions test_req }
+          execute do
+            subscriber.test_iam_permissions resource, permissions,
+                                            options: default_options
+          end
         end
 
         def project_path options = {}
@@ -339,12 +352,19 @@ module Google
 
         protected
 
+        def default_headers
+          { "google-cloud-resource-prefix" => "projects/#{@project}" }
+        end
+
+        def default_options
+          Google::Gax::CallOptions.new kwargs: default_headers
+        end
+
         def execute
-          Google::Cloud::Core::GrpcBackoff.new(retries: retries).execute do
-            yield
-          end
-        rescue GRPC::BadStatus => e
-          raise Error.from_error(e)
+          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