Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump govuk_sidekiq from 8.0.1 to 9.0.4 #1065

Merged
merged 6 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gem "json-jwt"
gem "notifications-ruby-client"
gem "openid_connect"
gem "pg"
gem "redis"
gem "sentry-sidekiq"

# https://github.com/moove-it/sidekiq-scheduler/issues/345
Expand Down
27 changes: 15 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,11 @@ GEM
govuk_schemas (5.0.4)
faker (~> 3.4.1)
json-schema (>= 2.8, < 4.4)
govuk_sidekiq (8.0.1)
govuk_sidekiq (9.0.4)
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)
Expand Down Expand Up @@ -274,7 +273,7 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1203)
mime-types-data (3.2025.0107)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
Expand Down Expand Up @@ -654,9 +653,10 @@ GEM
ffi (~> 1.0)
rdoc (6.11.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.23.2)
connection_pool
regexp_parser (2.10.0)
reline (0.6.0)
io-console (~> 0.5)
Expand Down Expand Up @@ -742,10 +742,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.8)
base64
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
sidekiq-scheduler (5.0.6)
rufus-scheduler (~> 3.2)
sidekiq (>= 6, < 8)
Expand Down Expand Up @@ -851,6 +853,7 @@ DEPENDENCIES
pry-byebug
pry-rails
rails (= 8.0.1)
redis
rspec-rails
rubocop-govuk
sentry-sidekiq
Expand Down
3 changes: 0 additions & 3 deletions app/models/unmigrated_oidc_user.rb

This file was deleted.

3 changes: 3 additions & 0 deletions app/sidekiq/application_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ApplicationJob
include Sidekiq::Job
end
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpiredAuthRequestWorker < ApplicationWorker
class ExpiredAuthRequestJob < ApplicationJob
def perform
AuthRequest.expired.delete_all
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpiredSensitiveExceptionWorker < ApplicationWorker
class ExpiredSensitiveExceptionJob < ApplicationJob
def perform
SensitiveException.expired.delete_all
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpiredTombstoneWorker < ApplicationWorker
class ExpiredTombstoneJob < ApplicationJob
def perform
Tombstone.expired.delete_all
end
Expand Down
3 changes: 0 additions & 3 deletions app/workers/application_worker.rb

This file was deleted.

2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require "rails"
# Pick the frameworks you want:
require "active_model/railtie"
# require "active_job/railtie"
require "active_job/railtie"
require "active_record/railtie"
# require "active_storage/engine"
require "action_controller/railtie"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSpec.describe ExpiredAuthRequestWorker do
RSpec.describe ExpiredAuthRequestJob do
before { freeze_time }

it "deletes old state" do
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSpec.describe ExpiredSensitiveExceptionWorker do
RSpec.describe ExpiredSensitiveExceptionJob do
before { freeze_time }

it "deletes old exceptions" do
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSpec.describe ExpiredTombstoneWorker do
RSpec.describe ExpiredTombstoneJob do
before { freeze_time }

it "deletes old tombstones" do
Expand Down
3 changes: 2 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
SimpleCov.start "rails" do
enable_coverage :branch
minimum_coverage line: 95
add_filter "lib/tasks/lint.rake"
end

require File.expand_path("../config/environment", __dir__)
Expand All @@ -30,7 +31,7 @@

config.before do
Rails.application.load_seed
Sidekiq::Worker.clear_all
Sidekiq::Job.clear_all
end

config.include ActiveSupport::Testing::TimeHelpers
Expand Down