govuk_app_config 9.8.0 → 9.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9842df0c29ae508b504907d58d8bfbdb31cde911e7d59b4236be45eea6fd4054
-  data.tar.gz: e75ffd357becba4eb101c00fb82573fc556af88255efa2109f54a9257559f47d
+  metadata.gz: 5a349225515e547a17b98fdeccff77f3ed83c8b877186e683b82a4c70e7dee16
+  data.tar.gz: fefce175f60a2be6ee9bcba77e0164a7d311893dc49dcfd7645794be735b7f2e
 SHA512:
-  metadata.gz: c3c3cb9a9a79c113bb23e7281b26bad0f17825ec6ad53903d323c5a74fced1fb9f0b5189aa97be424fc8090f20c3c433fe23b2af75568d26fd492e3f55c51929
-  data.tar.gz: 1b14f98b1f155e8182e51d50ca1cd7146c357246f835d282f63aa1c92f5f7b2898ec4551934e8c351b982fbfbe68e8a03b67d61c48c8d8b36cc629baf5f63564
+  metadata.gz: 2971e35ad62205b4b6d6589c24dac49f0070caa6b5df5be3a014750ffbb160df4073c2fd987b5725eb4cd6061ca517982f4a8c804e0bde4a5e710f5dede33d86
+  data.tar.gz: 7b734c3239cc3d8c481e1e8832c4eaf86c426edabd3fde26146544ef418cf52c0e2eafbe08386559c28d462d9a4197f675695f76cb0a4b89012725bd19a0a7bd

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

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/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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))
+
 # 9.8.0
 
 * Add GOVUK domains to script src CSP ([#334](https://github.com/alphagov/govuk_app_config/pull/334))

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

@@ -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.13.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -51,7 +51,6 @@ module GovukContentSecurityPolicy
     policy.script_src :self,
                       *GOOGLE_ANALYTICS_DOMAINS,
                       *GOOGLE_STATIC_DOMAINS,
-                      *GOVUK_DOMAINS,
                       # Allow YouTube Embeds (Govspeak turns YouTube links into embeds)
                       "*.ytimg.com",
                       "www.youtube.com",

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.0".freeze
+  VERSION = "9.8.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.8.0
+  version: 9.8.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-25 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.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.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"
@@ -375,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications