govuk_app_config 4.7.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0a86d04eac2f6c9d28dac8fe8971f2d9a7b318466145bed5d314eb0ce57529
-  data.tar.gz: f309aece319f90ddc1eeaee8ab30188121caec53e2d3f86e7236a38a54307952
+  metadata.gz: 6bd7b3d518724177cecd7e83f08a93be2294cb0125ab91c70cf7dd07bf58dd48
+  data.tar.gz: 78debe718523a1111d55a237c718fc629449d898cc2a9de42655c7c4d1befc97
 SHA512:
-  metadata.gz: 8e54af80454cb90fbf63f1b3b4b81ee89f7edf5adc589fb24f0fe3a16e232d6a6663d3c9d56870b6922e0907c2f8e36aa66f17942384ba2444e38158d164892a
-  data.tar.gz: 24223d4a1aca01eec6d2dba4f5a6bfe70d09135fb4d3504a0db77624bf3b8055d6c769446f3c6b8af95e311851952dc36ae58c37a870f1b228145dcc5726a7db
+  metadata.gz: 3613784ff88b23b7a5985356a7d74ac27322c14a0c2515969b0b80ae6679f422c02104b2cdd46286038fca9d9ce95a09d348c6aea231d4c3639883080bc2142a
+  data.tar.gz: b006723e41e94e494da94ecbc7a99a61a17e42d213715f75e8255affa54fffbb6d3384db32f20966a4013765735093dcec83eab5785676f262c14dad4638d1d2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 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))
+
+# 4.7.1
+
+- Fix the ability to open the Rails console (`bundle exec rails c`) when running inside a container ([#257](https://github.com/alphagov/govuk_app_config/pull/257)).
+
 # 4.7.0
 
 - Adds Prometheus Sidekiq monitoring ([#255](https://github.com/alphagov/govuk_app_config/pull/255))

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 "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/configuration.rb

@@ -19,8 +19,11 @@ module GovukError
       # don't capture the error.
       self.enabled_environments = %w[
         integration-blue-aws
+        integration-eks
         staging
+        staging-eks
         production
+        production-eks
       ]
 
       self.excluded_exceptions = [

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -1,6 +1,11 @@
 module GovukPrometheusExporter
   def self.should_configure
-    ENV["GOVUK_PROMETHEUS_EXPORTER"] == "true" && !(defined?(Rails) && Rails.env == "test")
+    if File.basename($PROGRAM_NAME) == "rake" ||
+        defined?(Rails) && (Rails.const_defined?("Console") || Rails.env == "test")
+      false
+    else
+      ENV["GOVUK_PROMETHEUS_EXPORTER"] == "true"
+    end
   end
 
   def self.configure

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.7.0".freeze
+  VERSION = "4.9.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.7.0
+  version: 4.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-09-05 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
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.6'
+- !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: '0.7'
 - !ruby/object:Gem::Dependency
   name: sentry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +240,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 +299,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 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications