govuk_app_config 9.22.3 → 9.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99614104f1947c50c0742fbe16ab8ab82e716a29b1db27ca5cf704df846adfdd
-  data.tar.gz: de5446d0ab6539fe3f2332f7401e432828b28c24711b694e0cb99c874edb1144
+  metadata.gz: f2d0325b5faace54f44d8ab23f7d52e474a718246cdcbb8ffb3c28bd1ed0bd3a
+  data.tar.gz: bb248f3c9bdd810dd1634221d909e788b720a01f370cb7076cdda4438bf9d853
 SHA512:
-  metadata.gz: ed9a5942a97d8404ae30234c3b81b955cf9739f4679422e993b2915ac905d0ca3e2b840098dd53b194e61d4b8a3ef2d960468217df6891176394d5c9dda5a7ec
-  data.tar.gz: b12f0ed5a1b683640aedfaa945f8c44acfe704343032d2fd4ffd53a1f9c34a64458876aa6f786917b4d030c59574175719be7e70da0d3b0456dcbfa67bda3455
+  metadata.gz: 0fe04c0c61e73448c7280657fdf2b7c2cebfba20f5daed26c61c4879e1745085c9e7e9e7f1bbeb3ac41429bb64f182bf7fac928505f40025f7829979640adcaf
+  data.tar.gz: 4ef4febaa3316ddcd61d8350972e9cf2ca33271f549e39f6f03e3036123c2a539039095edb87bed9b893d0b1959417a1f4ae9e9147b41bfd2637a569b1e96f4b

data/.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
+    - uses: ruby/setup-ruby@4fc31e1c823882afd7ef55985266a526c589de90 # v1.282.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.23.1
+
+* Restore compatibility with Rails 8.1+ by fixing the boot cycle and ensuring structured logging is enabled. This allows Rails 8.1 apps to upgrade to the latest govuk_app_config.
+
+# 9.23.0
+
+* Remove StaticProxy middleware now that Static is no longer in use
+
 # 9.22.3
 
 * Pin dependency on connection_pool

data/lib/govuk_app_config/railtie.rb

@@ -1,13 +1,26 @@
 require "plek"
 
-module GovukAppConfig
-  class Railtie < Rails::Railtie
-    initializer "govuk_app_config.configure_govuk_proxy" do |app|
-      if ENV["GOVUK_PROXY_STATIC_ENABLED"] == "true"
-        app.middleware.use GovukProxy::StaticProxy, backend: Plek.find("static")
-      end
+# Workaround for Logstasher initializer conflict under Rails 8.1
+begin
+  require "logstasher/railtie"
+
+  # Only apply this workaround for Rails 8.1+ where the boot cycle issue exists.
+  # This prevents any potential regressions for apps on older Rails versions.
+  if defined?(LogStasher::Railtie) && Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("8.1")
+    # Remove duplicate initializers that cause cyclic dependency
+    LogStasher::Railtie.initializers.delete_if { |i| i.name == :logstasher }
+
+    # Replace with a single clean initializer that actually sets up LogStasher
+    LogStasher::Railtie.initializer(:logstasher_govuk_fix, after: :load_config_initializers) do |app|
+      LogStasher.setup(app) if app.config.logstasher.enabled
     end
+  end
+rescue LoadError, NameError
+  # Skip if Logstasher not present
+end
 
+module GovukAppConfig
+  class Railtie < Rails::Railtie
     initializer "govuk_app_config.configure_open_telemetry" do |app|
       unless Rails.const_defined?(:Console)
         GovukOpenTelemetry.configure(app.class.module_parent_name.underscore)

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.22.3".freeze
+  VERSION = "9.23.1".freeze
 end

data/lib/govuk_app_config.rb

@@ -2,7 +2,6 @@ require "govuk_app_config/govuk_error"
 require "govuk_app_config/govuk_healthcheck"
 require "govuk_app_config/govuk_open_telemetry"
 require "govuk_app_config/govuk_prometheus_exporter"
-require "govuk_app_config/govuk_proxy/static_proxy"
 require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/version"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.22.3
+  version: 9.23.1
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -398,7 +398,6 @@ files:
 - lib/govuk_app_config/govuk_json_logging/rails_ext/action_controller/metal/instrumentation.rb
 - lib/govuk_app_config/govuk_open_telemetry.rb
 - lib/govuk_app_config/govuk_prometheus_exporter.rb
-- lib/govuk_app_config/govuk_proxy/static_proxy.rb
 - lib/govuk_app_config/govuk_puma.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_timezone.rb
@@ -422,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []

data/lib/govuk_app_config/govuk_proxy/static_proxy.rb

@@ -1,19 +0,0 @@
-require "rack-proxy"
-
-module GovukProxy
-  class StaticProxy < Rack::Proxy
-    def perform_request(env)
-      request = Rack::Request.new(env)
-
-      # use rack proxy to forward any requests for /assets/static/*
-      # this regex needs to match the path set for `Rails.application.config.assets.prefix` in Static
-      # https://github.com/alphagov/static/blob/main/config/initializers/assets.rb
-      if request.path =~ %r{^/assets/static/}
-        env["HTTP_HOST"] = @backend.host
-        super(env)
-      else
-        @app.call(env)
-      end
-    end
-  end
-end