govuk_app_config 2.10.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98f57ba0b9010154d3aefbc2540acd056d35ef42af9e3b22b00495255f46899
-  data.tar.gz: c5315e4ba1f476e7c0fcb99839ad9e8705a1546e4b48e3246a16e94f6552b383
+  metadata.gz: 4ef48ff1d4edbc117dba4f4d8b09b862dacdc5faa06f879c9094e695d29025df
+  data.tar.gz: e6465d32e6522637f3a7cdd5681c3286bf3f1fd96657099e3e28ce0e716468fa
 SHA512:
-  metadata.gz: cea414c28b13d2b9cb359bade9dd6626eceb9dfd0f76ca79f77b2b8bff9f4807c01858951860e6888f795a32aa50cd2c79cc1ea63f72a01315a6cbd44b49d8cd
-  data.tar.gz: 3ef1e0ea53a489935775c9475cecb5f55585d2cfba0aed30b6a184430ab7fada8e24670150ebfa60043a59a6d750f76aeb913b89f826da2bbe3db68ca524cc7a
+  metadata.gz: dd241443a0a59323c2210c67fb04268bd7a662cff61c7eef3580bcde200efd6d38d7efa2bfb22b7642761fd1f929f2e8a4259fe12af8692338f69ce024a9cd15
+  data.tar.gz: 8470470f8cf108e25155b6eca6c64f82a9f79b601c22889399bfe71ce87cc39bb3e80a6efda7d30432121766721143329cc5271c591dc75ec36e495687d06a65

