shipit-engine 0.45.0 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78d46daa8d657f9643a129fc2d96499e2b51bc4513abb0f47ca920f638b18b6
-  data.tar.gz: d690a361445793aea4b4f12325a58e557f73143d48e3cf023f9158710662ccf2
+  metadata.gz: 391e77ca5abe04617e4a8516804feb802778b777a37fe3797f37986d9344838d
+  data.tar.gz: 7cbf010614b60f11a67ca39c25d3a5c3a15a404f59160566989b705690fa652f
 SHA512:
-  metadata.gz: 3e7fe16a035f3d4125870e7dc9b677d92b446abe63d2b753fa5c059d700b603a42d0dc87e367fa7b86b626f9ab380e3ddd07637699c404b2246489a341330bad
-  data.tar.gz: 29573bc2889bc5e063e1a568c9fec1701198875b8e822db2cf5174179d242c6b2c64e2daf0697518626ff3ce680c322cba6cd54061afdd291a14255b75c50015
+  metadata.gz: be5fe9aba69281bef4a301180f0814c16e6094b1a3949f1903ae3e10bb2f8cd5375d9078994f210d8337eb30a84ae8afb585d838dd99d727ec9abb112df50677
+  data.tar.gz: 9e64330a930d8cd30599196a750ee5eb8ed73c310dcbf76752307c10991c61198ae11ce063ab2831daa537318b9f332eede5f1d6455e07c295daba30e3c56cd7

data/app/models/shipit/task.rb

@@ -10,7 +10,6 @@ module Shipit
       end
     end
 
-    PRESENCE_CHECK_TIMEOUT = 30
     ACTIVE_STATUSES = %w[pending running aborting].freeze
     COMPLETED_STATUSES = %w[success flapping faulty validating].freeze
     UNSUCCESSFUL_STATUSES = %w[error failed aborted flapping timedout faulty].freeze
@@ -327,7 +326,7 @@ module Shipit
     end
 
     def ping
-      Shipit.redis.set(status_key, 'alive', ex: PRESENCE_CHECK_TIMEOUT)
+      Shipit.redis.set(status_key, 'alive', ex: Shipit.presence_check_timeout)
     end
 
     def alive?
@@ -335,7 +334,7 @@ module Shipit
     end
 
     def report_dead!
-      write("ERROR: Background job hasn't reported back in #{PRESENCE_CHECK_TIMEOUT} seconds.")
+      write("ERROR: Background job hasn't reported back in #{Shipit.presence_check_timeout} seconds.")
       error!
     end
 

data/lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.45.0'
+  VERSION = '0.45.1'
 end

data/lib/shipit.rb

@@ -91,6 +91,14 @@ module Shipit
     ENV['SHIPIT_ENABLE_SAMESITE_NONE'].present?
   end
 
+  def presence_check_timeout
+    raw = ENV.fetch('SHIPIT_PRESENCE_CHECK_TIMEOUT', '30')
+    timeout = Integer(raw)
+    raise ArgumentError, "SHIPIT_PRESENCE_CHECK_TIMEOUT must be a positive integer, got #{raw.inspect}" if timeout <= 0
+
+    timeout
+  end
+
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
   end

data/test/unit/shipit_test.rb

@@ -30,6 +30,40 @@ module Shipit
       assert_equal(['shopify/developers'], Shipit.github_teams.map(&:handle))
     end
 
+    test ".presence_check_timeout defaults to 30" do
+      assert_equal 30, Shipit.presence_check_timeout
+    end
+
+    test ".presence_check_timeout returns the configured value from ENV" do
+      ENV['SHIPIT_PRESENCE_CHECK_TIMEOUT'] = '120'
+      assert_equal 120, Shipit.presence_check_timeout
+    ensure
+      ENV.delete('SHIPIT_PRESENCE_CHECK_TIMEOUT')
+    end
+
+    test ".presence_check_timeout raises on non-numeric string" do
+      ENV['SHIPIT_PRESENCE_CHECK_TIMEOUT'] = 'abc'
+      assert_raises(ArgumentError) { Shipit.presence_check_timeout }
+    ensure
+      ENV.delete('SHIPIT_PRESENCE_CHECK_TIMEOUT')
+    end
+
+    test ".presence_check_timeout raises on zero" do
+      ENV['SHIPIT_PRESENCE_CHECK_TIMEOUT'] = '0'
+      error = assert_raises(ArgumentError) { Shipit.presence_check_timeout }
+      assert_match(/must be a positive integer/, error.message)
+    ensure
+      ENV.delete('SHIPIT_PRESENCE_CHECK_TIMEOUT')
+    end
+
+    test ".presence_check_timeout raises on negative value" do
+      ENV['SHIPIT_PRESENCE_CHECK_TIMEOUT'] = '-5'
+      error = assert_raises(ArgumentError) { Shipit.presence_check_timeout }
+      assert_match(/must be a positive integer/, error.message)
+    ensure
+      ENV.delete('SHIPIT_PRESENCE_CHECK_TIMEOUT')
+    end
+
     class RedisTest < self
       setup do
         @client = mock(:client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.45.1
 platform: ruby
 authors:
 - Jean Boussier