google-cloud-pubsub 0.33.2 → 0.34.0

data/lib/google/cloud/pubsub/subscriber/timed_unary_buffer.rb

@@ -0,0 +1,221 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require "concurrent"
+
+module Google
+  module Cloud
+    module PubSub
+      class Subscriber
+        ##
+        # @private
+        class TimedUnaryBuffer
+          attr_reader :max_bytes, :interval
+
+          def initialize subscriber, max_bytes: 10000000, interval: 1.0
+            @subscriber = subscriber
+            @max_bytes = max_bytes
+            @interval = interval
+
+            # Using a Hash ensures there is only one entry for each ack_id in
+            # the buffer. Adding an entry again will overwrite the previous
+            # entry.
+            @register = {}
+
+            @task = Concurrent::TimerTask.new(execution_interval: interval) do
+              flush!
+            end
+          end
+
+          def acknowledge ack_ids
+            return if ack_ids.empty?
+
+            ack_ids.each do |ack_id|
+              # ack has no deadline set, use :ack indicate it is an ack
+              @register[ack_id] = :ack
+            end
+
+            true
+          end
+
+          def modify_ack_deadline deadline, ack_ids
+            return if ack_ids.empty?
+
+            ack_ids.each do |ack_id|
+              @register[ack_id] = deadline
+            end
+
+            true
+          end
+
+          def renew_lease deadline, ack_ids
+            return if ack_ids.empty?
+
+            ack_ids.each do |ack_id|
+              # Do not overwrite pending actions when renewing leased messages.
+              @register[ack_id] ||= deadline
+            end
+
+            true
+          end
+
+          def flush!
+            # Grab requests from the buffer and release synchronize ASAP
+            requests = flush_requests!
+            return if requests.empty?
+
+            # Perform the RCP calls concurrently
+            with_threadpool do |pool|
+              requests[:acknowledge].each do |ack_req|
+                add_future pool do
+                  @subscriber.service.acknowledge \
+                    ack_req.subscription, *ack_req.ack_ids
+                end
+              end
+              requests[:modify_ack_deadline].each do |mod_ack_req|
+                add_future pool do
+                  @subscriber.service.modify_ack_deadline \
+                    mod_ack_req.subscription, mod_ack_req.ack_ids,
+                    mod_ack_req.ack_deadline_seconds
+                end
+              end
+            end
+
+            true
+          end
+
+          def start
+            @task.execute
+
+            self
+          end
+
+          def stop
+            @task.shutdown
+            flush!
+
+            self
+          end
+
+          def started?
+            @task.running?
+          end
+
+          def stopped?
+            !started?
+          end
+
+          private
+
+          def flush_requests!
+            return {} if @register.empty?
+
+            prev_reg = @register
+            @register = Concurrent::Map.new
+
+            groups = prev_reg.each_pair.group_by { |_ack_id, delay| delay }
+            req_hash = Hash[groups.map { |k, v| [k, v.map(&:first)] }]
+
+            requests = { acknowledge: [] }
+            ack_ids = Array(req_hash.delete(:ack)) # ack has no deadline set
+            if ack_ids.any?
+              requests[:acknowledge] = create_acknowledge_requests ack_ids
+            end
+            requests[:modify_ack_deadline] =
+              req_hash.map do |mod_deadline, mod_ack_ids|
+                create_modify_ack_deadline_requests mod_deadline, mod_ack_ids
+              end.flatten
+            requests
+          end
+
+          def create_acknowledge_requests ack_ids
+            req = Google::Cloud::PubSub::V1::AcknowledgeRequest.new(
+              subscription: subscription_name,
+              ack_ids:      ack_ids
+            )
+            addl_to_create = req.to_proto.bytesize / max_bytes
+            return [req] if addl_to_create.zero?
+
+            ack_ids.each_slice(addl_to_create + 1).map do |sliced_ack_ids|
+              Google::Cloud::PubSub::V1::AcknowledgeRequest.new(
+                subscription: subscription_name,
+                ack_ids:      sliced_ack_ids
+              )
+            end
+          end
+
+          def create_modify_ack_deadline_requests deadline, ack_ids
+            req = Google::Cloud::PubSub::V1::ModifyAckDeadlineRequest.new(
+              subscription:         subscription_name,
+              ack_ids:              ack_ids,
+              ack_deadline_seconds: deadline
+            )
+            addl_to_create = req.to_proto.bytesize / max_bytes
+            return [req] if addl_to_create.zero?
+
+            ack_ids.each_slice(addl_to_create + 1).map do |sliced_ack_ids|
+              Google::Cloud::PubSub::V1::ModifyAckDeadlineRequest.new(
+                subscription:         subscription_name,
+                ack_ids:              sliced_ack_ids,
+                ack_deadline_seconds: deadline
+              )
+            end
+          end
+
+          def subscription_name
+            @subscriber.subscription_name
+          end
+
+          def push_threads
+            @subscriber.push_threads
+          end
+
+          def error! error
+            @subscriber.error! error
+          end
+
+          def with_threadpool
+            pool = Concurrent::FixedThreadPool.new @subscriber.push_threads
+
+            yield pool
+
+            pool.shutdown
+            pool.wait_for_termination 60
+            return if pool.shutdown?
+
+            pool.kill
+            begin
+              raise "Timeout making subscriber API calls"
+            rescue StandardError => error
+              error! error
+            end
+          end
+
+          def add_future pool
+            Concurrent::Future.new(executor: pool) do
+              begin
+                yield
+              rescue StandardError => error
+                error! error
+              end
+            end.execute
+          end
+        end
+      end
+    end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
+  end
+end

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

