Merge branch 'rodrigo/358745-fix-project-attributes-pipeline-reenqueue' into 'master'

Fix ProjectAttributesPipeline re-enqueue in BulkImport

See merge request gitlab-org/gitlab!87580

lib/bulk_imports/groups/pipelines/group_attributes_pipeline.rb

@@ -8,7 +8,7 @@ module BulkImports
         file_extraction_pipeline!
-        relation_name 'self'
+        relation_name BulkImports::FileTransfer::BaseConfig::SELF_RELATION
         extractor ::BulkImports::Common::Extractors::JsonExtractor, relation: relation

lib/bulk_imports/projects/pipelines/project_attributes_pipeline.rb

@@ -8,6 +8,8 @@ module BulkImports
         file_extraction_pipeline!
+        relation_name BulkImports::FileTransfer::BaseConfig::SELF_RELATION
+
         transformer ::BulkImports::Common::Transformers::ProhibitedAttributesTransformer
         def extract(_context)
@@ -57,7 +59,7 @@ module BulkImports
         def download_service
           @download_service ||= BulkImports::FileDownloadService.new(
             configuration: context.configuration,
-            relative_url:  context.entity.relation_download_url_path(BulkImports::FileTransfer::BaseConfig::SELF_RELATION),
+            relative_url:  context.entity.relation_download_url_path(self.class.relation),
             tmpdir: tmpdir,
             filename: compressed_filename
           )
@@ -72,7 +74,7 @@ module BulkImports
         end
         def filename
-          "#{BulkImports::FileTransfer::BaseConfig::SELF_RELATION}.json"
+          "#{self.class.relation}.json"
         end
         def json_decode(string)

spec/lib/bulk_imports/groups/pipelines/group_attributes_pipeline_spec.rb

@@ -73,4 +73,8 @@ RSpec.describe BulkImports::Groups::Pipelines::GroupAttributesPipeline do
       pipeline.after_run(nil)
     end
   end
+
+  describe '.relation' do
+    it { expect(described_class.relation).to eq('self') }
+  end
 end

spec/lib/bulk_imports/projects/pipelines/project_attributes_pipeline_spec.rb

@@ -176,4 +176,8 @@ RSpec.describe BulkImports::Projects::Pipelines::ProjectAttributesPipeline do
       end
     end
   end
+
+  describe '.relation' do
+    it { expect(described_class.relation).to eq('self') }
+  end
 end