Add latest changes from gitlab-org/gitlab@master

5 files changed, 37 insertions, 72 deletions

diff --git a/spec/workers/bulk_imports/entity_worker_spec.rb b/spec/workers/bulk_imports/entity_worker_spec.rb
index 4988a368598..325b31c85db 100644
--- a/spec/workers/bulk_imports/entity_worker_spec.rb
+++ b/spec/workers/bulk_imports/entity_worker_spec.rb
@@ -73,6 +73,8 @@ RSpec.describe BulkImports::EntityWorker, feature_category: :importers do
 
     it 'enqueues the pipeline workers from the next stage and re-enqueues itself' do
       expect_next_instance_of(BulkImports::Logger) do |logger|
+        expect(logger).to receive(:with_entity).with(entity).and_call_original
+
         expect(logger).to receive(:info).with(hash_including('message' => 'Stage starting', 'entity_stage' => 1))
       end
 
diff --git a/spec/workers/bulk_imports/export_request_worker_spec.rb b/spec/workers/bulk_imports/export_request_worker_spec.rb
index e9d0b6b24b2..2cc6348bb27 100644
--- a/spec/workers/bulk_imports/export_request_worker_spec.rb
+++ b/spec/workers/bulk_imports/export_request_worker_spec.rb
@@ -72,17 +72,14 @@ RSpec.describe BulkImports::ExportRequestWorker, feature_category: :importers do
               entity.update!(source_xid: nil)
 
               expect_next_instance_of(BulkImports::Logger) do |logger|
