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

…iq-7.1.3 Bump govuk_sidekiq from 6.0.0 to 7.1.3
alphagov · Nov 24, 2023 · c0c8bc1 · c0c8bc1
2 parents 4aed884 + d7c848d
commit c0c8bc1
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -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"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -658,6 +680,7 @@ DEPENDENCIES
   rubocop-govuk
   rubyzip
   sentry-sidekiq
+  sidekiq (= 6.5.10)
   sidekiq-limit_fetch
   simplecov
   sinatra
@@ -669,4 +692,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.4.1
diff --git a/lib/auth/gds_sso.rb b/lib/auth/gds_sso.rb
@@ -1,3 +1,5 @@
+require "active_support"
+
 module Auth
   class GdsSso
     def self.locate(token_string)

diff --git a/lib/rummager.rb b/lib/rummager.rb
@@ -1,6 +1,7 @@
 $LOAD_PATH << __dir__ unless $LOAD_PATH.include?(__dir__)
 
 require_relative "../env"
+require "active_support"
 require "active_support/core_ext/array"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object/blank"

diff --git a/spec/integration/app/healthcheck_spec.rb b/spec/integration/app/healthcheck_spec.rb
@@ -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

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,7 +26,7 @@
 
 # Silence log output
 Logging.logger.root.appenders = nil
-Sidekiq.logger = nil
+Sidekiq.logger.level = Logger::WARN
 
 require "webmock/rspec"