Enable new cops, fix offenses, update todos (#4831)

philippthun · web-flow · commit f8ed78edd613 · 2026-02-11T09:42:31.000+01:00
And also remove unneeded configuration, order cops and cleanup stuff.
diff --git a/.rubocop_cc.yml b/.rubocop_cc.yml
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/app/actions/app_update.rb b/app/actions/app_update.rb
@@ -95,7 +95,7 @@ def validate_stack_state(app, message, lifecycle)
       stack = Stack.find(name: message.buildpack_data.stack)
       return [] unless stack
 
-      if app.builds_dataset.count.zero?
+      if app.builds_dataset.empty?
         StackStateValidator.validate_for_new_app!(stack)
       else
         StackStateValidator.validate_for_restaging!(stack)
diff --git a/app/actions/build_create.rb b/app/actions/build_create.rb
@@ -202,7 +202,7 @@ def validate_stack_state!(lifecycle, app)
     end
 
     def first_build_for_app?(app)
-      app.builds_dataset.count.zero?
+      app.builds_dataset.empty?
     end
   end
 end
diff --git a/app/actions/v2/app_update.rb b/app/actions/v2/app_update.rb
@@ -193,7 +193,7 @@ def validate_stack_state(app, request_attrs)
         stack = Stack.find(guid: request_attrs['stack_guid'])
         return unless stack
 
-        stack_warnings = if app.builds_dataset.count.zero?
+        stack_warnings = if app.builds_dataset.empty?
                            StackStateValidator.validate_for_new_app!(stack)
                          else
                            StackStateValidator.validate_for_restaging!(stack)
diff --git a/app/jobs/runtime/failed_jobs_cleanup.rb b/app/jobs/runtime/failed_jobs_cleanup.rb
@@ -26,7 +26,7 @@ def perform
           orphaned_delayed_jobs = Delayed::Job.
                                   where(Sequel.lit("run_at < CURRENT_TIMESTAMP - INTERVAL '?' DAY", force_delete_after))
 
-          unless orphaned_delayed_jobs.count.zero?
+          unless orphaned_delayed_jobs.empty?
             logger.info("Deleting #{orphaned_delayed_jobs.count} orphaned Delayed Jobs older than #{force_delete_after} days")
 
             orphaned_delayed_jobs.delete
diff --git a/db/migrations/20170724170303_grow_service_instances_syslog_drain_url.rb b/db/migrations/20170724170303_grow_service_instances_syslog_drain_url.rb
@@ -1,9 +1,7 @@
 Sequel.migration do
   up do
     alter_table :service_instances do
-      # rubocop:disable Migration/IncludeStringSize
       set_column_type :syslog_drain_url, String, text: true
-      # rubocop:enable Migration/IncludeStringSize
     end
   end
 end
diff --git a/db/migrations/20170724173748_grow_service_bindings_syslog_drain_url.rb b/db/migrations/20170724173748_grow_service_bindings_syslog_drain_url.rb
@@ -1,9 +1,7 @@
 Sequel.migration do
   up do
     alter_table :service_bindings do
-      # rubocop:disable Migration/IncludeStringSize
       set_column_type :syslog_drain_url, String, text: true
-      # rubocop:enable Migration/IncludeStringSize
     end
   end
 end
diff --git a/db/migrations/20180710115626_change_broker_catalog_descriptions_to_type_text.rb b/db/migrations/20180710115626_change_broker_catalog_descriptions_to_type_text.rb
@@ -6,15 +6,11 @@
     # older brokers that may have long descriptions. Here we are disabling
     # rubocop from checking the string size.
     alter_table :services do
-      # rubocop:disable Migration/IncludeStringSize
       set_column_type :description, String, text: true
-      # rubocop:enable Migration/IncludeStringSize
     end
 
     alter_table :service_plans do
-      # rubocop:disable Migration/IncludeStringSize
       set_column_type :description, String, text: true
-      # rubocop:enable Migration/IncludeStringSize
     end
   end
 end
diff --git a/db/migrations/20180927105539_add_broker_name_and_guid_to_service_usage_event.rb b/db/migrations/20180927105539_add_broker_name_and_guid_to_service_usage_event.rb
@@ -5,9 +5,7 @@
     # field type here.
     # For the guid we have control, so we explicitly set a limit.
 
-    # rubocop:disable Migration/IncludeStringSize
     add_column :service_usage_events, :service_broker_name, String, null: true
-    # rubocop:enable Migration/IncludeStringSize
     add_column :service_usage_events, :service_broker_guid, String, null: true, size: 255
   end
 end
diff --git a/db/migrations/20190302003850_add_revision_description_column.rb b/db/migrations/20190302003850_add_revision_description_column.rb
@@ -1,9 +1,7 @@
 Sequel.migration do
   change do
     alter_table(:revisions) do
-      # rubocop:disable Migration/IncludeStringSize
       add_column :description, String, text: true, default: 'N/A', null: false
-      # rubocop:enable Migration/IncludeStringSize
     end
   end
 end
diff --git a/db/migrations/20190930225152_add_sidecars_to_droplets.rb b/db/migrations/20190930225152_add_sidecars_to_droplets.rb
@@ -1,9 +1,7 @@
 Sequel.migration do
   change do
     alter_table :droplets do
-      # rubocop:disable Migration/IncludeStringSize
       add_column :sidecars, String, text: true, default: nil
-      # rubocop:enable Migration/IncludeStringSize
     end
   end
 end
diff --git a/lib/cloud_controller/seeds.rb b/lib/cloud_controller/seeds.rb
@@ -124,7 +124,7 @@ def find_routing_guid(domain)
       end
 
       def create_seed_security_groups(config)
-        return unless config.get(:security_group_definitions) && SecurityGroup.count == 0
+        return unless config.get(:security_group_definitions) && SecurityGroup.empty?
 
         config.get(:security_group_definitions).each do |security_group|
           seed_security_group = security_group.dup
diff --git a/lib/locket/lock_runner.rb b/lib/locket/lock_runner.rb
@@ -7,9 +7,9 @@ class Error < StandardError
     end
 
     def initialize(key:, owner:, host:, port:, client_ca_path:, client_cert_path:, client_key_path:)
-      client_ca = File.open(client_ca_path).read
-      client_key = File.open(client_key_path).read
-      client_cert = File.open(client_cert_path).read
+      client_ca = File.read(client_ca_path)
+      client_key = File.read(client_key_path)
+      client_cert = File.read(client_cert_path)
 
       @service = Models::Locket::Stub.new(
         "#{host}:#{port}",
@@ -29,15 +29,11 @@ def start
         loop do
           begin
             service.lock(build_lock_request)
-            if !@lock_acquired then
-              logger.info("Acquired lock '#{key}' for owner '#{owner}'")
-            end
+            logger.info("Acquired lock '#{key}' for owner '#{owner}'") unless @lock_acquired
             @lock_acquired = true
             failed = false
           rescue GRPC::BadStatus => e
-            if !failed then
-              logger.info("Failed to acquire lock '#{key}' for owner '#{owner}': #{e.message}")
-            end
+            logger.info("Failed to acquire lock '#{key}' for owner '#{owner}': #{e.message}") unless failed
             failed = true
             @lock_acquired = false
           end
@@ -65,9 +61,9 @@ def build_lock_request
           resource: {
             key: key,
             owner: owner,
-            type_code: Models::TypeCode::LOCK,
+            type_code: Models::TypeCode::LOCK
           },
-          ttl_in_seconds: 15,
+          ttl_in_seconds: 15
         }
       )
     end
diff --git a/lib/sequel_plugins/vcap_relations.rb b/lib/sequel_plugins/vcap_relations.rb
@@ -6,7 +6,7 @@ def self.apply(model)
 
   module InstanceMethods
     def has_one_to_many?(association)
-      association_type(association) == :one_to_many && send(association).count > 0
+      association_type(association) == :one_to_many && send(association).any?
     end
 
     def has_one_to_one?(association)
