Merge branch 'main' into dependabot/github_actions/codecov/codecov-ac…

…tion-4
dpep · Aug 8, 2024 · f9ec9db · f9ec9db
2 parents 46e6443 + 486bab0
commit f9ec9db
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 42 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -14,7 +14,7 @@ jobs:
         run: gh pr checkout ${{github.event.pull_request.number}}
       - name: Fetch PR metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
       - name: Approve PR
         run: |
           if [ "$(gh pr status --json reviewDecision -q .currentBranch.reviewDecision)" != "APPROVED" ]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+###  v0.15.1  (2024-02-06)
+- fail open errors
+- simplify
+- scope exception catching
+
 ###  v0.15.0  (2023-10-13)
 - drop ddog 0.54
 - add lockfile

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,55 +1,58 @@
 PATH
   remote: .
   specs:
-    berater (0.15.0)
+    berater (0.15.1)
       meddleware (>= 0.3)
       redis (>= 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark (0.2.0)
+    benchmark (0.3.0)
     byebug (11.1.3)
     connection_pool (2.4.1)
-    ddtrace (1.2.0)
-      debase-ruby_core_source (= 0.10.16)
-      libddprof (~> 0.6.0.1.0)
-      libddwaf (~> 1.3.0.2.0)
+    datadog-ci (0.8.3)
       msgpack
-    debase-ruby_core_source (0.10.16)
-    diff-lcs (1.5.0)
+    ddtrace (1.23.0)
+      datadog-ci (~> 0.8.1)
+      debase-ruby_core_source (= 3.3.1)
+      libdatadog (~> 7.0.0.1.0)
+      libddwaf (~> 1.14.0.0.0)
+      msgpack
+    debase-ruby_core_source (3.3.1)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    dogstatsd-ruby (5.5.0)
-    ffi (1.15.5)
-    libddprof (0.6.0.1.0)
-    libddwaf (1.3.0.2.0)
+    dogstatsd-ruby (5.6.1)
+    ffi (1.17.0)
+    libdatadog (7.0.0.1.0)
+    libddwaf (1.14.0.0.0)
       ffi (~> 1.0)
-    meddleware (0.3.0)
-    msgpack (1.5.3)
-    redis (5.0.7)
-      redis-client (>= 0.9.0)
-    redis-client (0.17.0)
+    meddleware (0.4.0)
+    msgpack (1.7.2)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
       connection_pool
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    simplecov (0.21.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    timecop (0.9.5)
+    timecop (0.9.9)
 
 PLATFORMS
   ruby
@@ -65,4 +68,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.3.17
+   2.5.10
diff --git a/berater.gemspec b/berater.gemspec
@@ -12,9 +12,7 @@ Gem::Specification.new do |s|
   s.description = 'work...within limits'
   s.homepage    = "https://github.com/dpep/#{package_name}_rb"
   s.license     = 'MIT'
-
-  s.files       = Dir.glob('lib/**/*')
-  s.test_files  = Dir.glob('spec/**/*_spec.rb')
+  s.files       = `git ls-files * ':!:spec'`.split("\n")
 
   s.required_ruby_version = '>= 3'
 

diff --git a/lib/berater/limiter.rb b/lib/berater/limiter.rb
@@ -52,10 +52,12 @@ def limit(**opts, &block)
 
       acquire_lock(capacity: capacity, cost: cost, **opts)
     rescue NoMethodError => e
-      raise unless e.message.include?("undefined method `evalsha' for")
+      if e.message.include?("undefined method `evalsha' for")
+        # repackage error so it's easier to understand
+        raise RuntimeError, "invalid redis connection: #{redis}"
+      end
 
-      # repackage error so it's easier to understand
-      raise RuntimeError, "invalid redis connection: #{redis}"
+      raise
     end
 
     def utilization
@@ -111,7 +113,7 @@ def capacity=(capacity)
       @capacity = capacity
     end
 
-    def acquire_lock(capacity:, cost:)
+    def acquire_lock(**options)
       raise NotImplementedError
     end
 

diff --git a/lib/berater/middleware/fail_open.rb b/lib/berater/middleware/fail_open.rb
@@ -3,9 +3,12 @@
 module Berater
   module Middleware
     class FailOpen
-      ERRORS = Set[
+      ERRORS = Set.new [
         Redis::BaseConnectionError,
-      ]
+        SystemCallError, # openssl
+        Timeout::Error, # connection pool
+        (OpenSSL::OpenSSLError if defined?(OpenSSL)),
+      ].compact
 
       def initialize(errors: nil, on_fail: nil)
         @errors = errors || ERRORS

diff --git a/lib/berater/version.rb b/lib/berater/version.rb
@@ -1,3 +1,3 @@
 module Berater
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end