govuk_app_config 9.22.2 → 9.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a794a2863f46d803e01492bd23f609aaabecb57531fd5140872705e03e93c6
-  data.tar.gz: ae8657c09468fb43fdb975332416967170104e31be1e8895a91e430fbfe0e453
+  metadata.gz: e7281de94bb3b8ad471321c08e8eb827af6569ddefcd22dce31ae19302252762
+  data.tar.gz: 2d7b0d73a80eff775af154d79e6e85f52dc75440cb2601c106dbd2042110c04a
 SHA512:
-  metadata.gz: 2ff2ba03cc604c87918d7bf66d5e9cc41c02b77060cd6f01124db6ebd11d27517dbf430fd9ccc2df7901aaeaee7899c660519095ab2ef899cf82680b6f897fc4
-  data.tar.gz: eb5f7149ec58a9ce9df18a58c80f2e0829daed548a988366dbab6eb3e2cb1e1464ec3724a6c9609c50d30d27e6758a2485f6de0eb0d859546e68b11350a5dab3
+  metadata.gz: 56a02fd4221ec8d62348ceb96db5591e8691f9a7b7badf0f6c2172cfd2c3f17ea49841ba746dc2074b5e3ee4494618e9314136195d66f0ce7a5772fe7b501419
+  data.tar.gz: 56e2a25b6422b38722009c0d5d96d8a1d45e8adb2fe126d636ee96c4dbd014a36985d9b848bddf5ea2f253ed05bd4200fb99b8040af52dc013dc260f053482ce

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@d5f787ce339eb0767271bc01d922e85644c2c8ab # v1.280.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.23.0
+
+* Remove StaticProxy middleware now that Static is no longer in use
+
+# 9.22.3
+
+* Pin dependency on connection_pool
+
 # 9.22.2
 
 * Update dependencies

data/govuk_app_config.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
+  spec.add_dependency "connection_pool", "< 3"
   spec.add_dependency "logstasher", "~> 2.1"
   spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.32"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.89.0"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.90.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.3"

data/lib/govuk_app_config/railtie.rb

@@ -2,12 +2,6 @@ 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
-    end
-
     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.2".freeze
+  VERSION = "9.23.0".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.2
+  version: 9.23.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: logstasher
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +66,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: 0.90.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +76,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -384,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
@@ -408,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.3
 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