Add latest changes from gitlab-org/gitlab@master

2 files changed, 65 insertions, 0 deletions

diff --git a/rubocop/cop/migration/add_column_with_default.rb b/rubocop/cop/migration/add_column_with_default.rb
new file mode 100644
index 00000000000..8d1ab333dcf
--- /dev/null
+++ b/rubocop/cop/migration/add_column_with_default.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative '../../migration_helpers'
+
+module RuboCop
+  module Cop
+    module Migration
+      # Cop that checks if columns are added in a way that doesn't require
+      # downtime.
+      class AddColumnWithDefault < RuboCop::Cop::Cop
+        include MigrationHelpers
+
+        WHITELISTED_TABLES = [:application_settings].freeze
+
+        MSG = '`add_column_with_default` with `allow_null: false` may cause prolonged lock situations and downtime, ' \
+          'see https://gitlab.com/gitlab-org/gitlab/issues/38060'.freeze
+
+        def on_send(node)
+          return unless in_migration?(node)
+
+          name = node.children[1]
+
+          return unless name == :add_column_with_default
+
+          # Ignore whitelisted tables.
+          return if table_whitelisted?(node.children[2])
+
+          opts = node.children.last
+
+          return unless opts && opts.type == :hash
+
+          opts.each_node(:pair) do |pair|
+            if disallows_null_values?(pair)
+              add_offense(node, location: :selector)
+            end
+          end
+        end
+
+        def table_whitelisted?(symbol)
+          symbol && symbol.type == :sym &&
+            WHITELISTED_TABLES.include?(symbol.children[0])
+        end
+
+        def disallows_null_values?(pair)
+          options = [hash_key_type(pair), hash_key_name(pair), hash_value(pair)]
+
+          options == [:sym, :allow_null, :false] # rubocop:disable Lint/BooleanSymbol
+        end
+
+        def hash_key_type(pair)
+          pair.children[0].type
+        end
+
+        def hash_key_name(pair)
+          pair.children[0].children[0]
+        end
+
+        def hash_value(pair)
+          pair.children[1].type
+        end
+      end
+    end
+  end
+end
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb
index 1465c73d570..5f95703df01 100644
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
@@ -17,6 +17,7 @@ require_relative 'cop/prefer_class_methods_over_module'
 require_relative 'cop/put_project_routes_under_scope'
 require_relative 'cop/put_group_routes_under_scope'
 require_relative 'cop/migration/add_column'
+require_relative 'cop/migration/add_column_with_default'
 require_relative 'cop/migration/add_concurrent_foreign_key'
 require_relative 'cop/migration/add_concurrent_index'
 require_relative 'cop/migration/add_index'