govuk_app_config 9.8.1 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a81e12baed33cfb74efa6e7e9d726e940b729a96e958ccc9a2d438b2644838
-  data.tar.gz: a05cc465261efc295e9be979381bf98af50c1e5dba32a8a159e4f59667126315
+  metadata.gz: 94bd44de25f488464e1a0103d684c0056e8ce28601f844e77af62d64c2ed3f01
+  data.tar.gz: ba20328aaaad1feb019602cd0ae9c85ded64754e1758c2825f5a8250aaad05d9
 SHA512:
-  metadata.gz: 92f9f03a3e5d82b9fdad3da8b7cda40af25f98e8c37685e13b1a101d1362e70a33daf29e253d59548248faada85eb1e7cce929f88a8e889e7a4b88167bbdb7a2
-  data.tar.gz: f6c681d57522e0b2ab434c58ac11f5880c33fe099a8ddf092bb5678045c4a6bed45cee0a464ef1e00fc18bd2ed31b9b6a8d6e96e5f68ea9e0710658fa5f6f407
+  metadata.gz: fdb06a1ecf1fbedac9007e08b10b6dc5be7682ef30e3f035b13f999e721ca67d62ff6eb0ef910f2825f32e8d6f18c6b8bc738a6d9a53712415bf0d2a13fb8e60
+  data.tar.gz: 8526ab8b18ca7a65038431d75537b74cf4f154db4f883e16d64e70d031af4aa699f6defb3a010067bead9f94e2d292b73e839f67606bd2e2e7f72080c9efc755

data/.github/workflows/ci.yml

@@ -11,6 +11,11 @@ on:
         type: string
 
 jobs:
+  snyk-security:
+    name: SNYK security analysis
+    uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
+    secrets: inherit
+  
   codeql-sast:
     name: CodeQL SAST scan
     uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
@@ -26,8 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: ['3.0', 3.1, 3.2]
+        ruby: [3.1, 3.2, 3.3]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

data/.govuk_dependabot_merger.yml

@@ -0,0 +1,10 @@
+api_version: 1
+auto_merge:
+  - dependency: rubocop-govuk
+    allowed_semver_bumps:
+      - patch
+      - minor
+  - dependency: plek
+    allowed_semver_bumps:
+      - patch
+      - minor

data/.rubocop.yml

@@ -1,3 +1,5 @@
 inherit_gem:
   rubocop-govuk:
     - config/default.yml
+Style/Lambda:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.0.5
+3.1.4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.9.0
+
+* Drop support for Ruby 3.0. The minimum required Ruby version is now 3.1.4.
+
+# 9.8.2
+
+* Fix Ruby 3.3 compatibility ([#343](https://github.com/alphagov/govuk_app_config/pull/343))
+
 # 9.8.1
 
 * Revert "Add GOVUK domains to script src CSP" ([#336](https://github.com/alphagov/govuk_app_config/pull/336))

data/README.md

@@ -96,9 +96,9 @@ and occurs at the time of a data sync, then it will be excluded even if the cust
 
 ```ruby
 GovukError.configure do |config|
-  config.before_send = lambda do |event, hint|
+  config.before_send = ->(event, hint) {
     hint[:exception].is_a?(ErrorWeWantToIgnore) ? nil : event
-  end
+  }
 end
 ```
 

data/govuk_app_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/govuk_app_config"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1.4"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "logstasher", "~> 2.1"
   spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.27"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.55.0"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.57.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.0"
@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 1.3"
-  spec.add_development_dependency "rubocop-govuk", "4.12.0"
+  spec.add_development_dependency "rubocop-govuk", "4.14.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_error/configuration.rb

@@ -72,9 +72,7 @@ module GovukError
       ]
       # Need to invoke an arbitrary `before_send=` in order to trigger the
       # `before_send_callbacks` behaviour
-      self.before_send = lambda { |error_or_event, _hint|
-        error_or_event
-      }
+      self.before_send = ->(error_or_event, _hint) { error_or_event }
     end
 
     def before_send=(closure)
@@ -85,7 +83,7 @@ module GovukError
   protected
 
     def ignore_excluded_exceptions_in_data_sync
-      lambda { |event, hint|
+      ->(event, hint) {
         data_sync_ignored_error = data_sync_excluded_exceptions.any? do |exception_to_ignore|
           exception_to_ignore = Object.const_get(exception_to_ignore) unless exception_to_ignore.is_a?(Module)
           exception_chain = Sentry::Utils::ExceptionCauseChain.exception_to_array(hint[:exception])
@@ -101,7 +99,7 @@ module GovukError
     end
 
     def increment_govuk_statsd_counters
-      lambda { |event, hint|
+      ->(event, hint) {
         if hint[:exception]
           GovukStatsd.increment("errors_occurred")
           GovukStatsd.increment("error_types.#{hint[:exception].class.name.split('::').last.underscore}")
@@ -111,14 +109,14 @@ module GovukError
     end
 
     def run_before_send_callbacks
-      lambda do |event, hint|
+      ->(event, hint) {
         result = event
         @before_send_callbacks.each do |callback|
           result = callback.call(event, hint)
           break if result.nil?
         end
         result
-      end
+      }
     end
   end
 end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.8.1".freeze
+  VERSION = "9.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.8.1
+  version: 9.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -53,7 +53,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.57.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +292,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".govuk_dependabot_merger.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -368,14 +369,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.2
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications