Merge pull request #1563 from alphagov/dependabot/bundler/govuk_sidek…

…iq-9.0.1 Bump govuk_sidekiq from 8.0.1 to 9.0.1
alphagov · Oct 18, 2024 · e1a4422 · e1a4422
2 parents ed47725 + a690c1a
commit e1a4422
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -202,12 +202,11 @@ GEM
       rouge
       sprockets (>= 3)
       sprockets-rails
-    govuk_sidekiq (8.0.1)
+    govuk_sidekiq (9.0.1)
       gds-api-adapters (>= 19.1.0)
       govuk_app_config (>= 1.1)
-      redis (< 5)
-      redis-namespace (~> 1.6)
-      sidekiq (~> 6.5, >= 6.5.12)
+      redis-client (>= 0.22.2)
+      sidekiq (~> 7.0, < 8)
     govuk_test (4.1.0)
       brakeman (>= 5.0.2)
       capybara (>= 3.36)
@@ -575,9 +574,8 @@ GEM
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    redis (4.8.1)
-    redis-namespace (1.11.0)
-      redis (>= 4)
+    redis-client (0.22.2)
+      connection_pool
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
@@ -664,10 +662,12 @@ GEM
     sentry-sidekiq (5.21.0)
       sentry-ruby (~> 5.21.0)
       sidekiq (>= 3.0)
-    sidekiq (6.5.12)
-      connection_pool (>= 2.2.5, < 3)
-      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
+    sidekiq (7.3.2)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
@@ -21,7 +21,7 @@ def export_csv
     @recipient = current_user.email
 
     start_time_string = Time.zone.now.to_s
-    CsvExportWorker.perform_async(search_params.stringify_keys, @recipient, start_time_string)
+    CsvExportJob.perform_async(search_params.stringify_keys, @recipient, start_time_string)
   end
 
 private

diff --git a/app/workers/csv_export_worker.rb → app/sidekiq/csv_export_job.rb b/app/workers/csv_export_worker.rb → app/sidekiq/csv_export_job.rb
@@ -1,9 +1,9 @@
 require "prometheus/client"
 require "prometheus/client/push"
 
-class CsvExportWorker
+class CsvExportJob
   include FileStorage
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   sidekiq_options retry: 0
   sidekiq_options queue: "export_csv"
@@ -61,3 +61,5 @@ def push_metrics_to_pushgateway(elapsed_time_seconds)
     ).add(prometheus_registry)
   end
 end
+
+CsvExportWorker = CsvExportJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/spec/workers/concerns/file_storage_spec.rb → spec/sidekiq/concerns/file_storage_spec.rb b/spec/workers/concerns/file_storage_spec.rb → spec/sidekiq/concerns/file_storage_spec.rb
diff --git a/spec/workers/csv_export_worker_spec.rb → spec/sidekiq/csv_export_job_spec.rb b/spec/workers/csv_export_worker_spec.rb → spec/sidekiq/csv_export_job_spec.rb
@@ -1,6 +1,6 @@
 require "govuk_sidekiq/testing"
 
-RSpec.describe CsvExportWorker do
+RSpec.describe CsvExportJob do
   let(:search_params) do
     {
       date_range: "past-30-days",
@@ -68,7 +68,7 @@
   let(:csv_export_histogram) { instance_spy(Prometheus::Client::Histogram) }
 
   before do
-    Sidekiq::Worker.clear_all
+    Sidekiq::Job.clear_all
 
     ENV["AWS_CSV_EXPORT_BUCKET_NAME"] = "test-bucket"
     ENV["PROMETHEUS_PUSHGATEWAY_URL"] = "http://prometheus-pushgateway.local"