Merge branch 'ab-namespace-ci-artifacts-migrationHelper' into 'master'

Move Gitlab::Artifacts::MigrationHelper to the Ci namespace

See merge request gitlab-org/gitlab!59920

lib/gitlab/artifacts/migration_helper.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module Artifacts
-    class MigrationHelper
-      def migrate_to_remote_storage(&block)
-        artifacts = ::Ci::JobArtifact.with_files_stored_locally
-        migrate(artifacts, ObjectStorage::Store::REMOTE, &block)
-      end
-
-      def migrate_to_local_storage(&block)
-        artifacts = ::Ci::JobArtifact.with_files_stored_remotely
-        migrate(artifacts, ObjectStorage::Store::LOCAL, &block)
-      end
-
-      private
-
-      def batch_size
-        ENV.fetch('MIGRATION_BATCH_SIZE', 10).to_i
-      end
-
-      def migrate(artifacts, store, &block)
-        artifacts.find_each(batch_size: batch_size) do |artifact| # rubocop:disable CodeReuse/ActiveRecord
-          artifact.file.migrate!(store)
-
-          yield artifact if block
-        rescue StandardError => e
-          raise StandardError.new("Failed to transfer artifact of type #{artifact.file_type} and ID #{artifact.id} with error: #{e.message}")
-        end
-      end
-    end
-  end
-end

lib/gitlab/ci/artifacts/migration_helper.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Artifacts
+      class MigrationHelper
+        def migrate_to_remote_storage(&block)
+          artifacts = ::Ci::JobArtifact.with_files_stored_locally
+          migrate(artifacts, ObjectStorage::Store::REMOTE, &block)
+        end
+
+        def migrate_to_local_storage(&block)
+          artifacts = ::Ci::JobArtifact.with_files_stored_remotely
+          migrate(artifacts, ObjectStorage::Store::LOCAL, &block)
+        end
+
+        private
+
+        def batch_size
+          ENV.fetch('MIGRATION_BATCH_SIZE', 10).to_i
+        end
+
+        def migrate(artifacts, store, &block)
+          artifacts.find_each(batch_size: batch_size) do |artifact| # rubocop:disable CodeReuse/ActiveRecord
+            artifact.file.migrate!(store)
+
+            yield artifact if block
+          rescue StandardError => e
+            raise StandardError.new("Failed to transfer artifact of type #{artifact.file_type} and ID #{artifact.id} with error: #{e.message}")
+          end
+        end
+      end
+    end
+  end
+end

lib/tasks/gitlab/artifacts/migrate.rake

@@ -10,7 +10,7 @@ namespace :gitlab do
       logger = Logger.new(STDOUT)
       logger.info('Starting transfer of artifacts to remote storage')
 
-      helper = Gitlab::Artifacts::MigrationHelper.new
+      helper = Gitlab::Ci::Artifacts::MigrationHelper.new
 
       begin
         helper.migrate_to_remote_storage do |artifact|
@@ -25,7 +25,7 @@ namespace :gitlab do
       logger = Logger.new(STDOUT)
       logger.info('Starting transfer of artifacts to local storage')
 
-      helper = Gitlab::Artifacts::MigrationHelper.new
+      helper = Gitlab::Ci::Artifacts::MigrationHelper.new
 
       begin
         helper.migrate_to_local_storage do |artifact|