govuk_app_config 4.8.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84b163006231db6d8f341b3083b366fdf7d114cf4f67aaa4be852d7f376d854
-  data.tar.gz: 122d0c3cf3d370effd13d844184a9441ec4f8ec7caaab6ca73b0d0049583ffb7
+  metadata.gz: 1f29dd29e2aa59d60c6c4139cd3194303a3e485fc81c3ff0cc4b541015ae2f6c
+  data.tar.gz: 294a43ae30bca8b61a75de8a7e49d4b9162acf608b79431860765039d0ebeb82
 SHA512:
-  metadata.gz: 05e999f65208c0e8967dcc8a71b06faa9969fa8d9c974501f8d9b899ceee1b5ddfa57242f357c8299ca0e9137c949d5ffa6fd418a57cfe7cb8b9152b57b84311
-  data.tar.gz: daff1bad6a9d6c0c558b1c6c1039c1fc8b98e66e081f847e14b49fd3bcfc5ac12e93902eaf5dc671a0ac72eeb0562868896fd8f6f1ef001e5807afc0adf5a751
+  metadata.gz: e3597f2f8cc645bf1888d14708918b5c9d87bb4d9f2fbade1393ad37880ab277dc0f94321e4da0b9c0fdf58dc841eff218c93a26abf53cf9b59d9028085416d9
+  data.tar.gz: 66a1bb4da547d49e496caca8770c5aa9b93b8d965276fcb16943f5d4c796679a60b1f685e8ff3417eb2389de102429befc351d13fb4388c8f15aab2f8763f18e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.10.0
+
+- Reduce log level for the Sentry gem from `INFO` to `WARN` to avoid polluting logs with uninformative messages. This only affects log messages from the Sentry gem itself, which go to `stdout`.
+
+# 4.9.0
+
+- Add GovukProxy::StaticProxy to forward Static asset requests by setting `GOVUK_PROXY_STATIC_ENABLED=true`.([#261](https://github.com/alphagov/govuk_app_config/pull/261))
+
 # 4.8.0
 
 - Enables Sentry environment names for EKS versions of integration, staging and production.([#260](https://github.com/alphagov/govuk_app_config/pull/260))

data/govuk_app_config.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", "~> 2.1"
+  spec.add_dependency "plek", "~> 4"
   spec.add_dependency "prometheus_exporter", "~> 2.0"
-  spec.add_dependency "puma", "~> 5.6"
+  spec.add_dependency "puma", ">= 5.6", "< 7.0"
+  spec.add_dependency "rack-proxy", "~> 0.7"
   spec.add_dependency "sentry-rails", "~> 5.3"
   spec.add_dependency "sentry-ruby", "~> 5.3"
   spec.add_dependency "statsd-ruby", "~> 1.5"
@@ -35,6 +37,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.6.0"
+  spec.add_development_dependency "rubocop-govuk", "4.7.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_error.rb

@@ -40,6 +40,8 @@ module GovukError
 
     Sentry.init do |sentry_config|
       config = Configuration.new(sentry_config)
+      # Avoid "Sending envelope with items ... to Sentry" logspew on stdout.
+      config.logger.level = Sentry::Logger::WARN
       yield config if block_given?
     end
   end

data/lib/govuk_app_config/govuk_proxy/static_proxy.rb

@@ -0,0 +1,19 @@
+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

data/lib/govuk_app_config/railtie.rb

@@ -1,5 +1,14 @@
+require "plek"
+
 module GovukAppConfig
   class Railtie < Rails::Railtie
+    initializer "govuk_app_config.configure_govuk_proxy" do |app|
+      if ENV["GOVUK_PROXY_STATIC_ENABLED"] == "true"
+        static_url = Plek.new.find("static")
+        app.middleware.use GovukProxy::StaticProxy, backend: static_url
+      end
+    end
+
     config.before_initialize do
       GovukLogging.configure if Rails.env.production?
     end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.8.0".freeze
+  VERSION = "4.10.0".freeze
 end

data/lib/govuk_app_config.rb

@@ -1,6 +1,7 @@
 require "govuk_app_config/version"
 require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/govuk_error"
+require "govuk_app_config/govuk_proxy/static_proxy"
 require "govuk_app_config/govuk_healthcheck"
 require "govuk_app_config/govuk_i18n"
 # This require is deprecated and should be removed on next major version bump

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.10.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: plek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +56,36 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: rack-proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sentry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +246,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +305,7 @@ files:
 - lib/govuk_app_config/govuk_i18n.rb
 - lib/govuk_app_config/govuk_logging.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_unicorn.rb
@@ -296,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications