feat: Update rubocop autofix to use Rubocop 1.59

googleapis · Dec 12, 2023 · a628ff4 · a628ff4
1 parent b036577
commit a628ff4
Show file tree

Hide file tree

Showing 68 changed files with 114 additions and 113 deletions.
diff --git a/.toys/run/Gemfile b/.toys/run/Gemfile
@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "gapic-generator",       path: "../../gapic-generator"
 gem "gapic-generator-ads", path: "../../gapic-generator-ads"
 gem "gapic-generator-cloud", path: "../../gapic-generator-cloud"
-gem "grpc-tools", "~> 1.58.0"
+gem "grpc-tools", "~> 1.60.0"
diff --git a/gapic-generator-ads/Gemfile b/gapic-generator-ads/Gemfile
@@ -8,3 +8,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem "gapic-generator", path: "../gapic-generator"
+
+gem "grpc-tools", "~> 1.60.0"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.0"
+gem "pry", ">= 0.14"
+gem "redcarpet", "~> 3.0"
+gem "yard", "~> 0.9"
diff --git a/gapic-generator-ads/Gemfile.lock b/gapic-generator-ads/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       actionpack (~> 5.2)
       google-cloud-common (~> 1.2)
       google-protobuf (~> 3.25, >= 3.25.1)
-      google-style (~> 1.26.4)
+      google-style (~> 1.27.0)
       googleapis-common-protos-types (~> 1.8)
 
 PATH
@@ -45,14 +45,14 @@ GEM
       google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.7)
     google-protobuf (3.25.1-x86_64-linux)
-    google-style (1.26.4)
-      rubocop (~> 1.57.2)
+    google-style (1.27.0)
+      rubocop (~> 1.56)
     googleapis-common-protos-types (1.11.0)
       google-protobuf (~> 3.18)
-    grpc-tools (1.59.2)
+    grpc-tools (1.60.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.7.0)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -91,15 +91,15 @@ GEM
     redcarpet (3.6.0)
     regexp_parser (2.8.3)
     rexml (3.2.6)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -117,7 +117,7 @@ PLATFORMS
 DEPENDENCIES
   gapic-generator!
   gapic-generator-ads!
-  grpc-tools (~> 1.59.2)
+  grpc-tools (~> 1.60.0)
   minitest (~> 5.16)
   minitest-autotest (~> 1.0)
   minitest-focus (~> 1.0)

diff --git a/gapic-generator-ads/gapic-generator-ads.gemspec b/gapic-generator-ads/gapic-generator-ads.gemspec
@@ -39,15 +39,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["protoc-gen-ruby_ads"]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "gapic-generator", "= #{Gapic::Generator::Ads::VERSION}"
-
-  spec.add_development_dependency "grpc-tools", "~> 1.59.2"
-  spec.add_development_dependency "minitest", "~> 5.16"
-  spec.add_development_dependency "minitest-autotest", "~> 1.0"
-  spec.add_development_dependency "minitest-focus", "~> 1.0"
-  spec.add_development_dependency "pry", ">= 0.14"
-  spec.add_development_dependency "redcarpet", "~> 3.0"
-  spec.add_development_dependency "yard", "~> 0.9"
 end
diff --git a/gapic-generator-cloud/Gemfile b/gapic-generator-cloud/Gemfile
@@ -8,3 +8,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem "gapic-generator", path: "../gapic-generator"
+
+gem "grpc-tools", "~> 1.60.0"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.0"
+gem "pry", ">= 0.14"
+gem "redcarpet", "~> 3.0"
+gem "yard", "~> 0.9"
diff --git a/gapic-generator-cloud/Gemfile.lock b/gapic-generator-cloud/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       actionpack (~> 5.2)
       google-cloud-common (~> 1.2)
       google-protobuf (~> 3.25, >= 3.25.1)
-      google-style (~> 1.26.4)
+      google-style (~> 1.27.0)
       googleapis-common-protos-types (~> 1.8)
 
 PATH
