Merge branch '57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid' into 'master'

Resolve "Gitlab Project import fails: sidekiq undefined method import_jid"

Closes #57579

See merge request gitlab-org/gitlab-ce!25239

(cherry picked from commit c06ebe51)

401a3bca Fix import_jid error on project import

changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml

+---
+title: Fix import_jid error on project import
+merge_request: 25239
+author:
+type: fixed

lib/gitlab/import_export/shared.rb

@@ -61,7 +61,7 @@ module Gitlab
       def log_base_data
         {
           importer: 'Import/Export',
-          import_jid: @project&.import_state&.import_jid,
+          import_jid: @project&.import_state&.jid,
           project_id: @project&.id,
           project_path: @project&.full_path
         }

spec/lib/gitlab/import_export/shared_spec.rb

@@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do
       expect(subject.errors).to eq(['Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]'])
     end
+    it 'updates the import JID' do
+      import_state = create(:import_state, project: project, jid: 'jid-test')
+
+      expect_next_instance_of(Gitlab::Import::Logger) do |logger|
+        expect(logger).to receive(:error).with(hash_including(import_jid: import_state.jid))
+      end
+
+      subject.error(error)
+    end
+
     it 'calls the error logger with the full message' do
       expect(subject).to receive(:log_error).with(hash_including(message: error.message))