Merge branch 'rescue-alignment' into 'master'

Fix Layout/RescueEnsureAlignment Cop

See merge request gitlab-org/gitlab!41093

.rubocop_todo.yml

@@ -69,20 +69,6 @@ Layout/LineLength:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'app/models/blob_viewer/dependency_manager.rb'
-    - 'app/models/project.rb'
-    - 'app/services/prometheus/proxy_service.rb'
-    - 'app/workers/delete_stored_files_worker.rb'
-    - 'config/initializers/1_settings.rb'
-    - 'config/initializers/trusted_proxies.rb'
-    - 'lib/gitlab/background_migration/archive_legacy_traces.rb'
-    - 'lib/gitlab/highlight.rb'
-    - 'lib/tasks/gitlab/lfs/migrate.rake'
-
 # Offense count: 36
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:

app/models/blob_viewer/dependency_manager.rb

@@ -33,8 +33,8 @@ module BlobViewer
       @json_data ||= begin
         prepare!
         Gitlab::Json.parse(blob.data)
-      rescue
-        {}
+                     rescue
+                       {}
       end
     end
 

app/models/project.rb

@@ -2152,8 +2152,8 @@ class Project < ApplicationRecord
         data = repository.route_map_for(sha)
 
         Gitlab::RouteMap.new(data) if data
-      rescue Gitlab::RouteMap::FormatError
-        nil
+               rescue Gitlab::RouteMap::FormatError
+                 nil
       end
     end
 

app/services/prometheus/proxy_service.rb

@@ -44,8 +44,8 @@ module Prometheus
     def self.from_cache(proxyable_class_name, proxyable_id, method, path, params)
       proxyable_class = begin
         proxyable_class_name.constantize
-      rescue NameError
-        nil
+                        rescue NameError
+                          nil
       end
       return unless proxyable_class
 

app/workers/delete_stored_files_worker.rb

@@ -9,8 +9,8 @@ class DeleteStoredFilesWorker # rubocop:disable Scalability/IdempotentWorker
   def perform(class_name, keys)
     klass = begin
       class_name.constantize
-    rescue NameError
-      nil
+            rescue NameError
+              nil
     end
 
     unless klass

changelogs/unreleased/rescue-alignment.yml

+---
+title: Fix Layout/RescueEnsureAlignment cop
+merge_request: 41093
+author: Rajendra Kadam
+type: fixed

config/initializers/1_settings.rb

@@ -176,8 +176,8 @@ Settings.gitlab['user'] ||= 'git'
 Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
 Settings.gitlab['user_home'] ||= begin
   Etc.getpwnam(Settings.gitlab['user']).dir
-rescue ArgumentError # no user configured
-  '/home/' + Settings.gitlab['user']
+                                 rescue ArgumentError # no user configured
+                                   '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?

config/initializers/trusted_proxies.rb

@@ -15,7 +15,7 @@ end
 
 gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
   IPAddr.new(proxy)
-rescue IPAddr::InvalidAddressError
+                         rescue IPAddr::InvalidAddressError
 end.compact
 
 Rails.application.config.action_dispatch.trusted_proxies = (

lib/gitlab/highlight.rb

@@ -31,8 +31,8 @@ module Gitlab
     def lexer
       @lexer ||= custom_language || begin
         Rouge::Lexer.guess(filename: @blob_name, source: @blob_content).new
-      rescue Rouge::Guesser::Ambiguous => e
-        e.alternatives.min_by(&:tag)
+                                    rescue Rouge::Guesser::Ambiguous => e
+                                      e.alternatives.min_by(&:tag)
       end
     end
 

lib/tasks/gitlab/lfs/migrate.rake

@@ -9,12 +9,12 @@ namespace :gitlab do
 
       LfsObject.with_files_stored_locally
         .find_each(batch_size: 10) do |lfs_object|
-          lfs_object.file.migrate!(LfsObjectUploader::Store::REMOTE)
+        lfs_object.file.migrate!(LfsObjectUploader::Store::REMOTE)
 
-          logger.info("Transferred LFS object #{lfs_object.oid} of size #{lfs_object.size.to_i.bytes} to object storage")
-        rescue => e
-          logger.error("Failed to transfer LFS object #{lfs_object.oid} with error: #{e.message}")
-        end
+        logger.info("Transferred LFS object #{lfs_object.oid} of size #{lfs_object.size.to_i.bytes} to object storage")
+      rescue => e
+        logger.error("Failed to transfer LFS object #{lfs_object.oid} with error: #{e.message}")
+      end
     end
 
     task migrate_to_local: :environment do