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.

Sign up for GitHub

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 6.0.0 to 7.1.3 #2743

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Bump govuk_sidekiq from 6.0.0 to 7.1.3 #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56f3b9d
Bump govuk_sidekiq from 6.0.0 to 7.1.3
dependabot[bot] Nov 22, 2023
8e7154e
Update other dependencies to make compatible
peteglondon Nov 22, 2023
15f352c
Some more requires seem to be require to make this work.
peteglondon Nov 22, 2023
d7c848d
There is no setter on Sidekiq.logger anymore
peteglondon Nov 22, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ gem "rainbow"
gem "rake"
gem "rubyzip"
gem "sentry-sidekiq"
gem "sidekiq", "6.5.10"
gem "sidekiq-limit_fetch"
gem "sinatra"
gem "statsd-ruby"
Expand Down
103 changes: 63 additions & 40 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
actionpack (7.1.2)
actionview (= 7.1.2)
activesupport (= 7.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.8)
activesupport (= 7.0.8)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.2)
activesupport (= 7.1.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (7.0.8)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
Expand Down Expand Up @@ -45,10 +53,12 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.6.1)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bigdecimal (3.1.4)
bootsnap (1.17.0)
msgpack (~> 1.2)
builder (3.2.4)
bunny (2.19.0)
bunny (2.22.0)
amq-protocol (~> 2.3, >= 2.3.1)
sorted_set (~> 1, >= 1.0.2)
bunny-mock (1.7.0)
Expand All @@ -64,8 +74,9 @@ GEM
declarative (0.0.20)
diff-lcs (1.5.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
domain_name (0.6.20231109)
drb (2.2.0)
ruby2_keywords
elasticsearch (6.8.3)
elasticsearch-api (= 6.8.3)
elasticsearch-transport (= 6.8.3)
Expand Down Expand Up @@ -166,12 +177,11 @@ GEM
bunny (~> 2.17)
govuk_schemas (4.7.0)
json-schema (>= 2.8, < 4.2)
govuk_sidekiq (6.0.0)
govuk_sidekiq (7.1.3)
gds-api-adapters (>= 19.1.0)
govuk_app_config (>= 1.1)
redis-namespace (~> 1.6)
sidekiq (~> 6)
sidekiq-statsd (>= 2.1)
sidekiq (~> 6.5)
hashdiff (1.0.1)
hashie (5.0.0)
http-accept (1.7.0)
Expand All @@ -183,6 +193,10 @@ GEM
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
irb (1.9.1)
rdoc
reline (>= 0.3.8)
jmespath (1.6.2)
json (2.6.3)
json-schema (4.1.1)
Expand All @@ -209,7 +223,7 @@ GEM
method_source (1.0.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mime-types-data (3.2023.1003)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
Expand All @@ -224,8 +238,9 @@ GEM
multipart-post (2.3.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
netrc (0.11.0)
nio4r (2.6.0)
nio4r (2.6.1)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand Down Expand Up @@ -446,7 +461,9 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
public_suffix (5.0.3)
psych (5.1.1.1)
stringio
public_suffix (5.0.4)
puma (6.4.0)
nio4r (~> 2.0)
racc (1.7.3)
Expand All @@ -458,22 +475,28 @@ GEM
rack (~> 2.2, >= 2.2.4)
rack-proxy (0.7.7)
rack
rack-session (1.0.1)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rackup (1.0.0)
rack (< 3)
webrick
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
method_source
railties (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
raindrops (0.20.1)
rake (13.1.0)
Expand All @@ -483,13 +506,14 @@ GEM
rb-kqueue (0.2.8)
ffi (>= 0.5.0)
rbtree (0.4.6)
redis (5.0.8)
redis-client (>= 0.17.0)
redis-client (0.18.0)
connection_pool
redis-namespace (1.10.0)
rdoc (6.6.0)
psych (>= 4.0.0)
redis (4.8.1)
redis-namespace (1.11.0)
redis (>= 4)
regexp_parser (2.8.1)
reline (0.4.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand Down Expand Up @@ -561,15 +585,12 @@ GEM
sentry-ruby (~> 5.13.0)
sidekiq (>= 3.0)
set (1.0.3)
sidekiq (6.5.5)
connection_pool (>= 2.2.2)
sidekiq (6.5.10)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0)
redis (>= 4.5.0, < 5)
sidekiq-limit_fetch (4.4.1)
sidekiq (>= 6)
sidekiq-statsd (2.1.0)
activesupport
sidekiq (>= 3.3.1)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
Expand All @@ -593,6 +614,7 @@ GEM
rbtree
set (~> 1.0)
statsd-ruby (1.5.0)
stringio (3.0.9)
thor (1.3.0)
tilt (2.2.0)
timecop (0.9.8)
Expand All @@ -602,7 +624,7 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.9.1)
unicode-display_width (2.4.2)
unicorn (6.1.0)
kgio (~> 2.6)
Expand Down Expand Up @@ -658,6 +680,7 @@ DEPENDENCIES
rubocop-govuk
rubyzip
sentry-sidekiq
sidekiq (= 6.5.10)
sidekiq-limit_fetch
simplecov
sinatra
Expand All @@ -669,4 +692,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.1.4
2.4.1
2 changes: 2 additions & 0 deletions lib/auth/gds_sso.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require "active_support"

module Auth
class GdsSso
def self.locate(token_string)
Expand Down
1 change: 1 addition & 0 deletions lib/rummager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$LOAD_PATH << __dir__ unless $LOAD_PATH.include?(__dir__)

require_relative "../env"
require "active_support"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I discovered this too - very odd

require "active_support/core_ext/array"
require "active_support/core_ext/hash"
require "active_support/core_ext/object/blank"
Expand Down
1 change: 1 addition & 0 deletions spec/integration/app/healthcheck_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require "spec_helper"
require "spec/support/ranker_test_helpers"
require "spec/support/diskspace_test_helpers"
require "active_support/time"

RSpec.describe "HealthcheckTest" do
include RankerTestHelpers
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

# Silence log output
Logging.logger.root.appenders = nil
Sidekiq.logger = nil
Sidekiq.logger.level = Logger::WARN
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice spot - thanks 👍


require "webmock/rspec"

Expand Down
Loading