@@ -45,14 +45,14 @@ GEM
       google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.7)
     google-protobuf (3.25.1)
-    google-style (1.26.4)
-      rubocop (~> 1.57.2)
+    google-style (1.27.0)
+      rubocop (~> 1.56)
     googleapis-common-protos-types (1.11.0)
       google-protobuf (~> 3.18)
-    grpc-tools (1.59.2)
+    grpc-tools (1.60.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.7.0)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -93,15 +93,15 @@ GEM
     redcarpet (3.6.0)
     regexp_parser (2.8.3)
     rexml (3.2.6)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -119,7 +119,7 @@ PLATFORMS
 DEPENDENCIES
   gapic-generator!
   gapic-generator-cloud!
-  grpc-tools (~> 1.59.2)
+  grpc-tools (~> 1.60.0)
   minitest (~> 5.16)
   minitest-autotest (~> 1.0)
   minitest-focus (~> 1.0)

diff --git a/gapic-generator-cloud/gapic-generator-cloud.gemspec b/gapic-generator-cloud/gapic-generator-cloud.gemspec
@@ -38,15 +38,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["protoc-gen-ruby_cloud", "ruby-cloud-docker-entrypoint"]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "gapic-generator", "= #{Gapic::Generator::Cloud::VERSION}"
-
-  spec.add_development_dependency "grpc-tools", "~> 1.59.2"
-  spec.add_development_dependency "minitest", "~> 5.16"
-  spec.add_development_dependency "minitest-autotest", "~> 1.0"
-  spec.add_development_dependency "minitest-focus", "~> 1.0"
-  spec.add_development_dependency "pry", ">= 0.14"
-  spec.add_development_dependency "redcarpet", "~> 3.0"
-  spec.add_development_dependency "yard", "~> 0.9"
 end
diff --git a/gapic-generator/Gemfile b/gapic-generator/Gemfile
@@ -6,3 +6,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in gapic-generator.gemspec
 gemspec
+
+gem "grpc-tools", "~> 1.60.0"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.0"
+gem "pry", ">= 0.14"
+gem "redcarpet", "~> 3.0"
+gem "yard", "~> 0.9"
diff --git a/gapic-generator/Gemfile.lock b/gapic-generator/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       actionpack (~> 5.2)
       google-cloud-common (~> 1.2)
       google-protobuf (~> 3.25, >= 3.25.1)
-      google-style (~> 1.26.4)
+      google-style (~> 1.27.0)
       googleapis-common-protos-types (~> 1.8)
 
 GEM
@@ -39,14 +39,14 @@ GEM
       google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.7)
     google-protobuf (3.25.1-x86_64-linux)
-    google-style (1.26.4)
-      rubocop (~> 1.57.2)
+    google-style (1.27.0)
+      rubocop (~> 1.56)
     googleapis-common-protos-types (1.11.0)
       google-protobuf (~> 3.18)
-    grpc-tools (1.59.2)
+    grpc-tools (1.60.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.7.0)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -85,15 +85,15 @@ GEM
     redcarpet (3.6.0)
     regexp_parser (2.8.3)
     rexml (3.2.6)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -110,7 +110,7 @@ PLATFORMS
 
 DEPENDENCIES
   gapic-generator!
-  grpc-tools (~> 1.59.2)
+  grpc-tools (~> 1.60.0)
   minitest (~> 5.16)
   minitest-autotest (~> 1.0)
   minitest-focus (~> 1.0)

diff --git a/gapic-generator/gapic-generator.gemspec b/gapic-generator/gapic-generator.gemspec
@@ -38,19 +38,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ["gapic-generator", "protoc-gen-ruby_gapic"]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "actionpack", "~> 5.2"
   spec.add_dependency "googleapis-common-protos-types", "~> 1.8"
   spec.add_dependency "google-cloud-common", "~> 1.2"
   spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.1"
