chore: More fixes to conform to the upcoming Rubocop update (#9897)

Author: dazuma

google-cloud-container_analysis/samples/acceptance/sample_test.rb

@@ -32,22 +32,20 @@ def new_note_id
   before do
     test_name = name.tr " ", "-"
     uuid = SecureRandom.uuid
-    @image_url = "https://gcr.io/" + test_name + "/" + uuid
+    @image_url = "https://gcr.io/#{test_name}/#{uuid}"
     @project_id = ENV["GOOGLE_CLOUD_PROJECT"]
     @try_limit = 10
     @sleep_time = 1
-    @subscription_id = "occurrence-subscription-" + uuid
+    @subscription_id = "occurrence-subscription-#{uuid}"
     @uuid = uuid
     @note_ids_to_delete = []
   end
 
   after do
     @note_ids_to_delete.each do |note_id|
-      begin
-        delete_note project_id: @project_id, note_id: note_id
-      rescue StandardError
-        puts "Failed to delete #{note_id}"
-      end
+      delete_note project_id: @project_id, note_id: note_id
+    rescue StandardError
+      puts "Failed to delete #{note_id}"
     end
   end
 

google-cloud-datastore-admin-v1/samples/Gemfile

@@ -20,11 +20,9 @@ source "https://rubygems.org"
 if ENV["GOOGLE_CLOUD_SAMPLES_TEST"] == "master"
   gem "google-cloud-datastore-admin-v1", path: "../../google-cloud-datastore-admin-v1"
 else
-  # rubocop:disable Bundler/DuplicatedGem
   # [START datastore_admin_dependencies]
   gem "google-cloud-datastore-admin-v1"
   # [END datastore_admin_dependencies]
-  # rubocop:enable Bundler/DuplicatedGem
 end
 
 group :test do

google-cloud-datastore-admin-v1/samples/acceptance/snippets_test.rb

@@ -45,29 +45,27 @@
   end
 
   it "entities_export, entities_import" do
-    begin
-      op = nil
-      out, _err = capture_io do
-        op = entities_export project_id: project_id, output_url_prefix: output_url_prefix
-      end
-      assert_includes out, "Entities were exported"
-      assert op
-      assert op.response
-      assert_equal "#{output_url_prefix}/#{storage_file_prefix}.overall_export_metadata", op.response.output_url
+    op = nil
+    out, _err = capture_io do
+      op = entities_export project_id: project_id, output_url_prefix: output_url_prefix
+    end
+    assert_includes out, "Entities were exported"
+    assert op
+    assert op.response
+    assert_equal "#{output_url_prefix}/#{storage_file_prefix}.overall_export_metadata", op.response.output_url
 
-      out, _err = capture_io do
-        entities_import project_id: project_id, input_url: op.response.output_url
-      end
-      assert_includes out, "Entities were imported"
-    ensure
-      # cleanup: delete exported objects
-      require "google/cloud/storage"
-      storage = Google::Cloud::Storage.new
-      files = storage.bucket(storage_bucket_name).files prefix: storage_file_prefix
-      files.each do |f|
-        f.delete
-        puts "Deleted: #{f.name}"
-      end
+    out, _err = capture_io do
+      entities_import project_id: project_id, input_url: op.response.output_url
+    end
+    assert_includes out, "Entities were imported"
+  ensure
+    # cleanup: delete exported objects
+    require "google/cloud/storage"
+    storage = Google::Cloud::Storage.new
+    files = storage.bucket(storage_bucket_name).files prefix: storage_file_prefix
+    files.each do |f|
+      f.delete
+      puts "Deleted: #{f.name}"
     end
   end
 end

google-cloud-dialogflow/samples/acceptance/helper.rb

@@ -24,9 +24,7 @@ def get_entity_type_ids project_id:, display_name:
 
   selected_entity_types = entity_types.select { |entity_type| entity_type.display_name == display_name }
 
-  entity_type_ids = selected_entity_types.map { |entity_type| entity_type.name.split("/").last }
-
-  entity_type_ids
+  selected_entity_types.map { |entity_type| entity_type.name.split("/").last }
 end
 
 def clean_entity_types project_id:, display_name:
@@ -46,9 +44,7 @@ def get_intent_ids project_id:, display_name:
 
   selected_intents = intents.select { |intent| intent.display_name == display_name }
 
-  intent_ids = selected_intents.map { |intent| intent.name.split("/").last }
-
-  intent_ids
+  selected_intents.map { |intent| intent.name.split("/").last }
 end
 
 def clean_intents project_id:, display_name:

google-cloud-kms/samples/Gemfile

@@ -20,11 +20,9 @@ source "https://rubygems.org"
 if ENV["GOOGLE_CLOUD_SAMPLES_TEST"] == "master"
   gem "google-cloud-kms", path: "../../google-cloud-kms"
 else
-  # rubocop:disable Bundler/DuplicatedGem
   # [START kms_dependencies]
   gem "google-cloud-kms"
   # [END kms_dependencies]
-  # rubocop:enable Bundler/DuplicatedGem
 end
 
 group :test do

google-cloud-scheduler/samples/app.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-STDOUT.sync = true
+$stdout.sync = true
 
 # [START cloud_scheduler_app]
 require "sinatra"

google-cloud-security_center/samples/acceptance/helper.rb

@@ -21,13 +21,11 @@
 def retry_resource_exhaustion
   last_error = nil
   5.times do
-    begin
-      return yield
-    rescue Google::Cloud::ResourceExhaustedError => e
-      last_error = e
-      puts "\n#{e} Gonna try again"
-      sleep rand(1..5)
-    end
+    return yield
+  rescue Google::Cloud::ResourceExhaustedError => e
+    last_error = e
+    puts "\n#{e} Gonna try again"
+    sleep rand(1..5)
   end
   raise last_error
 end

google-cloud-security_center/samples/acceptance/notification_test.rb

@@ -41,20 +41,18 @@ def cleanup!
   def create_fixture!
     last_error = nil
     3.times do
-      begin
-        create_notification_config org_id:       @org_id,
-                                   config_id:    @config_id,
-                                   pubsub_topic: @pubsub_topic
-        return
-      rescue Google::Cloud::FailedPreconditionError => e
-        # Creating this fixture occasionally raises a precondition error.
-        # I'm not certain why, but because we can have tests running
-        # concurrently, I suspect it happens when multiple fixtures are being
-        # created simultaneously. Retry with a random delay if this happens.
-        puts "Got precondition error when creating fixture #{@config_id}"
-        sleep rand(2.0..7.0)
-        last_error = e
-      end
+      create_notification_config org_id:       @org_id,
+                                  config_id:    @config_id,
+                                  pubsub_topic: @pubsub_topic
+      return
+    rescue Google::Cloud::FailedPreconditionError => e
+      # Creating this fixture occasionally raises a precondition error.
+      # I'm not certain why, but because we can have tests running
+      # concurrently, I suspect it happens when multiple fixtures are being
+      # created simultaneously. Retry with a random delay if this happens.
+      puts "Got precondition error when creating fixture #{@config_id}"
+      sleep rand(2.0..7.0)
+      last_error = e
     end
     raise last_error
   end

google-cloud-talent/samples/acceptance/helper.rb

@@ -137,12 +137,10 @@ def get_company_helper company_name
 
 def timed_retry
   5.times do
-    begin
-      return yield
-    rescue StandardError => e
-      puts "\n#{e} Gonna try again"
-      sleep 5
-    end
+    return yield
+  rescue StandardError => e
+    puts "\n#{e} Gonna try again"
+    sleep 5
   end
   raise Google::Cloud::NotFoundError
 end

google-cloud-talent/samples/acceptance/talent_test.rb

@@ -80,7 +80,7 @@
                                  address,
                                  language_code
       end
-      matches = out.scan(/\sname:\s\"([^\"]*)\"/).flatten
+      matches = out.scan(/\sname:\s"([^"]*)"/).flatten
       assert_equal matches.size, 2
       matches.each { |job_match| assert get_job_helper(job_match) }
     end