Merge pull request #399 from alphagov/update-sidekiq-redis-to-work-wi…

…th-sidekiq-7

Update SidekiqRedis healthcheck to work with Sidekiq 7

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 9.14.3
+
+* Update SidekiqRedis healthcheck to work with Sidekiq 7 [#399](https://github.com/alphagov/govuk_app_config/pull/399)
+
 # 9.14.2
 
 * Update dependencies

lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb

@@ -5,7 +5,14 @@ def name
     end
 
     def status
-      Sidekiq.redis_info ? OK : CRITICAL
+      # Sidekiq 7 introduced a default_configuration object which has .redis_info
+      # for querying Redis information. If the default_configuration object isn't present,
+      # we can fall back to the old method of querying it using 'Sidekiq.redis_info'.
+      if Sidekiq.respond_to?(:default_configuration)
+        Sidekiq.default_configuration.redis_info ? OK : CRITICAL
+      else
+        Sidekiq.redis_info ? OK : CRITICAL
+      end
     rescue StandardError
       # One would expect a Redis::BaseConnectionError, but this should be
       # critical if any exception is raised when making a call to redis.

lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.14.2".freeze
+  VERSION = "9.14.3".freeze
 end

spec/lib/govuk_healthcheck/sidekiq_redis_spec.rb

@@ -3,35 +3,68 @@
 require_relative "shared_interface"
 
 RSpec.describe GovukHealthcheck::SidekiqRedis do
-  let(:redis_info) { double(:redis_info) }
-  let(:sidekiq) { double(:sidekiq, redis_info:) }
   before { stub_const("Sidekiq", sidekiq) }
 
-  context "when the database is connected" do
+  context "when Sidekiq responds to '.default_configuration'" do
     let(:redis_info) { double(:redis_info) }
+    let(:default_configuration) { double(:default_configuration, redis_info:) }
+    let(:sidekiq) { double(:sidekiq, default_configuration:) }
 
-    it_behaves_like "a healthcheck"
+    context "and the database is connected" do
+      it_behaves_like "a healthcheck"
 
-    it "returns OK" do
-      expect(subject.status).to eq(GovukHealthcheck::OK)
+      it "returns OK" do
+        expect(subject.status).to eq(GovukHealthcheck::OK)
+      end
     end
-  end
 
-  context "when the database is not connected" do
-    let(:redis_info) { nil }
+    context "when the database is not connected" do
+      let(:redis_info) { nil }
+
+      it_behaves_like "a healthcheck"
+
+      it "returns CRITICAL" do
+        expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+      end
+    end
 
-    it_behaves_like "a healthcheck"
+    context "and redis raises a connection error" do
+      it "returns CRITICAL" do
+        allow(default_configuration).to receive(:redis_info).and_raise StandardError
 
-    it "returns CRITICAL" do
-      expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+        expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+      end
     end
   end
 
-  context "when redis raises a connection error" do
-    it "returns CRITICAL" do
-      allow(sidekiq).to receive(:redis_info).and_raise StandardError
+  context "when Sidekiq doesn't respond to '.default_configuration'" do
+    let(:redis_info) { double(:redis_info) }
+    let(:sidekiq) { double(:sidekiq, redis_info:) }
+
+    context "and the database is connected" do
+      it_behaves_like "a healthcheck"
+
+      it "returns OK" do
+        expect(subject.status).to eq(GovukHealthcheck::OK)
+      end
+    end
+
+    context "when the database is not connected" do
+      let(:redis_info) { nil }
+
+      it_behaves_like "a healthcheck"
+
+      it "returns CRITICAL" do
+        expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+      end
+    end
+
+    context "and redis raises a connection error" do
+      it "returns CRITICAL" do
+        allow(sidekiq).to receive(:redis_info).and_raise StandardError
 
-      expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+        expect(subject.status).to eq(GovukHealthcheck::CRITICAL)
+      end
     end
   end
 end