-  spec.add_dependency "google-style", "~> 1.26.4"
-
-  spec.add_development_dependency "grpc-tools", "~> 1.59.2"
-  spec.add_development_dependency "minitest", "~> 5.16"
-  spec.add_development_dependency "minitest-autotest", "~> 1.0"
-  spec.add_development_dependency "minitest-focus", "~> 1.0"
-  spec.add_development_dependency "pry", ">= 0.14"
-  spec.add_development_dependency "redcarpet", "~> 3.0"
-  spec.add_development_dependency "yard", "~> 0.9"
+  spec.add_dependency "google-style", "~> 1.27.0"
 end
diff --git a/gapic-generator/lib/gapic/grpc_service_config/parser.rb b/gapic-generator/lib/gapic/grpc_service_config/parser.rb
@@ -62,7 +62,7 @@ module Parser
         "UNAUTHENTICATED"
       ].freeze
 
-      ERROR_STRING_MAPPING = ERROR_CODE_MAPPING.each_with_index.each_with_object({}) do |(str, num), hash|
+      ERROR_STRING_MAPPING = ERROR_CODE_MAPPING.each_with_index.with_object({}) do |(str, num), hash|
         hash[str] = num
       end.freeze
 

diff --git a/gapic-generator/lib/gapic/path_pattern/segment.rb b/gapic-generator/lib/gapic/path_pattern/segment.rb
@@ -127,7 +127,7 @@ def to_regex_str
       def == other
         return false unless other.is_a? self.class
 
-        (pattern == other.pattern && position == other.position)
+        pattern == other.pattern && position == other.position
       end
     end
 
@@ -272,9 +272,10 @@ def self.create_simple name
       def == other
         return false unless other.is_a? self.class
 
-        (type == other.type && pattern == other.pattern &&
+        type == other.type &&
+          pattern == other.pattern &&
           resource_names == other.resource_names &&
-          resource_patterns == other.resource_patterns)
+          resource_patterns == other.resource_patterns
       end
     end
 

diff --git a/gapic-generator/lib/gapic/schema/api.rb b/gapic-generator/lib/gapic/schema/api.rb
@@ -456,7 +456,7 @@ def analyze_resources
           file.resources.each { |resource| populate_resource_lookups resource, types, patterns }
           file.messages.each { |message| populate_message_resource_lookups message, types, patterns }
         end
-        types.each do |_type, resource|
+        types.each_value do |resource|
           parents = resource.parsed_parent_patterns
                             .flat_map { |pat| Array(patterns[pat]) }
                             .uniq

diff --git a/shared/Gemfile b/shared/Gemfile
@@ -12,7 +12,7 @@ gem "gapic-generator-cloud", path: "../gapic-generator-cloud"
 gem "google-cloud-location", ">= 0.4", "< 2.a"
 gem "google-iam-v1", ">= 0.4", "< 2.a"
 
-gem "grpc-tools", "~> 1.59.2"
+gem "grpc-tools", "~> 1.60.0"
 gem "minitest", "~> 5.16"
 gem "minitest-autotest", "~> 1.0"
 gem "minitest-focus", "~> 1.0"

diff --git a/shared/output/ads/googleads/lib/google/ads/googleads/v12/services/campaign_service_pb.rb b/shared/output/ads/googleads/lib/google/ads/googleads/v12/services/campaign_service_pb.rb
diff --git a/shared/output/cloud/compute_small/lib/google/cloud/compute/v1/compute_small_pb.rb b/shared/output/cloud/compute_small/lib/google/cloud/compute/v1/compute_small_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/attestation_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/attestation_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/build_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/build_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/common_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/common_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/compliance_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/compliance_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/cvss_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/cvss_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/deployment_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/deployment_pb.rb
diff --git a/shared/output/cloud/grafeas_v1/lib/grafeas/v1/discovery_pb.rb b/shared/output/cloud/grafeas_v1/lib/grafeas/v1/discovery_pb.rb