@@ -22,7 +22,7 @@ require "google/cloud/pubsub/subscriber"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # # Subscription
       #
@@ -32,7 +32,7 @@ module Google
       # @example
       #   require "google/cloud/pubsub"
       #
-      #   pubsub = Google::Cloud::Pubsub.new
+      #   pubsub = Google::Cloud::PubSub.new
       #
       #   sub = pubsub.subscription "my-topic-sub"
       #   subscriber = sub.listen do |received_message|
@@ -52,7 +52,7 @@ module Google
         attr_accessor :service
 
         ##
-        # @private The gRPC Google::Pubsub::V1::Subscription object.
+        # @private The gRPC Google::Cloud::PubSub::V1::Subscription object.
         attr_accessor :grpc
 
         ##
@@ -60,49 +60,67 @@ module Google
         def initialize
           @service = nil
           @grpc = nil
-          @lazy = nil
+          @resource_name = nil
           @exists = nil
         end
 
         ##
         # The name of the subscription.
+        #
+        # @return [String]
         def name
+          return @resource_name if reference?
           @grpc.name
         end
 
         ##
         # The {Topic} from which this subscription receives messages.
         #
+        # Makes an API call to retrieve the topic information when called on a
+        # reference object. See {#reference?}.
+        #
         # @return [Topic]
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   sub.topic.name #=> "projects/my-project/topics/my-topic"
         #
         def topic
           ensure_grpc!
-          Topic.new_lazy @grpc.topic, service
+          Topic.from_name @grpc.topic, service
         end
 
         ##
         # This value is the maximum number of seconds after a subscriber
         # receives a message before the subscriber should acknowledge the
         # message.
+        #
+        # Makes an API call to retrieve the deadline value when called on a
+        # reference object. See {#reference?}.
+        #
+        # @return [Integer]
         def deadline
           ensure_grpc!
           @grpc.ack_deadline_seconds
         end
 
+        ##
+        # Sets the maximum number of seconds after a subscriber
+        # receives a message before the subscriber should acknowledge the
+        # message.
+        #
+        # @param [Integer] new_deadline The new deadline value.
+        #
         def deadline= new_deadline
-          update_grpc = @grpc.dup
-          update_grpc.ack_deadline_seconds = new_deadline
+          update_grpc = Google::Cloud::PubSub::V1::Subscription.new \
+            name: name, ack_deadline_seconds: new_deadline
           @grpc = service.update_subscription update_grpc,
                                               :ack_deadline_seconds
-          @lazy = nil
+          @resource_name = nil
         end
 
         ##
@@ -111,6 +129,9 @@ module Google
         # they are acknowledged, until they fall out of the {#retention} window.
         # Default is `false`.
         #
+        # Makes an API call to retrieve the retain_acked value when called on a
+        # reference object. See {#reference?}.
+        #
         # @return [Boolean] Returns `true` if acknowledged messages are
         #   retained.
         #
