Merge branch...

Merge branch '437291-split-delete-orphans-scan-finding-license-scanning-approval-rules' into 'master' 

Split DeleteOrphansScanFindingLicenseScanningApprovalRules2 migration

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143510



Merged-by: Michał Zając <mzajac@gitlab.com>
Approved-by: Brian Williams <bwilliams@gitlab.com>
Approved-by: Michał Zając <mzajac@gitlab.com>
Co-authored-by: Prabakaran Murugesan <pmurugesan@gitlab.com>

db/docs/batched_background_migrations/delete_orphans_approval_merge_request_rules2.yml

@@ -5,5 +5,5 @@ Odescription: |
   that could have been created with project import.
 feature_category: security_policy_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127212
-queued_migration_version: 20230721095222
+queued_migration_version: 20230721095223
 milestone: '16.5'

db/post_migrate/20230721095222_delete_orphans_approval_project_rules2.rb

+# frozen_string_literal: true
+
+class DeleteOrphansApprovalProjectRules2 < Gitlab::Database::Migration[2.1]
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  PROJECT_MIGRATION = 'DeleteOrphansApprovalProjectRules2'
+  INTERVAL = 2.minutes
+
+  def up
+    queue_batched_background_migration(
+      PROJECT_MIGRATION,
+      :approval_project_rules,
+      :id,
+      job_interval: INTERVAL,
+      batch_size: 500,
+      sub_batch_size: 100
+    )
+  end
+
+  def down
+    delete_batched_background_migration(PROJECT_MIGRATION, :approval_project_rules, :id, [])
+  end
+end

db/post_migrate/20230721095222_delete_orphans_scan_finding_license_scanning_approval_rules2.rb → db/post_migrate/20230721095223_delete_orphans_approval_merge_request_rules2.rb

 # frozen_string_literal: true
 
-class DeleteOrphansScanFindingLicenseScanningApprovalRules2 < Gitlab::Database::Migration[2.1]
+class DeleteOrphansApprovalMergeRequestRules2 < Gitlab::Database::Migration[2.1]
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
   MERGE_REQUEST_MIGRATION = 'DeleteOrphansApprovalMergeRequestRules2'
-  PROJECT_MIGRATION = 'DeleteOrphansApprovalProjectRules2'
   INTERVAL = 2.minutes
 
   def up
-    queue_batched_background_migration(
-      PROJECT_MIGRATION,
-      :approval_project_rules,
-      :id,
-      job_interval: INTERVAL,
-      batch_size: 500,
-      sub_batch_size: 100
-    )
-
     queue_batched_background_migration(
       MERGE_REQUEST_MIGRATION,
       :approval_merge_request_rules,
@@ -28,7 +18,6 @@ def up
   end
 
   def down
-    delete_batched_background_migration(PROJECT_MIGRATION, :approval_project_rules, :id, [])
     delete_batched_background_migration(MERGE_REQUEST_MIGRATION, :approval_merge_request_rules, :id, [])
   end
 end

db/schema_migrations/20230721095223

+cc90683b1e4cf2f23917058f4f8537d4b91bcace568016c6f57adae5845ce68c
\ No newline at end of file

spec/migrations/20230721095222_delete_orphans_approval_project_rules2_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe DeleteOrphansApprovalProjectRules2, feature_category: :security_policy_management do
+  describe '#up' do
+    it 'schedules background migration for project approval rules' do
+      migrate!
+
+      expect(described_class::PROJECT_MIGRATION).to have_scheduled_batched_migration(
+        table_name: :approval_project_rules,
+        column_name: :id,
+        interval: described_class::INTERVAL)
+    end
+  end
+end

spec/migrations/20230721095222_delete_orphans_scan_finding_license_scanning_approval_rules2_spec.rb → spec/migrations/20230721095223_delete_orphans_approval_merge_request_rules2_spec.rb

@@ -3,20 +3,15 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe DeleteOrphansScanFindingLicenseScanningApprovalRules2, feature_category: :security_policy_management do
+RSpec.describe DeleteOrphansApprovalMergeRequestRules2, feature_category: :security_policy_management do
   describe '#up' do
-    it 'schedules background migration for both levels of approval rules' do
+    it 'schedules background migration for merge request approval rules' do
       migrate!
 
       expect(described_class::MERGE_REQUEST_MIGRATION).to have_scheduled_batched_migration(
         table_name: :approval_merge_request_rules,
         column_name: :id,
         interval: described_class::INTERVAL)
-
-      expect(described_class::PROJECT_MIGRATION).to have_scheduled_batched_migration(
-        table_name: :approval_project_rules,
-        column_name: :id,
-        interval: described_class::INTERVAL)
     end
   end
 end