+                expect(logger).to receive(:with_entity).with(entity).and_call_original
+
                 expect(logger).to receive(:error).with(
                   a_hash_including(
-                    'bulk_import_entity_id' => entity.id,
-                    'bulk_import_id' => entity.bulk_import_id,
-                    'bulk_import_entity_type' => entity.source_type,
-                    'source_full_path' => entity.source_full_path,
                     'exception.backtrace' => anything,
                     'exception.class' => 'NoMethodError',
                     'exception.message' => /^undefined method `model_id' for nil:NilClass/,
-                    'message' => 'Failed to fetch source entity id',
-                    'source_version' => entity.bulk_import.source_version_info.to_s
+                    'message' => 'Failed to fetch source entity id'
                   )
                 ).twice
               end
@@ -148,7 +145,9 @@ RSpec.describe BulkImports::ExportRequestWorker, feature_category: :importers do
       entity = create(:bulk_import_entity, bulk_import: bulk_import)
       error = 'Exhausted error!'
 
-      expect_next_instance_of(Gitlab::Import::Logger) do |logger|
+      expect_next_instance_of(BulkImports::Logger) do |logger|
+        expect(logger).to receive(:with_entity).with(entity).and_call_original
+
         expect(logger)
           .to receive(:error)
           .with(hash_including('message' => "Request to export #{entity.source_type} failed"))
diff --git a/spec/workers/bulk_imports/finish_batched_pipeline_worker_spec.rb b/spec/workers/bulk_imports/finish_batched_pipeline_worker_spec.rb
index 959b063e061..2dd5b23b3d2 100644
--- a/spec/workers/bulk_imports/finish_batched_pipeline_worker_spec.rb
+++ b/spec/workers/bulk_imports/finish_batched_pipeline_worker_spec.rb
@@ -49,6 +49,9 @@ RSpec.describe BulkImports::FinishBatchedPipelineWorker, feature_category: :impo
 
     it 'marks the tracker as finished' do
       expect_next_instance_of(BulkImports::Logger) do |logger|
+        expect(logger).to receive(:with_tracker).with(pipeline_tracker).and_call_original
+        expect(logger).to receive(:with_entity).with(entity).and_call_original
+
         expect(logger).to receive(:info).with(
           a_hash_including('message' => 'Tracker finished')
         )
@@ -96,6 +99,9 @@ RSpec.describe BulkImports::FinishBatchedPipelineWorker, feature_category: :impo
 
       it 'fails pipeline tracker and its batches' do
         expect_next_instance_of(BulkImports::Logger) do |logger|
+          expect(logger).to receive(:with_tracker).with(pipeline_tracker).and_call_original
+          expect(logger).to receive(:with_entity).with(entity).and_call_original
+
           expect(logger).to receive(:error).with(
             a_hash_including('message' => 'Batch stale. Failing batches and tracker')
           )
diff --git a/spec/workers/bulk_imports/pipeline_worker_spec.rb b/spec/workers/bulk_imports/pipeline_worker_spec.rb
index 09f76169a12..19688596a18 100644
--- a/spec/workers/bulk_imports/pipeline_worker_spec.rb
+++ b/spec/workers/bulk_imports/pipeline_worker_spec.rb
@@ -65,17 +65,9 @@ RSpec.describe BulkImports::PipelineWorker, feature_category: :importers do
 
   it 'runs the given pipeline successfully' do
     expect_next_instance_of(BulkImports::Logger) do |logger|
-      expect(logger)
-        .to receive(:info)
-        .with(
-          hash_including(
-            'pipeline_class' => 'FakePipeline',
-            'bulk_import_id' => entity.bulk_import_id,
-            'bulk_import_entity_id' => entity.id,
-            'bulk_import_entity_type' => entity.source_type,
-            'source_full_path' => entity.source_full_path
-          )
-        )
+      expect(logger).to receive(:with_tracker).with(pipeline_tracker).and_call_original
+      expect(logger).to receive(:with_entity).with(pipeline_tracker.entity).and_call_original
+      expect(logger).to receive(:info)
     end
 
     allow(worker).to receive(:jid).and_return('jid')
@@ -102,22 +94,9 @@ RSpec.describe BulkImports::PipelineWorker, feature_category: :importers do
       job = { 'args' => [pipeline_tracker.id, pipeline_tracker.stage, entity.id] }
 
       expect_next_instance_of(BulkImports::Logger) do |logger|
-        expect(logger)
-          .to receive(:error)
-          .with(
-            hash_including(
-              'pipeline_class' => 'FakePipeline',
-              'bulk_import_entity_id' => entity.id,
-              'bulk_import_id' => entity.bulk_import_id,
-              'bulk_import_entity_type' => entity.source_type,
-              'source_full_path' => entity.source_full_path,
-              'class' => 'BulkImports::PipelineWorker',
-              'exception.message' => 'Error!',
-              'message' => 'Pipeline failed',
-              'source_version' => entity.bulk_import.source_version_info.to_s,
-              'importer' => 'gitlab_migration'
-            )
-          )
+        expect(logger).to receive(:with_tracker).with(pipeline_tracker).and_call_original
+        expect(logger).to receive(:with_entity).with(pipeline_tracker.entity).and_call_original
+        expect(logger).to receive(:error)
       end
 
       expect(Gitlab::ErrorTracking)
@@ -125,13 +104,13 @@ RSpec.describe BulkImports::PipelineWorker, feature_category: :importers do
         .with(
           instance_of(StandardError),
           hash_including(
-            'bulk_import_entity_id' => entity.id,
-            'bulk_import_id' => entity.bulk_import.id,
-            'bulk_import_entity_type' => entity.source_type,
-            'source_full_path' => entity.source_full_path,
-            'pipeline_class' => pipeline_tracker.pipeline_name,
-            'importer' => 'gitlab_migration',
-            'source_version' => entity.bulk_import.source_version_info.to_s
+            bulk_import_entity_id: entity.id,
+            bulk_import_id: entity.bulk_import.id,
+            bulk_import_entity_type: entity.source_type,
+            source_full_path: entity.source_full_path,
+            pipeline_class: pipeline_tracker.pipeline_name,
+            importer: 'gitlab_migration',
+            source_version: entity.bulk_import.source_version_info.to_s
           )
         )
 
@@ -302,16 +281,7 @@ RSpec.describe BulkImports::PipelineWorker, feature_category: :importers do
 
           expect(logger)
             .to receive(:info)
-            .with(
-              hash_including(
-                'pipeline_class' => 'FakePipeline',
-                'bulk_import_entity_id' => entity.id,
-                'bulk_import_id' => entity.bulk_import_id,
-                'bulk_import_entity_type' => entity.source_type,
-                'source_full_path' => entity.source_full_path,
-                'message' => 'Skipping pipeline due to failed entity'
-              )
-            )
+            .with(hash_including(message: 'Skipping pipeline due to failed entity'))
         end
 
         worker.perform(pipeline_tracker.id, pipeline_tracker.stage, entity.id)
@@ -350,17 +320,9 @@ RSpec.describe BulkImports::PipelineWorker, feature_category: :importers do
         end
 
         expect_next_instance_of(BulkImports::Logger) do |logger|
-          expect(logger)
-            .to receive(:info)
-            .with(
-              hash_including(
-                'pipeline_class' => 'FakePipeline',
-                'bulk_import_entity_id' => entity.id,
-                'bulk_import_id' => entity.bulk_import_id,
-                'bulk_import_entity_type' => entity.source_type,
-                'source_full_path' => entity.source_full_path
-              )
-            )
+          expect(logger).to receive(:with_tracker).and_call_original
+          expect(logger).to receive(:with_entity).and_call_original
+          expect(logger).to receive(:info)
         end
 
         expect(described_class)
diff --git a/spec/workers/bulk_imports/stuck_import_worker_spec.rb b/spec/workers/bulk_imports/stuck_import_worker_spec.rb
index 4bcc72326c7..09fd1e1b524 100644
--- a/spec/workers/bulk_imports/stuck_import_worker_spec.rb
+++ b/spec/workers/bulk_imports/stuck_import_worker_spec.rb
@@ -48,16 +48,12 @@ RSpec.describe BulkImports::StuckImportWorker, feature_category: :importers do
     it 'updates the status of bulk import entities to timeout' do
       expect_next_instance_of(BulkImports::Logger) do |logger|
         allow(logger).to receive(:error)
-        expect(logger).to receive(:error).with(
-          message: 'BulkImports::Entity stale',
-          bulk_import_entity_id: stale_created_bulk_import_entity.id,
-          bulk_import_id: stale_created_bulk_import_entity.bulk_import_id
-        )
-        expect(logger).to receive(:error).with(
-          message: 'BulkImports::Entity stale',
-          bulk_import_entity_id: stale_started_bulk_import_entity.id,
-          bulk_import_id: stale_started_bulk_import_entity.bulk_import_id
-        )
+
+        expect(logger).to receive(:with_entity).with(stale_created_bulk_import_entity).and_call_original
+        expect(logger).to receive(:error).with(message: 'BulkImports::Entity stale')
+
+        expect(logger).to receive(:with_entity).with(stale_started_bulk_import_entity).and_call_original
+        expect(logger).to receive(:error).with(message: 'BulkImports::Entity stale')
       end
 
       expect { subject }.to change { stale_created_bulk_import_entity.reload.status_name }.from(:created).to(:timeout)