google-cloud-pubsub 1.0.2 → 2.19.0

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

@@ -18,78 +18,94 @@ 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
+        attr_accessor :credentials
+        attr_accessor :host
+        attr_accessor :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
+        # that is disconnected will be made for the stream that is created to replace it. The attr_accessor allows the
+        # value to be replaced for unit testing.
+        attr_accessor :client_id
+
+        attr_reader :universe_domain
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil,
-                       client_config: nil
+        def initialize project, credentials, host: nil, timeout: nil, universe_domain: nil
           @project = project
           @credentials = credentials
-          @host = host || V1::PublisherClient::SERVICE_ADDRESS
+          @host = host
           @timeout = timeout
-          @client_config = client_config || {}
-        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"                 => 300000,
-            "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
+          @client_id = SecureRandom.uuid.freeze
+          @universe_domain = universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
         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
-            )
+          @subscriber ||= V1::Subscriber::Client.new do |config|
+            config.credentials = credentials if credentials
+            override_client_config_timeouts config if timeout
+            config.endpoint = host if host
+            config.universe_domain = universe_domain
+            config.lib_name = "gccl"
+            config.lib_version = Google::Cloud::PubSub::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
           end
         end
         attr_accessor :mocked_subscriber
 
         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
-            )
+          @publisher ||= V1::Publisher::Client.new do |config|
+            config.credentials = credentials if credentials
+            override_client_config_timeouts config if timeout
+            config.endpoint = host if host
+            config.universe_domain = universe_domain
+            config.lib_name = "gccl"
+            config.lib_version = Google::Cloud::PubSub::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
           end
         end
         attr_accessor :mocked_publisher
 
-        def insecure?
-          credentials == :this_channel_is_insecure
+        def iam
+          return mocked_iam if mocked_iam
+          @iam ||= begin
+            iam = (@publisher || @subscriber || @schemas || subscriber).iam_policy_client
+            iam.configure do |config|
+              override_client_config_timeouts config if timeout
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::PubSub::VERSION
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            end
+            iam
+          end
+        end
+        attr_accessor :mocked_iam
+
+        def schemas
+          return mocked_schemas if mocked_schemas
+          @schemas ||= V1::SchemaService::Client.new do |config|
+            config.credentials = credentials if credentials
+            override_client_config_timeouts config if timeout
+            config.endpoint = host if host
+            config.universe_domain = universe_domain
+            config.lib_name = "gccl"
+            config.lib_version = Google::Cloud::PubSub::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+          end
         end
+        attr_accessor :mocked_schemas
 
         ##
         # Gets the configuration of a topic.
@@ -98,58 +114,59 @@ 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
 
         ##
         # Creates the given topic with the given name.
-        def create_topic topic_name, labels: nil, kms_key_name: nil,
-                         persistence_regions: nil, options: {}
+        def create_topic topic_name,
+                         labels: nil,
+                         kms_key_name: nil,
+                         persistence_regions: nil,
+                         schema_name: nil,
+                         message_encoding: nil,
+                         retention: nil,
+                         ingestion_data_source_settings: nil,
+                         options: {}
           if persistence_regions
-            message_storage_policy = {
+            message_storage_policy = Google::Cloud::PubSub::V1::MessageStoragePolicy.new(
               allowed_persistence_regions: Array(persistence_regions)
-            }
+            )
           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
+          if schema_name || message_encoding
+            unless schema_name && message_encoding
+              raise ArgumentError, "Schema settings must include both schema_name and message_encoding."
+            end
+            schema_settings = Google::Cloud::PubSub::V1::SchemaSettings.new(
+              schema:   schema_path(schema_name),
+              encoding: message_encoding.to_s.upcase
+            )
           end
+
+          publisher.create_topic \
+            name: topic_path(topic_name, options),
+            labels: labels,
+            kms_key_name: kms_key_name,
+            message_storage_policy: message_storage_policy,
+            schema_settings: schema_settings,
+            message_retention_duration: Convert.number_to_duration(retention),
+            ingestion_data_source_settings: ingestion_data_source_settings
         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
 
         ##
@@ -158,10 +175,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
 
         ##
@@ -169,284 +183,253 @@ module Google
         # Raises GRPC status code 5 if the topic does not exist.
         # 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