data/.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "03:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: aws-xray-sdk
+    versions:
+    - "> 0.10.0"

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 3.3.0
+
+- Revert the `should_capture`/`before_send` consolidation introduced in 3.1.0. This fixes the `data_sync_excluded_exceptions` behaviour that has been broken since v3.1.0. ([#211](https://github.com/alphagov/govuk_app_config/pull/211))
+
+# 3.2.0
+
+-  Add Speedcurve's LUX to connect-src policy ([#206](https://github.com/alphagov/govuk_app_config/pull/206))
+
+# 3.1.1
+
+- Fix the new before_send behaviour & tests, and add documentation ([#197](https://github.com/alphagov/govuk_app_config/pull/197))
+
+# 3.1.0
+
+- Remove support for `should_capture` callbacks in favour of `before_send` ([#196](https://github.com/alphagov/govuk_app_config/pull/196))
+
+# 3.0.0
+
+* BREAKING: Implement RFC 141 - remove unsuitable healthchecks and return a 500 on healthcheck failure ([#193](https://github.com/alphagov/govuk_app_config/pull/193))
+
 # 2.10.0
 * Allow LUX domain on img-src policy ([#191](https://github.com/alphagov/govuk_app_config/pull/191))
 

data/govuk_app_config.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/govuk_app_config"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
+  spec.required_ruby_version = ">= 2.6"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -78,7 +78,13 @@ module GovukContentSecurityPolicy
                        # Allow JSON call to klick2contact - HMPO web chat provider
                        "gov.klick2contact.com",
                        # Allow connecting to Verify to check whether the user is logged in
-                       "www.signin.service.gov.uk"
+                       "www.signin.service.gov.uk",
+                       # Allow connection to Speedcurve's CDN for LUX - used for
+                       # real user metrics on GOV.UK. This loads using an image
+                       # (see image policy), but returns a JavaScript file -
+                       # which is why this has to be added to the `connect-src`
+                       # policy as well.
+                       "lux.speedcurve.com"
 
     # Disallow all <object>, <embed>, and <applet> elements
     #

data/lib/govuk_app_config/govuk_error/govuk_data_sync.rb

@@ -3,14 +3,8 @@ require "time"
 module GovukError
   class GovukDataSync
     class MalformedDataSyncPeriod < RuntimeError
-      attr_reader :invalid_value
-
       def initialize(invalid_value)
-        @invalid_value = invalid_value
-      end
-
-      def message
-        "\"#{invalid_value}\" is not a valid value (should be of form '22:00-03:00')."
+        super("\"#{invalid_value}\" is not a valid value (should be of form '22:00-03:00').")
       end
     end
 

data/lib/govuk_app_config/govuk_healthcheck.rb

@@ -4,19 +4,16 @@ require "govuk_app_config/govuk_healthcheck/mongoid"
 require "govuk_app_config/govuk_healthcheck/rails_cache"
 require "govuk_app_config/govuk_healthcheck/redis"
 require "govuk_app_config/govuk_healthcheck/sidekiq_redis"
-require "govuk_app_config/govuk_healthcheck/threshold_check"
-require "govuk_app_config/govuk_healthcheck/sidekiq_queue_check"
-require "govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check"
-require "govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check"
 require "json"
 
 module GovukHealthcheck
   def self.rack_response(*checks)
     proc do
+      checkup = healthcheck(checks)
       [
-        200,
+        checkup[:status] == :ok ? 200 : 500,
         { "Content-Type" => "application/json" },
-        [JSON.dump(healthcheck(checks))],
+        [JSON.dump(checkup)],
       ]
     end
   end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "2.10.0".freeze
+  VERSION = "3.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 3.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -211,6 +211,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -237,11 +238,7 @@ files:
 - lib/govuk_app_config/govuk_healthcheck/mongoid.rb
 - lib/govuk_app_config/govuk_healthcheck/rails_cache.rb
 - lib/govuk_app_config/govuk_healthcheck/redis.rb
-- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb
-- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
-- lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb
-- lib/govuk_app_config/govuk_healthcheck/threshold_check.rb
 - lib/govuk_app_config/govuk_i18n.rb
 - lib/govuk_app_config/govuk_logging.rb
 - lib/govuk_app_config/govuk_statsd.rb
@@ -253,7 +250,7 @@ homepage: https://github.com/alphagov/govuk_app_config
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -261,15 +258,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb

@@ -1,62 +0,0 @@
-module GovukHealthcheck
-  class SidekiqQueueCheck
-    def status
-      queues.each do |name, value|
-        if value >= critical_threshold(queue: name)
-          return :critical
-        elsif value >= warning_threshold(queue: name)
-          return :warning
-        end
-      end
-
-      :ok
-    end
-
-    def message
-      messages = queues.map do |name, value|
-        critical = critical_threshold(queue: name)
-        warning = warning_threshold(queue: name)
-
-        if value >= critical
-          "#{name} (#{value}) is above the critical threshold (#{critical})"
-        elsif value >= warning
-          "#{name} (#{value}) is above the warning threshold (#{warning})"
-        end
-      end
-
-      messages = messages.compact
-
-      if messages.empty?
-        "all queues are below the critical and warning thresholds"
-      else
-        messages.join("\n")
-      end
-    end
-
-    def details
-      {
-        queues: queues.each_with_object({}) do |(name, value), hash|
-          hash[name] = {
-            value: value,
-            thresholds: {
-              critical: critical_threshold(queue: name),
-              warning: warning_threshold(queue: name),
-            }.reject { |_, val| val.to_f.infinite? || val.to_f.nan? },
-          }
-        end,
-      }
-    end
-
-    def queues
-      raise "This method must be overriden to be a hash of queue names and data."
-    end
-
-    def critical_threshold(queue:) # rubocop:disable Lint/UnusedMethodArgument
-      raise "This method must be overriden to be the critical threshold."
-    end
-
-    def warning_threshold(queue:) # rubocop:disable Lint/UnusedMethodArgument
-      raise "This method must be overriden to be the warning threshold."
-    end
-  end
-end

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb

@@ -1,13 +0,0 @@
-module GovukHealthcheck
-  class SidekiqQueueLatencyCheck < SidekiqQueueCheck
-    def name
-      :sidekiq_queue_latency
-    end
-
-    def queues
-      @queues ||= Sidekiq::Stats.new.queues.keys.each_with_object({}) do |name, hash|
-        hash[name] = Sidekiq::Queue.new(name).latency
-      end
-    end
-  end
-end

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb

@@ -1,11 +0,0 @@
-module GovukHealthcheck
-  class SidekiqRetrySizeCheck < ThresholdCheck
-    def name
-      :sidekiq_retry_size
-    end
-
-    def value
-      Sidekiq::Stats.new.retry_size
-    end
-  end
-end

data/lib/govuk_app_config/govuk_healthcheck/threshold_check.rb

@@ -1,50 +0,0 @@
-module GovukHealthcheck
-  class ThresholdCheck
-    def status
-      if value >= critical_threshold
-        :critical
-      elsif value >= warning_threshold
-        :warning
-      else
-        :ok
-      end
-    end
-
-    def message
-      if value >= critical_threshold
-        "#{value} is above the critical threshold (#{critical_threshold})"
-      elsif value >= warning_threshold
-        "#{value} is above the warning threshold (#{warning_threshold})"
-      else
-        "#{value} is below the critical and warning thresholds"
-      end
-    end
-
-    def details
-      {
-        value: value,
-        total: total,
-        thresholds: {
-          critical: critical_threshold,
-          warning: warning_threshold,
-        },
-      }
-    end
-
-    def value
-      raise "This method must be overridden to be the check value."
-    end
-
-    def total
-      nil # This method can be overriden to provide the total for the check.
-    end
-
-    def critical_threshold
-      raise "This method must be overriden to be the critical threshold."
-    end
-
-    def warning_threshold
-      raise "This method must be overriden to be the warning threshold."
-    end
-  end
-end