rack-logstasher 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d877ce60ae84d0a7532df7b8e89c8947fc7fcb4d6bd3733894c5761bc877a7c
-  data.tar.gz: 19b5da86c58508f8031737a65f4244ae7f1d91c4451a0587ae7559d0fa43b3d3
+  metadata.gz: 5a4370f7b7207d7d9fbdd41790ff2c33516eb7eae11872ebb8487c5ba14a5927
+  data.tar.gz: 5fc4eb96ab1fff94b08c3bf904c134d9ada78acc735a2c9e943782065d34808c
 SHA512:
-  metadata.gz: 4607fc05644c2a62c82f326aa933f832f11f788a1ba462f5cd4aa48beb721544347d9f9ea3d2f59969769a1c2403da6fdbdfaa35da0238e9c24f6fcb951c0b00
-  data.tar.gz: d47fe6f832f458d24e4ad6cf91d3235a93ccd5e3c311c6d16d8af3e13a64bf6abe08ee359e5c90a57d1419965e8517fd26b57c0fd1c5dab4906a99f0a66bb6fa
+  metadata.gz: d98b7afe5ecb8bbcbbe77e23c991532afe56329c8cd5ee0e8ab6035a1f588eb5d8559fc6683c4e0611563dad23ff7213bf332a5e022409b72b4b5537d4a1cc88
+  data.tar.gz: b869d0a6e1c3901d8ac5bdbab7fd255245d21b29a2c35c8eb49c15b58701cfa48fa7b1f8f80ac9c88dd31bd7b41c34e8b4608d28f4ca47cc8a64c0ee71dabdc4

data/.github/workflows/autorelease.yml

@@ -0,0 +1,10 @@
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '00 13 * * 2'
+
+jobs:
+  autorelease:
+    uses: alphagov/govuk-infrastructure/.github/workflows/autorelease-rubygem.yml@main
+    secrets:
+      GH_TOKEN: ${{ secrets.GOVUK_CI_GITHUB_API_TOKEN }}

data/.github/workflows/ci.yml

@@ -1,15 +1,36 @@
 on: [push, pull_request]
 
 jobs:
+  snyk-security:
+    name: SNYK security analysis
+    uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
+    with:
+      skip_sca: true
+    secrets: inherit
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+  
+  codeql-sast:
+    name: CodeQL SAST scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
+    permissions:
+      security-events: write
+
+  dependency-review:
+    name: Dependency Review scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main
+  
   test_matrix:
     strategy:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [ 2.7, '3.0', 3.1 ]
+        ruby: ['3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -30,6 +51,6 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     permissions:
       contents: write
-    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yml@main
     secrets:
       GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}

data/.govuk_dependabot_merger.yml

@@ -0,0 +1,6 @@
+api_version: 1
+auto_merge:
+  - dependency: rubocop-govuk
+    allowed_semver_bumps:
+      - patch
+      - minor

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.1.0
+
+* Drop support for Ruby 2.7.
+
+# 2.0.0
+
+- Add support for Rack 3
+- **BREAKING** Only allows lower case header keys due to [underlying Rack spec change at 3.0.0beta1](https://github.com/rack/rack/blob/main/CHANGELOG.md#300beta1---2022-08-08).
+
 # 1.1.0
 
 - Require Ruby 2.7 and greater

data/README.md

@@ -1,6 +1,8 @@
 # Rack::Logstasher
 
-Rack middleware to log requests in logstash json event format
+Rack middleware to log requests in logstash json event format.
+It is designed to give Rails-like logging to Sinatra apps.
+The gem is currently used by [search-api](https://github.com/alphagov/search-api) and [contentful-listener-api](https://github.com/alphagov/contentful-listener-api).
 
 ## Installation
 

data/lib/rack/logstasher/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Logstasher
-    VERSION = "1.1.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/rack-logstasher.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/rack-logstasher"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstash-event", "~> 1.2"
-  spec.add_dependency "rack", "~> 2.0"
+  spec.add_dependency "rack", ">= 2", "< 4"
 
   spec.add_development_dependency "rack-test", "~> 2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3"
-  spec.add_development_dependency "rubocop-govuk", "4.8.0"
+  spec.add_development_dependency "rubocop-govuk", "4.16.1"
 end

data/spec/rack/logstasher/logger_spec.rb

@@ -110,7 +110,7 @@ describe Rack::Logstasher::Logger do
 
       it "adds specified extra response headers to the log under the given key" do
         extra_response_headers["foo"] = "header_foo"
-        inner_response_headers["Foo"] = "bar"
+        inner_response_headers["foo"] = "bar"
         get "/something"
 
         log_details = JSON.parse(last_log_line)
@@ -136,16 +136,6 @@ describe Rack::Logstasher::Logger do
 
         expect(log_details["cache_status"]).to eq("MISS")
       end
-
-      it "matches header in a case-insensitive fashion" do
-        extra_response_headers["X-CacHe"] = "cache_status"
-        inner_response_headers["x-cAche"] = "MISS"
-        get "/something"
-
-        log_details = JSON.parse(last_log_line)
-
-        expect(log_details["cache_status"]).to eq("MISS")
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -28,16 +28,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.16.1
 description: Rack middleware to log requests in logstash json event format.  Like
   the logstasher gem, but for rack apps.
 email:
@@ -103,8 +109,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/autorelease.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".govuk_dependabot_merger.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -132,14 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: Rack middleware to log requests in logstash json event format