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

…iq-9.0.1 Bump govuk_sidekiq from 8.0.1 to 9.0.1
alphagov · Oct 23, 2024 · 349a50a · 349a50a
2 parents 1c979e3 + c94cfac
commit 349a50a
Show file tree

Hide file tree

Showing 28 changed files with 90 additions and 70 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -176,12 +176,11 @@ GEM
       sentry-rails (~> 5.3)
       sentry-ruby (~> 5.3)
       statsd-ruby (~> 1.5)
-    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)
     hashdiff (1.1.1)
     hashie (5.0.0)
     http-accept (1.7.0)
@@ -585,9 +584,10 @@ GEM
       ffi (~> 1.0)
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    redis (4.8.1)
-    redis-namespace (1.11.0)
-      redis (>= 4)
+    redis (5.3.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
+      connection_pool
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
@@ -665,10 +665,12 @@ GEM
       sidekiq (>= 3.0)
     shoulda-matchers (6.4.0)
       activesupport (>= 5.2.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/anonymous_feedback/content_improvement_controller.rb b/app/controllers/anonymous_feedback/content_improvement_controller.rb
@@ -3,7 +3,7 @@ class ContentImprovementController < ApplicationController
     def create
       feedback = ContentImprovementFeedback.new(feedback_params)
       if feedback.valid?
-        ContentImprovementFeedbackWorker.perform_async(feedback_params)
+        ContentImprovementFeedbackJob.perform_async(feedback_params)
         head :accepted
       else
         render json: { "errors" => feedback.errors.to_a }, status: :unprocessable_entity

diff --git a/app/controllers/anonymous_feedback/export_requests_controller.rb b/app/controllers/anonymous_feedback/export_requests_controller.rb
@@ -5,7 +5,7 @@ def create
     export_request = FeedbackExportRequest.new(export_request_params)
 
     if export_request.save
-      GenerateFeedbackCsvWorker.perform_async(export_request.id)
+      GenerateFeedbackCsvJob.perform_async(export_request.id)
       head :accepted
     else
       render json: { "errors" => export_request.errors.to_a }, status: :unprocessable_entity

diff --git a/app/controllers/anonymous_feedback/global_export_requests_controller.rb b/app/controllers/anonymous_feedback/global_export_requests_controller.rb
@@ -4,7 +4,7 @@ class AnonymousFeedback::GlobalExportRequestsController < ApplicationController
   def create
     export_request = GlobalExportRequest.new(global_export_request_params)
     if export_request.valid?
-      GenerateGlobalExportCsvWorker.perform_async(global_export_request_params)
+      GenerateGlobalExportCsvJob.perform_async(global_export_request_params)
       head :accepted
     else
       render json: { "errors" => export_request.errors.to_a }, status: :unprocessable_entity

diff --git a/app/controllers/anonymous_feedback/long_form_contact_controller.rb b/app/controllers/anonymous_feedback/long_form_contact_controller.rb
@@ -4,7 +4,7 @@ def create
       request = LongFormContact.new(long_form_contact_params)
 
       if request.valid?
-        LongFormContactWorker.perform_async(long_form_contact_params)
+        LongFormContactJob.perform_async(long_form_contact_params.to_h)
         head :accepted
       else
         render json: { "errors" => request.errors.to_a }, status: :unprocessable_entity

diff --git a/app/controllers/anonymous_feedback/problem_reports_controller.rb b/app/controllers/anonymous_feedback/problem_reports_controller.rb
@@ -34,7 +34,7 @@ def create
       request = ProblemReport.new(problem_report_params)
 
       if request.valid?
-        ProblemReportWorker.perform_async(problem_report_params)
+        ProblemReportJob.perform_async(problem_report_params.to_h)
         head :accepted
       else
         render json: { "errors" => request.errors.to_a }, status: :unprocessable_entity

diff --git a/app/controllers/anonymous_feedback/service_feedback_controller.rb b/app/controllers/anonymous_feedback/service_feedback_controller.rb
@@ -4,7 +4,7 @@ def create
       request = ServiceFeedback.new(service_feedback_params)
 
       if request.valid?
-        ServiceFeedbackWorker.perform_async(service_feedback_params)
+        ServiceFeedbackJob.perform_async(service_feedback_params.to_h)
         head :accepted
       else
         render json: { "errors" => request.errors.to_a }, status: :unprocessable_entity

diff --git a/app/sidekiq/content_improvement_feedback_job.rb b/app/sidekiq/content_improvement_feedback_job.rb
@@ -0,0 +1,9 @@
+class ContentImprovementFeedbackJob
+  include Sidekiq::Job
+
+  def perform(feedback_params)
+    ContentImprovementFeedback.create!(feedback_params)
+  end
+end
+
+ContentImprovementFeedbackWorker = ContentImprovementFeedbackJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/...workers/content_item_enrichment_worker.rb → app/sidekiq/content_item_enrichment_job.rb b/...workers/content_item_enrichment_worker.rb → app/sidekiq/content_item_enrichment_job.rb
@@ -1,5 +1,5 @@
-class ContentItemEnrichmentWorker
-  include Sidekiq::Worker
+class ContentItemEnrichmentJob
+  include Sidekiq::Job
 
   def perform(problem_report_id)
     problem_report = ProblemReport.find(problem_report_id)
@@ -25,3 +25,5 @@ def build_orgs(org_hashes)
     end
   end
 end
+
+ContentItemEnrichmentWorker = ContentItemEnrichmentJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/...s/content_item_populate_doctype_worker.rb → ...ekiq/content_item_populate_doctype_job.rb b/...s/content_item_populate_doctype_worker.rb → ...ekiq/content_item_populate_doctype_job.rb
@@ -1,5 +1,5 @@
-class ContentItemPopulateDoctypeWorker
-  include Sidekiq::Worker
+class ContentItemPopulateDoctypeJob
+  include Sidekiq::Job
 
   def perform
     content_store = GdsApi::ContentStore.new(Plek.find("content-store"))
@@ -17,3 +17,5 @@ def perform
     Rails.logger.warn "There were errors with the following paths: #{document_type_errors.join(', ')}"
   end
 end
+
+ContentItemPopulateDoctypeWorker = ContentItemPopulateDoctypeJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/workers/generate_feedback_csv_worker.rb → app/sidekiq/generate_feedback_csv_job.rb b/app/workers/generate_feedback_csv_worker.rb → app/sidekiq/generate_feedback_csv_job.rb
@@ -1,7 +1,7 @@
 require "s3_file_uploader"
 
-class GenerateFeedbackCsvWorker
-  include Sidekiq::Worker
+class GenerateFeedbackCsvJob
+  include Sidekiq::Job
 
   def initialize(uploader: S3FileUploader.new)
     @uploader = uploader
@@ -23,3 +23,5 @@ def perform(*args)
     ExportNotification.notification_email(feedback_export_request.notification_email, feedback_export_request.url).deliver_now
   end
 end
+
+GenerateFeedbackCsvWorker = GenerateFeedbackCsvJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/...kers/generate_global_export_csv_worker.rb → ...sidekiq/generate_global_export_csv_job.rb b/...kers/generate_global_export_csv_worker.rb → ...sidekiq/generate_global_export_csv_job.rb
@@ -1,7 +1,7 @@
 require "s3_file_uploader"
 
-class GenerateGlobalExportCsvWorker
-  include Sidekiq::Worker
+class GenerateGlobalExportCsvJob
+  include Sidekiq::Job
 
   def initialize(uploader: S3FileUploader.new)
     @uploader = uploader
@@ -26,3 +26,5 @@ def perform(export_params)
     GlobalExportNotification.notification_email(export_params["notification_email"], feedback_export_request.url).deliver_now
   end
 end
+
+GenerateGlobalExportCsvWorker = GenerateGlobalExportCsvJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/sidekiq/long_form_contact_job.rb b/app/sidekiq/long_form_contact_job.rb
@@ -0,0 +1,10 @@
+class LongFormContactJob
+  include Sidekiq::Job
+
+  def perform(long_form_contact_params)
+    contact = LongFormContact.create!(long_form_contact_params)
+    ZendeskTicketJob.perform_async(contact.id)
+  end
+end
+
+LongFormContactWorker = LongFormContactJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/sidekiq/problem_report_job.rb b/app/sidekiq/problem_report_job.rb
@@ -0,0 +1,11 @@
+class ProblemReportJob
+  include Sidekiq::Job
+
+  def perform(problem_report_params)
+    problem_report = ProblemReport.create!(problem_report_params)
+    ZendeskTicketJob.perform_async(problem_report.id)
+    ContentItemEnrichmentJob.perform_async(problem_report.id)
+  end
+end
+
+ProblemReportWorker = ProblemReportJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/sidekiq/service_feedback_job.rb b/app/sidekiq/service_feedback_job.rb
@@ -0,0 +1,9 @@
+class ServiceFeedbackJob
+  include Sidekiq::Job
+
+  def perform(service_feedback_params)
+    ServiceFeedback.new(service_feedback_params).save!
+  end
+end
+
+ServiceFeedbackWorker = ServiceFeedbackJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/workers/zendesk_ticket_worker.rb → app/sidekiq/zendesk_ticket_job.rb b/app/workers/zendesk_ticket_worker.rb → app/sidekiq/zendesk_ticket_job.rb
@@ -1,8 +1,8 @@
 require "zendesk/long_form_contact_ticket"
 require "zendesk/problem_report_ticket"
 
-class ZendeskTicketWorker
-  include Sidekiq::Worker
+class ZendeskTicketJob
+  include Sidekiq::Job
 
   def perform(anonymous_contact_id)
     anonymous_contact = AnonymousContact.find(anonymous_contact_id)
@@ -19,3 +19,5 @@ def ticket_for(anonymous_contact)
     end
   end
 end
+
+ZendeskTicketWorker = ZendeskTicketJob ## TODO: Remove once queued jobs at the time of the upgrade are complete
diff --git a/app/workers/content_improvement_feedback_worker.rb b/app/workers/content_improvement_feedback_worker.rb
diff --git a/app/workers/long_form_contact_worker.rb b/app/workers/long_form_contact_worker.rb
diff --git a/app/workers/problem_report_worker.rb b/app/workers/problem_report_worker.rb
diff --git a/app/workers/service_feedback_worker.rb b/app/workers/service_feedback_worker.rb
diff --git a/db/migrate/20171204155340_populate_document_type_for_content_items.rb b/db/migrate/20171204155340_populate_document_type_for_content_items.rb
@@ -1,6 +1,6 @@
 class PopulateDocumentTypeForContentItems < ActiveRecord::Migration[5.0]
   def up
-    ContentItemPopulateDoctypeWorker.perform_async
+    ContentItemPopulateDoctypeJob.perform_async
   end
 
   def down

diff --git a/spec/controllers/anonymous_feedback/export_requests_controller_spec.rb b/spec/controllers/anonymous_feedback/export_requests_controller_spec.rb
@@ -6,7 +6,7 @@
 
     context "posted with valid parameters" do
       before do
-        expect(GenerateFeedbackCsvWorker).to receive(:perform_async).once.with(instance_of(Integer))
+        expect(GenerateFeedbackCsvJob).to receive(:perform_async).once.with(instance_of(Integer))
         post :create,
              params: {
                export_request: {
@@ -40,7 +40,7 @@
 
     context "posted with invalid parameters" do
       before do
-        expect(GenerateFeedbackCsvWorker).to receive(:perform_async).never
+        expect(GenerateFeedbackCsvJob).to receive(:perform_async).never
         post :create,
              params: {
                export_request: {
@@ -60,7 +60,7 @@
 
     context "with backwards compatible `path_prefix` param" do
       before do
-        expect(GenerateFeedbackCsvWorker).to receive(:perform_async).once.with(instance_of(Integer))
+        expect(GenerateFeedbackCsvJob).to receive(:perform_async).once.with(instance_of(Integer))
         post :create,
              params: {
                export_request:

diff --git a/spec/controllers/anonymous_feedback/global_export_requests_controller_spec.rb b/spec/controllers/anonymous_feedback/global_export_requests_controller_spec.rb
@@ -6,7 +6,7 @@
 
     context "with valid parameters" do
       it "succeeds" do
-        expect(GenerateGlobalExportCsvWorker).to receive(:perform_async).once
+        expect(GenerateGlobalExportCsvJob).to receive(:perform_async).once
 
         response = post :create,
                         params: {
@@ -24,7 +24,7 @@
 
     context "with invalid parameters" do
       it "fails" do
-        expect(GenerateGlobalExportCsvWorker).not_to receive(:perform_async)
+        expect(GenerateGlobalExportCsvJob).not_to receive(:perform_async)
 
         response = post :create,
                         params: {

diff --git a/...rs/content_item_enrichment_worker_spec.rb → ...dekiq/content_item_enrichment_job_spec.rb b/...rs/content_item_enrichment_worker_spec.rb → ...dekiq/content_item_enrichment_job_spec.rb
@@ -1,10 +1,10 @@
 require "rails_helper"
 require "gds_api/test_helpers/content_store"
 
-describe ContentItemEnrichmentWorker do
+describe ContentItemEnrichmentJob do
   include GdsApi::TestHelpers::ContentStore
 
-  subject { ContentItemEnrichmentWorker.new }
+  subject { ContentItemEnrichmentJob.new }
 
   context "for a problem report about a piece of content we can't determine the organisation for" do
     let(:problem_report) { create(:problem_report, path: "/unknown-org-page") }

diff --git a/...kers/generate_feedback_csv_worker_spec.rb → ...sidekiq/generate_feedback_csv_job_spec.rb b/...kers/generate_feedback_csv_worker_spec.rb → ...sidekiq/generate_feedback_csv_job_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe GenerateFeedbackCsvWorker, type: :worker do
+describe GenerateFeedbackCsvJob, type: :worker do
   describe "#perform" do
     let(:feedback_export_request) { create(:feedback_export_request) }
     let(:uploader) { instance_double(S3FileUploader) }

diff --git a/...rs/content_item_enrichment_worker_spec.rb → ...dekiq/content_item_enrichment_job_spec.rb b/...rs/content_item_enrichment_worker_spec.rb → ...dekiq/content_item_enrichment_job_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 require "gds_api/test_helpers/content_store"
 
-describe ContentItemEnrichmentWorker do
+describe ContentItemEnrichmentJob do
   include GdsApi::TestHelpers::ContentStore
 
   let(:raw_path) { "my-magic-govuk-endpoint" }

diff --git a/...tent_item_populate_doctype_worker_spec.rb → ...content_item_populate_doctype_job_spec.rb b/...tent_item_populate_doctype_worker_spec.rb → ...content_item_populate_doctype_job_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 require "gds_api/test_helpers/content_store"
 
-describe ContentItemPopulateDoctypeWorker do
+describe ContentItemPopulateDoctypeJob do
   include GdsApi::TestHelpers::ContentStore
 
   it "updates every content item's `document_type`" do

diff --git a/...generate_global_export_csv_worker_spec.rb → ...iq/generate_global_export_csv_job_spec.rb b/...generate_global_export_csv_worker_spec.rb → ...iq/generate_global_export_csv_job_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 require "date"
 
-describe GenerateGlobalExportCsvWorker, type: :worker do
+describe GenerateGlobalExportCsvJob, type: :worker do
   let(:uploader) { instance_double(S3FileUploader) }
   subject(:worker) { described_class.new(uploader:) }