chore: Update appengine samples to google-cloud-pubsub/v3.x (#1590)

Author: aandreassa

CONTRIBUTING.md

@@ -254,18 +254,18 @@ require "google/cloud/pubsub"
 
 ```ruby
 def send_notification message
-  topic = @pubsub.topic "notifications"
+  publisher = @pubsub.publisher "notifications"
 
-  topic.publish message
+  publisher.publish message
 end
 ```
 
 ##### The client can pull notifications by pulling from subscription
 
 ```ruby
 def get_latest_notifications
-  subscription  = @pubsub.subscription "mobile-notifications"
-  messages      = subscription.pull
+  subscriber  = @pubsub.subscriber "mobile-notifications"
+  messages      = subscriber.pull
   notifications = messages.map { |msg| Notifiction.new msg.data }
 
   notifications

appengine/flexible/pubsub/Gemfile

@@ -14,7 +14,7 @@
 
 source "https://rubygems.org"
 
-gem "google-cloud-pubsub"
+gem "google-cloud-pubsub", "~> 3.0"
 gem "json"
 gem "sinatra"
 gem "slim"

appengine/flexible/pubsub/app.rb

@@ -19,10 +19,10 @@
 require "google/cloud/pubsub"
 require "googleauth"
 
-pubsub = Google::Cloud::Pubsub.new
+pubsub = Google::Cloud::PubSub.new
 
 # [START gae_flex_pubsub_env]
-topic = pubsub.topic ENV["PUBSUB_TOPIC"]
+publisher = pubsub.publisher ENV["PUBSUB_TOPIC"]
 PUBSUB_VERIFICATION_TOKEN = ENV["PUBSUB_VERIFICATION_TOKEN"]
 # [END gae_flex_pubsub_env]
 
@@ -42,7 +42,7 @@
 end
 
 post "/publish" do
-  topic.publish params[:payload]
+  publisher.publish params[:payload]
 
   redirect "/", 303
 end

appengine/flexible/pubsub/spec/pubsub_spec.rb

@@ -29,10 +29,16 @@ def app
     ENV["PUBSUB_TOPIC"] = "flexible-topic" unless ENV["PUBSUB_TOPIC"]
     ENV["PUBSUB_VERIFICATION_TOKEN"] = "abc123" unless ENV["PUBSUB_VERIFICATION_TOKEN"]
     @topic_name = ENV["PUBSUB_TOPIC"]
-    @pubsub = Google::Cloud::Pubsub.new
+    @pubsub = Google::Cloud::PubSub.new
+    @topic_admin = @pubsub.topic_admin
 
-    topic = @pubsub.topic @topic_name
-    @pubsub.create_topic @topic_name if topic.nil?
+    begin
+      @topic = @topic_admin.get_topic topic: @pubsub.topic_path(@topic_name)
+    rescue Google::Cloud::NotFoundError
+      @topic = nil
+    end
+
+    @topic_admin.create_topic name: @pubsub.topic_path(@topic_name) if @topic.nil?
     require_relative "../app.rb"
   end
 
@@ -89,8 +95,7 @@ def app
   end
 
   after :all do
-    topic = @pubsub.topic @topic_name
-    topic&.delete
+    @topic_admin.delete_topic topic: @topic.name if @topic
     Google::Auth::IDTokens.forget_sources!
   end
 end

appengine/flexible/ruby31-and-earlier/pubsub/Gemfile

@@ -14,7 +14,7 @@
 
 source "https://rubygems.org"
 
-gem "google-cloud-pubsub"
+gem "google-cloud-pubsub", "~> 3.0"
 gem "json"
 gem "sinatra"
 gem "slim"

appengine/flexible/ruby31-and-earlier/pubsub/app.rb

@@ -19,10 +19,10 @@
 require "google/cloud/pubsub"
 require "googleauth"
 
-pubsub = Google::Cloud::Pubsub.new
+pubsub = Google::Cloud::PubSub.new
 
 # [START gae_flex_pubsub_env]
-topic = pubsub.topic ENV["PUBSUB_TOPIC"]
+publisher = pubsub.publisher ENV["PUBSUB_TOPIC"]
 PUBSUB_VERIFICATION_TOKEN = ENV["PUBSUB_VERIFICATION_TOKEN"]
 # [END gae_flex_pubsub_env]
 
@@ -42,7 +42,7 @@
 end
 
 post "/publish" do
-  topic.publish params[:payload]
+  publisher.publish params[:payload]
 
   redirect "/", 303
 end

appengine/flexible/ruby31-and-earlier/pubsub/spec/pubsub_spec.rb

@@ -29,10 +29,16 @@ def app
     ENV["PUBSUB_TOPIC"] = "flexible-topic" unless ENV["PUBSUB_TOPIC"]
     ENV["PUBSUB_VERIFICATION_TOKEN"] = "abc123" unless ENV["PUBSUB_VERIFICATION_TOKEN"]
     @topic_name = ENV["PUBSUB_TOPIC"]
-    @pubsub = Google::Cloud::Pubsub.new
+    @pubsub = Google::Cloud::PubSub.new
+    @topic_admin = @pubsub.topic_admin
 
-    topic = @pubsub.topic @topic_name
-    @pubsub.create_topic @topic_name if topic.nil?
+    begin
+      @topic = @topic_admin.get_topic topic: @pubsub.topic_path(@topic_name)
+    rescue Google::Cloud::NotFoundError
+      @topic = nil
+    end
+
+    @topic_admin.create_topic name: @pubsub.topic_path(@topic_name) if @topic.nil?
     require_relative "../app.rb"
   end
 
@@ -89,8 +95,7 @@ def app
   end
 
   after :all do
-    topic = @pubsub.topic @topic_name
-    topic&.delete
+    @topic_admin.delete_topic topic: @topic.name if @topic
     Google::Auth::IDTokens.forget_sources!
   end
 end

appengine/pubsub/Gemfile

@@ -14,7 +14,7 @@
 
 source "https://rubygems.org"
 
-gem "google-cloud-pubsub"
+gem "google-cloud-pubsub", "~> 3.0"
 gem "json"
 gem "sinatra"
 gem "slim"

appengine/pubsub/app.rb

@@ -19,15 +19,15 @@
 require "google/cloud/pubsub"
 require "googleauth"
 
-pubsub = Google::Cloud::Pubsub.new
+pubsub = Google::Cloud::PubSub.new
 
 # Allows all hosts in development
 configure :development do
   set :host_authorization, { permitted_hosts: [] }
 end
 
 # [START gae_flex_pubsub_env]
-topic = pubsub.topic ENV["PUBSUB_TOPIC"]
+publisher = pubsub.publisher ENV["PUBSUB_TOPIC"]
 PUBSUB_VERIFICATION_TOKEN = ENV["PUBSUB_VERIFICATION_TOKEN"]
 # [END gae_flex_pubsub_env]
 
@@ -47,7 +47,7 @@
 end
 
 post "/publish" do
-  topic.publish params[:payload]
+  publisher.publish params[:payload]
 
   redirect "/", 303
 end

appengine/pubsub/spec/pubsub_spec.rb

@@ -29,10 +29,16 @@ def app
     ENV["PUBSUB_TOPIC"] = "flexible-topic" unless ENV["PUBSUB_TOPIC"]
     ENV["PUBSUB_VERIFICATION_TOKEN"] = "abc123" unless ENV["PUBSUB_VERIFICATION_TOKEN"]
     @topic_name = ENV["PUBSUB_TOPIC"]
-    @pubsub = Google::Cloud::Pubsub.new
+    @pubsub = Google::Cloud::PubSub.new
+    @topic_admin = @pubsub.topic_admin
 
-    topic = @pubsub.topic @topic_name
-    @pubsub.create_topic @topic_name if topic.nil?
+    begin
+      @topic = @topic_admin.get_topic topic: @pubsub.topic_path(@topic_name)
+    rescue Google::Cloud::NotFoundError
+      @topic = nil
+    end
+
+    @topic_admin.create_topic name: @pubsub.topic_path(@topic_name) if @topic.nil?
     require_relative "../app.rb"
   end
 
@@ -90,8 +96,7 @@ def app
   end
 
   after :all do
-    topic = @pubsub.topic @topic_name
-    topic&.delete
+    @topic_admin.delete_topic topic: @topic.name if @topic
     Google::Auth::IDTokens.forget_sources!
   end
 end