@@ -119,12 +140,18 @@ module Google
           @grpc.retain_acked_messages
         end
 
+        ##
+        # Sets whether to retain acknowledged messages.
+        #
+        # @param [Boolean] new_retain_acked The new retain acknowledged messages
+        #   value.
+        #
         def retain_acked= new_retain_acked
-          update_grpc = @grpc.dup
-          update_grpc.retain_acked_messages = !(!new_retain_acked)
+          update_grpc = Google::Cloud::PubSub::V1::Subscription.new \
+            name: name, retain_acked_messages: !(!new_retain_acked)
           @grpc = service.update_subscription update_grpc,
                                               :retain_acked_messages
-          @lazy = nil
+          @resource_name = nil
         end
 
         ##
@@ -136,6 +163,9 @@ module Google
         # less than 600 seconds (10 minutes). Default is 604,800 seconds (7
         # days).
         #
+        # Makes an API call to retrieve the retention value when called on a
+        # reference object. See {#reference?}.
+        #
         # @return [Numeric] The message retention duration in seconds.
         #
         def retention
@@ -143,18 +173,29 @@ module Google
           Convert.duration_to_number @grpc.message_retention_duration
         end
 
+        ##
+        # Sets the message retention duration in seconds.
+        #
+        # @param [Numeric] new_retention The new retention value.
+        #
         def retention= new_retention
-          update_grpc = @grpc.dup
-          update_grpc.message_retention_duration = \
-            Convert.number_to_duration new_retention
+          new_retention_duration = Convert.number_to_duration new_retention
+          update_grpc = Google::Cloud::PubSub::V1::Subscription.new \
+            name: name, message_retention_duration: new_retention_duration
           @grpc = service.update_subscription update_grpc,
                                               :message_retention_duration
-          @lazy = nil
+          @resource_name = nil
         end
 
         ##
         # Returns the URL locating the endpoint to which messages should be
         # pushed.
+        #
+        # Makes an API call to retrieve the endpoint value when called on a
+        # reference object. See {#reference?}.
+        #
+        # @return [String]
+        #
         def endpoint
           ensure_grpc!
           @grpc.push_config.push_endpoint if @grpc.push_config
@@ -162,15 +203,18 @@ module Google
 
         ##
         # Sets the URL locating the endpoint to which messages should be pushed.
+        #
+        # @param [String] new_endpoint The new endpoint value.
+        #
         def endpoint= new_endpoint
           ensure_service!
           service.modify_push_config name, new_endpoint, {}
 
-          return unless @grpc
+          return if reference?
 
