Merge branch '10io-fix-cleanup-container-repository-worker-logs' into 'master'

Fix log statements in cleanup container repository worker

See merge request gitlab-org/gitlab!47060

app/workers/container_expiration_policies/cleanup_container_repository_worker.rb

@@ -16,15 +16,16 @@ module ContainerExpirationPolicies
       return unless throttling_enabled?
       return unless container_repository
 
+      log_extra_metadata_on_done(:container_repository_id, container_repository.id)
+
       unless allowed_to_run?(container_repository)
         container_repository.cleanup_unscheduled!
-        log_info(container_repository_id: container_repository.id, cleanup_status: :skipped)
+        log_extra_metadata_on_done(:cleanup_status, :skipped)
         return
       end
 
       result = ContainerExpirationPolicies::CleanupService.new(container_repository)
                                                           .execute
-      log_extra_metadata_on_done(:container_repository_id, result.payload[:container_repository_id])
       log_extra_metadata_on_done(:cleanup_status, result.payload[:cleanup_status])
     end
 

spec/workers/container_expiration_policies/cleanup_container_repository_worker_spec.rb

@@ -47,6 +47,8 @@ RSpec.describe ContainerExpirationPolicies::CleanupContainerRepositoryWorker do
 
         it 'skips the repository' do
           expect(ContainerExpirationPolicies::CleanupService).not_to receive(:new)
+          expect(worker).to receive(:log_extra_metadata_on_done).with(:container_repository_id, repository.id)
+          expect(worker).to receive(:log_extra_metadata_on_done).with(:cleanup_status, :skipped)
 
           expect { subject }.to change { ContainerRepository.waiting_for_cleanup.count }.from(1).to(0)
           expect(repository.reload.cleanup_unscheduled?).to be_truthy