Merge branch 'remove_kwargs_from_storage_move_worker' into 'master'

Remove kwargs from storage move worker

Closes #217175

See merge request gitlab-org/gitlab!31412

app/models/project_repository_storage_move.rb

@@ -39,8 +39,9 @@ class ProjectRepositoryStorageMove < ApplicationRecord
     after_transition initial: :scheduled do |storage_move, _|
       storage_move.run_after_commit do
         ProjectUpdateRepositoryStorageWorker.perform_async(
-          storage_move.project_id, storage_move.destination_storage_name,
-          repository_storage_move_id: storage_move.id
+          storage_move.project_id,
+          storage_move.destination_storage_name,
+          storage_move.id
         )
       end
     end

app/workers/project_update_repository_storage_worker.rb

@@ -5,7 +5,7 @@ class ProjectUpdateRepositoryStorageWorker # rubocop:disable Scalability/Idempot
 
   feature_category :gitaly
 
-  def perform(project_id, new_repository_storage_key, repository_storage_move_id: nil)
+  def perform(project_id, new_repository_storage_key, repository_storage_move_id = nil)
     repository_storage_move =
       if repository_storage_move_id
         ProjectRepositoryStorageMove.find(repository_storage_move_id)

changelogs/unreleased/remove_kwargs_from_storage_move_worker.yml

+---
+title: Remove kwargs from storage move worker
+merge_request: 31412
+author:
+type: fixed

spec/models/project_repository_storage_move_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe ProjectRepositoryStorageMove, type: :model do
 
       context 'and transits to scheduled' do
         it 'triggers ProjectUpdateRepositoryStorageWorker' do
-          expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', repository_storage_move_id: storage_move.id)
+          expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', storage_move.id)
 
           storage_move.schedule!
         end

spec/models/project_spec.rb

@@ -2844,7 +2844,7 @@ describe Project do
     end
 
     it 'schedules the transfer of the repository to the new storage and locks the project' do
-      expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', repository_storage_move_id: anything)
+      expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', anything)
 
       project.change_repository_storage('test_second_storage')
       project.save!

spec/workers/project_update_repository_storage_worker_spec.rb

@@ -40,7 +40,7 @@ describe ProjectUpdateRepositoryStorageWorker do
         expect(service).to receive(:execute)
 
         expect do
-          subject.perform(nil, nil, repository_storage_move_id: repository_storage_move.id)
+          subject.perform(nil, nil, repository_storage_move.id)
         end.not_to change(ProjectRepositoryStorageMove, :count)
       end
     end