-          @grpc.push_config = Google::Pubsub::V1::PushConfig.new(
+          @grpc.push_config = Google::Cloud::PubSub::V1::PushConfig.new(
             push_endpoint: new_endpoint,
-            attributes: {}
+            attributes:    {}
           )
         end
 
@@ -182,9 +226,13 @@ module Google
         # The returned hash is frozen and changes are not allowed. Use
         # {#labels=} to update the labels for this subscription.
         #
+        # Makes an API call to retrieve the labels value when called on a
+        # reference object. See {#reference?}.
+        #
         # @return [Hash] The frozen labels hash.
         #
         def labels
+          ensure_grpc!
           @grpc.labels.to_h.freeze
         end
 
@@ -202,28 +250,31 @@ module Google
         #
         def labels= new_labels
           raise ArgumentError, "Value must be a Hash" if new_labels.nil?
-          labels_map = Google::Protobuf::Map.new(:string, :string)
-          Hash(new_labels).each { |k, v| labels_map[String(k)] = String(v) }
-          update_grpc = @grpc.dup
-          update_grpc.labels = labels_map
+          update_grpc = Google::Cloud::PubSub::V1::Subscription.new \
+            name: name, labels: new_labels
           @grpc = service.update_subscription update_grpc, :labels
-          @lazy = nil
+          @resource_name = nil
         end
 
         ##
         # Determines whether the subscription exists in the Pub/Sub service.
         #
+        # Makes an API call to determine whether the subscription resource
+        # exists when called on a reference object. See {#reference?}.
+        #
+        # @return [Boolean]
+        #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   sub.exists? #=> true
         #
         def exists?
-          # Always true if the object is not set as lazy
-          return true unless lazy?
+          # Always true if the object is not set as reference
+          return true unless reference?
           # If we have a value, return it
           return @exists unless @exists.nil?
           ensure_grpc!
@@ -232,23 +283,6 @@ module Google
           @exists = false
         end
 
-        ##
-        # @private
-        # Determines whether the subscription object was created with an
-        # HTTP call.
-        #
-        # @example
-        #   require "google/cloud/pubsub"
-        #
-        #   pubsub = Google::Cloud::Pubsub.new
-        #
-        #   sub = pubsub.get_subscription "my-topic-sub"
-        #   sub.lazy? #=> nil
-        #
-        def lazy?
-          @lazy
-        end
-
         ##
         # Deletes an existing subscription.
         # All pending messages in the subscription are immediately dropped.
@@ -258,7 +292,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   sub.delete
@@ -290,12 +324,12 @@ module Google
         #   request. The Pub/Sub system may return fewer than the number
         #   specified. The default value is `100`, the maximum value is `1000`.
         #
-        # @return [Array<Google::Cloud::Pubsub::ReceivedMessage>]
+        # @return [Array<Google::Cloud::PubSub::ReceivedMessage>]
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   sub.pull.each { |received_message| received_message.acknowledge! }
@@ -303,7 +337,7 @@ module Google
         # @example A maximum number of messages returned can also be specified:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   sub.pull(max: 10).each do |received_message|
@@ -313,7 +347,7 @@ module Google
         # @example The call can block until messages are available:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_messages = sub.pull immediate: false
@@ -345,12 +379,12 @@ module Google
         #   request. The Pub/Sub system may return fewer than the number
         #   specified. The default value is `100`, the maximum value is `1000`.
         #
-        # @return [Array<Google::Cloud::Pubsub::ReceivedMessage>]
+        # @return [Array<Google::Cloud::PubSub::ReceivedMessage>]
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_messages = sub.wait_for_messages
@@ -370,6 +404,9 @@ module Google
         #   will hold received messages before modifying the message's ack
         #   deadline. The minimum is 10, the maximum is 600. Default is
         #   {#deadline}. Optional.
+        #
+        #   Makes an API call to retrieve the deadline value when called on a
+        #   reference object. See {#reference?}.
         # @param [Integer] streams The number of concurrent streams to open to
         #   pull messages from the subscription. Default is 4. Optional.
         # @param [Integer] inventory The number of received messages to be
@@ -382,9 +419,9 @@ module Google
         #     * `:callback` (Integer) The number of threads used to handle the
         #       received messages. Default is 8.
         #     * `:push` (Integer) The number of threads to handle
-        #       acknowledgement ({ReceivedMessage#ack!}) and delay messages
-        #       ({ReceivedMessage#nack!}, {ReceivedMessage#delay!}). Default is
-        #       4.
+        #       acknowledgement ({ReceivedMessage#ack!}) and modify ack deadline
+        #       messages ({ReceivedMessage#nack!},
+        #       {ReceivedMessage#modify_ack_deadline!}). Default is 4.
         #
         # @yield [received_message] a block for processing new messages
         # @yieldparam [ReceivedMessage] received_message the newly received
@@ -395,7 +432,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #
@@ -413,7 +450,7 @@ module Google
         # @example Configuring to increase concurrent callbacks:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #
@@ -452,7 +489,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_messages = sub.pull
@@ -474,7 +511,7 @@ module Google
         # make the messages available for redelivery if the processing was
         # interrupted.
         #
-        # See also {ReceivedMessage#delay!}.
+        # See also {ReceivedMessage#modify_ack_deadline!}.
         #
         # @param [Integer] new_deadline The new ack deadline in seconds from the
         #   time this request is sent to the Pub/Sub system. Must be >= 0. For
@@ -487,7 +524,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   received_messages = sub.pull
@@ -499,7 +536,6 @@ module Google
           service.modify_ack_deadline name, ack_ids, new_deadline
           true
         end
-        alias delay modify_ack_deadline
 
         ##
         # Creates a new {Snapshot} from the subscription. The created snapshot
@@ -529,12 +565,12 @@ module Google
         #   label in the list must have a different key. See [Creating and
         #   Managing Labels](https://cloud.google.com/pubsub/docs/labels).
         #
-        # @return [Google::Cloud::Pubsub::Snapshot]
+        # @return [Google::Cloud::PubSub::Snapshot]
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   snapshot = sub.create_snapshot "my-snapshot"
@@ -543,7 +579,7 @@ module Google
         # @example Without providing a name:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   snapshot = sub.create_snapshot
@@ -579,7 +615,7 @@ module Google
         # @example Using a snapshot
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   snapshot = sub.create_snapshot
@@ -592,7 +628,7 @@ module Google
         # @example Using a time:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   time = Time.now
@@ -608,6 +644,44 @@ module Google
           true
         end
 
+        ##
+        # Determines whether the subscription object was created without
+        # retrieving the resource representation from the Pub/Sub service.
+        #
+        # @return [Boolean] `true` when the subscription was created without a
+        #   resource representation, `false` otherwise.
+        #
+        # @example
+        #   require "google/cloud/pubsub"
+        #
+        #   pubsub = Google::Cloud::PubSub.new
+        #
+        #   sub = pubsub.get_subscription "my-topic-sub", skip_lookup: true
+        #   sub.reference? #=> true
+        #
+        def reference?
+          @grpc.nil?
+        end
+
+        ##
+        # Determines whether the subscription object was created with a resource
+        # representation from the Pub/Sub service.
+        #
+        # @return [Boolean] `true` when the subscription was created with a
+        #   resource representation, `false` otherwise.
+        #
+        # @example
+        #   require "google/cloud/pubsub"
+        #
+        #   pubsub = Google::Cloud::PubSub.new
+        #
+        #   sub = pubsub.get_subscription "my-topic-sub"
+        #   sub.resource? #=> true
+        #
+        def resource?
+          !@grpc.nil?
+        end
+
         ##
         # Gets the [Cloud IAM](https://cloud.google.com/iam/) access control
         # policy for this subscription.
@@ -627,7 +701,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-subscription"
         #
         #   policy = sub.policy
@@ -635,7 +709,7 @@ module Google
         # @example Update the policy by passing a block:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-subscription"
         #
         #   sub.policy do |p|
@@ -654,7 +728,7 @@ module Google
         ##
         # Updates the [Cloud IAM](https://cloud.google.com/iam/) access control
         # policy for this subscription. The policy should be read from
-        # {#policy}. See {Google::Cloud::Pubsub::Policy} for an explanation of
+        # {#policy}. See {Google::Cloud::PubSub::Policy} for an explanation of
         # the policy `etag` property and how to modify policies.
         #
         # You can also update the policy by passing a block to {#policy}, which
@@ -671,7 +745,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-subscription"
         #
         #   policy = sub.policy # API call
@@ -712,7 +786,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-subscription"
         #   perms = sub.test_permissions "pubsub.subscriptions.get",
         #                                "pubsub.subscriptions.consume"
@@ -727,7 +801,8 @@ module Google
         end
 
         ##
-        # @private New Subscription from a Google::Pubsub::V1::Subscription
+        # @private
+        # New Subscription from a Google::Cloud::PubSub::V1::Subscription
         # object.
         def self.from_grpc grpc, service
           new.tap do |f|
@@ -737,12 +812,12 @@ module Google
         end
 
         ##
-        # @private New lazy {Topic} object without making an HTTP request.
-        def self.new_lazy name, service, options = {}
-          lazy_grpc = Google::Pubsub::V1::Subscription.new \
-            name: service.subscription_path(name, options)
-          from_grpc(lazy_grpc, service).tap do |s|
-            s.instance_variable_set :@lazy, true
+        # @private New reference {Subscription} object without making an HTTP
+        # request.
+        def self.from_name name, service, options = {}
+          name = service.subscription_path name, options
+          from_grpc(nil, service).tap do |s|
+            s.instance_variable_set :@resource_name, name
           end
         end
 
@@ -756,11 +831,11 @@ module Google
         end
 
         ##
-        # Ensures a Google::Pubsub::V1::Subscription object exists.
+        # Ensures a Google::Cloud::PubSub::V1::Subscription object exists.
         def ensure_grpc!
           ensure_service!
-          @grpc = service.get_subscription name if lazy?
-          @lazy = nil
+          @grpc = service.get_subscription name if reference?
+          @resource_name = nil
         end
 
         ##
@@ -773,5 +848,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end