Update Redis and related

Gemfile

@@ -32,11 +32,11 @@ gem "rails", "~> 6"
 gem "rack-attack"
 gem "rollout"
 gem "rollout-ui"
-gem "redis", "< 5"
+gem "redis", "~> 5"
 gem "redis-namespace"
 gem "redis-actionpack"
 gem "redis-store"
-gem "sidekiq", "~> 6.5.10"
+gem "sidekiq", "~> 7"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 gem "wicked"
 gem "strip_attributes"

Gemfile.lock

@@ -169,12 +169,11 @@ GEM
       railties (>= 5.0.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    fakeredis (0.8.0)
-      redis (~> 4.1)
+    fakeredis (0.1.4)
     ffi (1.17.0)
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux)
     foreman (0.88.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -296,6 +295,7 @@ GEM
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
       jwt (>= 1.5, < 3)
+    observer (0.1.2)
     orm_adapter (0.5.0)
     parallel (1.23.0)
     parser (3.3.6.0)
@@ -371,11 +371,14 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    redis (4.8.1)
+    redis (5.3.0)
+      redis-client (>= 0.22.0)
     redis-actionpack (5.5.0)
       actionpack (>= 5)
       redis-rack (>= 2.1.0, < 4)
       redis-store (>= 1.1.0, < 2)
+    redis-client (0.22.2)
+      connection_pool
     redis-namespace (1.11.0)
       redis (>= 4)
     redis-rack (3.0.0)
@@ -393,8 +396,9 @@ GEM
       railties (>= 5.2)
     rexml (3.3.9)
     rollbar (3.6.0)
-    rollout (2.5.0)
-      redis (~> 4.0)
+    rollout (2.6.1)
+      observer
+      redis (>= 4.0, < 6)
     rollout-ui (0.5.3)
       rollout (~> 2.5)
       sinatra (~> 2.0)
@@ -448,10 +452,11 @@ GEM
     sexp_processor (4.16.1)
     shoulda-matchers (6.1.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.6)
+      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)
@@ -589,7 +594,7 @@ DEPENDENCIES
   rails (~> 6)
   rails-controller-testing
   rails_layout
-  redis (< 5)
+  redis (~> 5)
   redis-actionpack
   redis-namespace
   redis-store
@@ -599,7 +604,7 @@ DEPENDENCIES
   rspec-rails
   selenium-webdriver
   shoulda-matchers
-  sidekiq (~> 6.5.10)
+  sidekiq (~> 7)
   simplecov (~> 0.22.0)
   simplecov-lcov (~> 0.8.0)
   spring

backing-services-docker-compose.yml

@@ -9,7 +9,7 @@ services:
     volumes:
       - db_data:/var/lib/postgresql/data
   redis:
-    image: redis:4
+    image: redis:7
     ports:
       - "6379:6379"
     volumes:

config/initializers/rollout.rb

@@ -1,6 +1,4 @@
-require "redis"
-
-ROLLOUT = Rollout.new(Redis.current)
+ROLLOUT = Rollout.new(Redis.new(url: ENV["REDIS_URL"]))
 
 ROLLOUT.define_group(:beis_users) do |user|
   user.service_owner?

docker-compose.ci.yml

@@ -8,12 +8,16 @@ services:
         - app_test:latest
     depends_on:
       - db
+      - redis
     environment:
       DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
       DATABASE_URL: postgres://postgres:password@db:5432/roda_test
+      REDIS_URL: redis://redis:6379
     env_file:
       - .env.test
   db:
     image: postgres:13
     environment:
       POSTGRES_PASSWORD: password
+  redis:
+    image: redis:7

spec/rails_helper.rb

@@ -8,7 +8,6 @@
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require "rspec/rails"
 # Add additional requires below this line. Rails is not loaded until this point!
-require "fakeredis/rspec"
 
 # testing strip_attributes
 require "strip_attributes/matchers"