Add latest changes from gitlab-org/gitlab@master

5 files changed, 13 insertions, 39 deletions

diff --git a/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent.rb b/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent.rb
index 728b60f7a0e..0c41d6af209 100644
--- a/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent.rb
+++ b/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent.rb
@@ -10,16 +10,12 @@ module Gitlab
         vulnerability_reads.project_id = cluster_agents.project_id
       SQL
 
-      RELATION = ->(relation) do
-        relation
-          .where(report_type: 7)
-      end
+      CLUSTER_IMAGE_SCANNING_REPORT_TYPE = 7
+
+      scope_to ->(relation) { relation.where(report_type: CLUSTER_IMAGE_SCANNING_REPORT_TYPE) }
 
       def perform
-        each_sub_batch(
-          operation_name: :update_all,
-          batching_scope: RELATION
-        ) do |sub_batch|
+        each_sub_batch(operation_name: :update_all) do |sub_batch|
           sub_batch
             .joins(CLUSTER_AGENTS_JOIN)
             .update_all('casted_cluster_agent_id = CAST(vulnerability_reads.cluster_agent_id AS bigint)')
diff --git a/lib/gitlab/background_migration/batching_strategies/backfill_project_statistics_with_container_registry_size_batching_strategy.rb b/lib/gitlab/background_migration/batching_strategies/backfill_project_statistics_with_container_registry_size_batching_strategy.rb
index 9ad119310f7..72da2b5a2b7 100644
--- a/lib/gitlab/background_migration/batching_strategies/backfill_project_statistics_with_container_registry_size_batching_strategy.rb
+++ b/lib/gitlab/background_migration/batching_strategies/backfill_project_statistics_with_container_registry_size_batching_strategy.rb
@@ -3,18 +3,9 @@
 module Gitlab
   module BackgroundMigration
     module BatchingStrategies
-      # Batching class to use for back-filling project_statistic's container_registry_size.
-      # Batches will be scoped to records where the project_ids are migrated
-      #
-      # If no more batches exist in the table, returns nil.
+      # Used to apply additional filters to the batching table, migrated to
+      # use BatchedMigrationJob#filter_batch with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93771
       class BackfillProjectStatisticsWithContainerRegistrySizeBatchingStrategy < PrimaryKeyBatchingStrategy
-        MIGRATION_PHASE_1_ENDED_AT = Date.new(2022, 01, 23).freeze
-
-        def apply_additional_filters(relation, job_arguments: [], job_class: nil)
-          relation.where(created_at: MIGRATION_PHASE_1_ENDED_AT..).or(
-            relation.where(migration_state: 'import_done')
-          ).select(:project_id).distinct
-        end
       end
     end
   end
diff --git a/lib/gitlab/background_migration/batching_strategies/backfill_vulnerability_reads_cluster_agent_batching_strategy.rb b/lib/gitlab/background_migration/batching_strategies/backfill_vulnerability_reads_cluster_agent_batching_strategy.rb
index f0d015198dc..c2fa00f66de 100644
--- a/lib/gitlab/background_migration/batching_strategies/backfill_vulnerability_reads_cluster_agent_batching_strategy.rb
+++ b/lib/gitlab/background_migration/batching_strategies/backfill_vulnerability_reads_cluster_agent_batching_strategy.rb
@@ -3,16 +3,9 @@
 module Gitlab
   module BackgroundMigration
     module BatchingStrategies
-      # Batching class to use for back-filling vulnerability_read's casted_cluster_agent_id from cluster_agent_id.
-      # Batches will be scoped to records where the report_type belongs to cluster_image_scanning.
-      #
-      # If no more batches exist in the table, returns nil.
+      # Used to apply additional filters to the batching table, migrated to
+      # use BatchedMigrationJob#filter_batch with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93771
       class BackfillVulnerabilityReadsClusterAgentBatchingStrategy < PrimaryKeyBatchingStrategy
-        CLUSTER_IMAGE_SCANNING_REPORT_TYPE = 7
-
-        def apply_additional_filters(relation, job_arguments: [], job_class: nil)
-          relation.where(report_type: CLUSTER_IMAGE_SCANNING_REPORT_TYPE)
-        end
       end
     end
   end
diff --git a/lib/gitlab/background_migration/batching_strategies/dismissed_vulnerabilities_strategy.rb b/lib/gitlab/background_migration/batching_strategies/dismissed_vulnerabilities_strategy.rb
index e1855b6cfee..9504d4eec11 100644
--- a/lib/gitlab/background_migration/batching_strategies/dismissed_vulnerabilities_strategy.rb
+++ b/lib/gitlab/background_migration/batching_strategies/dismissed_vulnerabilities_strategy.rb
@@ -3,14 +3,9 @@
 module Gitlab
   module BackgroundMigration
     module BatchingStrategies
-      # Batching class to use for setting state in vulnerabilitites table.
-      # Batches will be scoped to records where the dismissed_at is set.
-      #
-      # If no more batches exist in the table, returns nil.
+      # Used to apply additional filters to the batching table, migrated to
+      # use BatchedMigrationJob#filter_batch with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93771
       class DismissedVulnerabilitiesStrategy < PrimaryKeyBatchingStrategy
-        def apply_additional_filters(relation, job_arguments: [], job_class: nil)
-          relation.where.not(dismissed_at: nil)
-        end
       end
     end
   end
diff --git a/lib/gitlab/background_migration/set_correct_vulnerability_state.rb b/lib/gitlab/background_migration/set_correct_vulnerability_state.rb
index fd6cbcb8d05..a0cfeed618a 100644
--- a/lib/gitlab/background_migration/set_correct_vulnerability_state.rb
+++ b/lib/gitlab/background_migration/set_correct_vulnerability_state.rb
@@ -6,11 +6,10 @@ module Gitlab
     class SetCorrectVulnerabilityState < BatchedMigrationJob
       DISMISSED_STATE = 2
 
+      scope_to ->(relation) { relation.where.not(dismissed_at: nil) }
+
       def perform
-        each_sub_batch(
-          operation_name: :update_vulnerabilities_state,
-          batching_scope: -> (relation) { relation.where.not(dismissed_at: nil) }
-        ) do |sub_batch|
+        each_sub_batch(operation_name: :update_vulnerabilities_state) do |sub_batch|
           sub_batch.update_all(state: DISMISSED_STATE)
         end
       end