Merge branch '218994-replace-constant-usage' into 'master'

Replace IMPORT_JOBS_EXPIRATION constant usage

See merge request gitlab-org/gitlab!32947

app/models/concerns/import_state/sidekiq_job_tracker.rb

@@ -15,7 +15,7 @@ module ImportState
       def refresh_jid_expiration
         return unless jid
 
-        Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+        Gitlab::SidekiqStatus.set(jid, Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
       end
 
       def self.jid_by(project_id:, status:)

app/workers/concerns/project_import_options.rb

@@ -6,7 +6,7 @@ module ProjectImportOptions
   IMPORT_RETRY_COUNT = 5
 
   included do
-    sidekiq_options retry: IMPORT_RETRY_COUNT, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+    sidekiq_options retry: IMPORT_RETRY_COUNT, status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
 
     # We only want to mark the project as failed once we exhausted all retries
     sidekiq_retries_exhausted do |job|

app/workers/stuck_import_jobs_worker.rb

@@ -3,8 +3,6 @@
 class StuckImportJobsWorker # rubocop:disable Scalability/IdempotentWorker
   include Gitlab::Import::StuckImportJob
 
-  IMPORT_JOBS_EXPIRATION = Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
-
   private
 
   def track_metrics(with_jid_count, without_jid_count)

ee/app/workers/repository_update_mirror_worker.rb

@@ -10,7 +10,7 @@ class RepositoryUpdateMirrorWorker # rubocop:disable Scalability/IdempotentWorke
   feature_category :source_code_management
 
   # Retry not necessary. It will try again at the next update interval.
-  sidekiq_options retry: false, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+  sidekiq_options retry: false, status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
 
   attr_accessor :project, :repository, :current_user
 

lib/gitlab/import/set_async_jid.rb

@@ -14,7 +14,7 @@ module Gitlab
         jid = generate_jid(import_state)
 
         Gitlab::SidekiqStatus
-          .set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+          .set(jid, Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
 
         import_state.update_column(:jid, jid)
       end

lib/gitlab/phabricator_import/cache/map.rb

@@ -63,7 +63,7 @@ module Gitlab
         def timeout
           # Setting the timeout to the same one as we do for clearing stuck jobs
           # this makes sure all cache is available while the import is running.
-          StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+          Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
         end
       end
     end

lib/gitlab/phabricator_import/worker_state.rb

@@ -40,7 +40,7 @@ module Gitlab
       def timeout
         # Make sure we get rid of all the information after a job is marked
         # as failed/succeeded
-        StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+        Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
       end
     end
   end

spec/lib/gitlab/import/set_async_jid_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::Import::SetAsyncJid do
     it 'sets the JID in Redis' do
       expect(Gitlab::SidekiqStatus)
         .to receive(:set)
-              .with("async-import/project-import-state/#{project.id}", StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+              .with("async-import/project-import-state/#{project.id}", Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
               .and_call_original
 
       described_class.set_jid(project.import_state)

spec/lib/gitlab/phabricator_import/cache/map_spec.rb

@@ -66,7 +66,7 @@ describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do
       end
 
       expect(set_data).to eq({ classname: 'Issue', database_id: issue.id.to_s })
-      expect(ttl).to be_within(1.second).of(StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+      expect(ttl).to be_within(1.second).of(Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
     end
   end
 

spec/workers/concerns/project_import_options_spec.rb

@@ -17,7 +17,7 @@ describe ProjectImportOptions do
   end
 
   it 'sets default status expiration' do
-    expect(worker_class.sidekiq_options['status_expiration']).to eq(StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+    expect(worker_class.sidekiq_options['status_expiration']).to eq(Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
   end
 
   describe '.sidekiq_retries_exhausted' do