+        def publish topic, messages, compress: false
+          request = { topic: topic_path(topic), messages: messages }
+          compress_options = ::Gapic::CallOptions.new metadata: { "grpc-internal-encoding-request": "gzip" }
+          compress ? (publisher.publish request, compress_options) : (publisher.publish request)
         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
-
-          execute do
-            paged_enum = subscriber.list_subscriptions project_path(options),
-                                                       page_size: options[:max],
-                                                       options:   call_options
+          paged_enum = subscriber.list_subscriptions project:    project_path(options),
+                                                     page_size:  options[:max],
+                                                     page_token: options[:token]
 
-            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]
-
-          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,
-              options:                    default_options
-          end
+          updated_option = construct_create_subscription_options topic, subscription_name, options
+          subscriber.create_subscription(**updated_option)
         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
+        def streaming_pull request_enum, options = {}
+          subscriber.streaming_pull request_enum, options
         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)] }]
+          attributes = attributes.to_h { |k, v| [String(k), String(v)] }
           push_config = Google::Cloud::PubSub::V1::PushConfig.new(
             push_endpoint: endpoint,
             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
-              if time_or_snapshot.is_a? Snapshot
-                time_or_snapshot = time_or_snapshot.name
-              end
-              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
+        ##
+        # Lists schemas in the current (or given) project.
+        # @param view [String, Symbol, nil] Possible values:
+        #   * `BASIC` - Include the name and type of the schema, but not the definition.
+        #   * `FULL` - Include all Schema object fields.
+        #
+        def list_schemas view, options = {}
+          schema_view = Google::Cloud::PubSub::V1::SchemaView.const_get view.to_s.upcase
+          paged_enum = schemas.list_schemas parent:     project_path(options),
+                                            view:       schema_view,
+                                            page_size:  options[:max],
+                                            page_token: options[:token]
+
+          paged_enum.response
         end
 
-        def set_topic_policy topic_name, new_policy, options = {}
-          resource = topic_path topic_name, options
+        ##
+        # Creates a schema in the current (or given) project.
+        def create_schema schema_id, type, definition, options = {}
+          schema = Google::Cloud::PubSub::V1::Schema.new(
+            type:       type,
+            definition: definition
+          )
+          schemas.create_schema parent:    project_path(options),
+                                schema:    schema,
+                                schema_id: schema_id
+        end
 
-          execute do
-            publisher.set_iam_policy resource, new_policy,
-                                     options: default_options
-          end
+        ##
+        # Gets the details of a schema.
+        # @param view [String, Symbol, nil] The set of fields to return in the response. Possible values:
+        #   * `BASIC` - Include the name and type of the schema, but not the definition.
+        #   * `FULL` - Include all Schema object fields.
+        #
+        def get_schema schema_name, view, options = {}
+          schema_view = Google::Cloud::PubSub::V1::SchemaView.const_get view.to_s.upcase
+          schemas.get_schema name: schema_path(schema_name, options),
+                             view: schema_view
         end
 
-        def test_topic_permissions topic_name, permissions, options = {}
-          resource = topic_path topic_name, options
+        ##
+        # Delete a schema.
+        def delete_schema schema_name
+          schemas.delete_schema name: schema_path(schema_name)
+        end
 
-          execute do
-            publisher.test_iam_permissions resource, permissions,
-                                           options: default_options
+        ##
+        # Validate the definition string intended for a schema.
+        def validate_schema type, definition, options = {}
+          schema = Google::Cloud::PubSub::V1::Schema.new(
+            type:       type,
+            definition: definition
+          )
+          schemas.validate_schema parent: project_path(options),
+                                  schema: schema
+        end
+
+        ##
+        # Validates a message against a schema.
+        #
+        # @param message_data [String] Message to validate against the provided `schema_spec`.
+        # @param message_encoding [Google::Cloud::PubSub::V1::Encoding] The encoding expected for messages.
+        # @param schema_name [String] Name of the schema against which to validate.
+        # @param project [String] Name of the project if not the default project.
+        # @param type [String] Ad-hoc schema type against which to validate.
+        # @param definition [String] Ad-hoc schema definition against which to validate.
+        #
+        def validate_message message_data, message_encoding, schema_name: nil, project: nil, type: nil, definition: nil
+          if type && definition
+            schema = Google::Cloud::PubSub::V1::Schema.new(
+              type:       type,
+              definition: definition
+            )
           end
+          schemas.validate_message parent:   project_path(project: project),
+                                   name:     schema_path(schema_name),
+                                   schema:   schema,
+                                   message:  message_data,
+                                   encoding: message_encoding
         end
 
-        def get_subscription_policy subscription_name, options = {}
-          resource = subscription_path subscription_name, options
+        # Helper methods
 
-          execute do
-            subscriber.get_iam_policy resource, options: default_options
-          end
+        def get_topic_policy topic_name, options = {}
+          iam.get_iam_policy resource: topic_path(topic_name, options)
         end
 
-        def set_subscription_policy subscription_name, new_policy, options = {}
-          resource = subscription_path subscription_name, options
+        def set_topic_policy topic_name, new_policy, options = {}
+          iam.set_iam_policy resource: topic_path(topic_name, options), policy: new_policy
+        end
 
-          execute do
-            subscriber.set_iam_policy resource, new_policy,
-                                      options: default_options
-          end
+        def test_topic_permissions topic_name, permissions, options = {}
+          iam.test_iam_permissions resource: topic_path(topic_name, options), permissions: permissions
         end
 
-        def test_subscription_permissions subscription_name,
-                                          permissions, options = {}
-          resource = subscription_path subscription_name, options
+        def get_subscription_policy subscription_name, options = {}
+          iam.get_iam_policy resource: subscription_path(subscription_name, options)
+        end
 
-          execute do
-            subscriber.test_iam_permissions resource, permissions,
-                                            options: default_options
-          end
+        def set_subscription_policy subscription_name, new_policy, options = {}
+          iam.set_iam_policy resource: subscription_path(subscription_name, options), policy: new_policy
+        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 = {}
@@ -465,18 +448,33 @@ module Google
         end
 
         def snapshot_path snapshot_name, options = {}
-          if snapshot_name.nil? || snapshot_name.to_s.include?("/")
-            return snapshot_name
-          end
+          return snapshot_name if snapshot_name.nil? || snapshot_name.to_s.include?("/")
           "#{project_path options}/snapshots/#{snapshot_name}"
         end
 
+        def schema_path schema_name, options = {}
+          return schema_name if schema_name.nil? || schema_name.to_s.include?("/")
+          "#{project_path options}/schemas/#{schema_name}"
+        end
+
         def inspect
-          "#<#{self.class.name} #{@project}>"
+          "#<#{self.class.name} (#{@project})>"
         end
 
         protected
 
+        # Set the timeout in the client config.
+        # Override the default timeout in each individual RPC config as well, since when they are non-nil, these
+        # defaults have precedence over the top-level config.timeout. See Gapic::CallOptions#apply_defaults.
+        def override_client_config_timeouts config
+          config.timeout = timeout
+          rpc_names = config.rpcs.methods - Object.methods
+          rpc_names.each do |rpc_name|
+            rpc = config.rpcs.send rpc_name
+            rpc.timeout = timeout if rpc.respond_to? :timeout=
+          end
+        end
+
         def a_time? obj
           return false unless obj.respond_to? :to_time
           # Rails' String#to_time returns nil if the string doesn't parse.
@@ -484,19 +482,37 @@ module Google
           true
         end
 
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
+        def dead_letter_policy options
+          return nil unless options[:dead_letter_topic_name]
+          policy = Google::Cloud::PubSub::V1::DeadLetterPolicy.new dead_letter_topic: options[:dead_letter_topic_name]
+          if options[:dead_letter_max_delivery_attempts]
+            policy.max_delivery_attempts = options[:dead_letter_max_delivery_attempts]
+          end
+          policy
         end
 
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
+        private
+
+        def construct_create_subscription_options topic, subscription_name, options
+          excess_options = [:deadline,
+                            :retention,
+                            :retain_acked,
+                            :message_ordering,
+                            :endpoint,
+                            :dead_letter_topic_name,
+                            :dead_letter_max_delivery_attempts,
+                            :dead_letter_topic]
+
+          new_options = options.filter { |k, v| !v.nil? && !excess_options.include?(k) }
+          new_options[:name] = subscription_path subscription_name, options
+          new_options[:topic] = topic_path topic
+          new_options[:message_retention_duration] = Convert.number_to_duration options[:retention]
+          new_options[:dead_letter_policy] = dead_letter_policy options
+          new_options[:ack_deadline_seconds] = options[:deadline]
+          new_options[:retain_acked_messages] = options[:retain_acked]
+          new_options[:enable_message_ordering] = options[:message_ordering]
 
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
+          new_options.compact
         end
       end
     end