sonic-screwdriver 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bbef13564fb67b71ae83ef8b80d9c67f3a7898bbdc5dd0215adb5309b478322
-  data.tar.gz: d27e4a05ccadc3bb45987fdfeaac328b6d620cef08fe4b5af89d7def964e9087
+  metadata.gz: 29aac04bb7f8d0a6b49d6a30813edbcb2aeaab5616fc33e641f80343a0e6e821
+  data.tar.gz: 00d10d65f3e2ba80fb946ea67ef4c8ece025bfcd1f4283979e25634c0b0a0599
 SHA512:
-  metadata.gz: 2fb10c05307747cb731e28d9e30b3cbacbc929b8a0f5f4ccdc303c0e2ceb1a6f0e7234f62d7336f0e21e80d197cd843314b41773478c8e9251a67bdbd23e0b1b
-  data.tar.gz: 725ec5a6aaa226b6e70b042db8551665976803ec74a6dfa13d10a114a616a93301d2df8aa5e074ce75c8886300e8539a19d1de864579b1b450c9bb5948af2006
+  metadata.gz: 5623fd72b4faa65edcb42e63b7210a5254752e6c909a2c3343cd23e68adfb954d623ddc4d4bd9915e5d578a492ec8d2772e7f96a69b351d1d2e61ab69adc9c5a
+  data.tar.gz: ff9854b28d81f8f094fbe1d087624797fd00c9d6cba4fe59acbaf86fa70f7483f41d0c7edb48e704c80c8aff97e03ceb619a6e371b226f507970f59e3225745c

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [2.2.6] - 2021-04-30
+- [#15](https://github.com/boltops-tools/sonic/pull/15) execution-timeout and delivery-timeout options and timeout sets both …
+
 ## [2.2.5] - 2021-04-24
 - [#14](https://github.com/boltops-tools/sonic/pull/14) execute --timeout option: executionTimeout
 

data/lib/sonic/cli.rb

@@ -30,7 +30,9 @@ module Sonic
     option :instance_ids, desc: %Q|Instance ids to execute command on. Format: --instance-ids "i-111,i-222"|
     option :tags, desc: %Q|Tags used to determine what instances to execute command on. Format: --tags "Key1=v1,v2;Key2=v3"|
     option :comment, desc: "comment. defaults to the sonic command used"
-    option :timeout, aliases: %w[t], desc: "timeout in seconds. default to nil which uses AWS-RunShellScript default of 3600"
+    option :timeout, aliases: %w[t], desc: "timeout in seconds. defaults to nil which uses AWS-RunShellScript default of 3600"
+    option :execution_timeout, desc: "execution timeout in seconds. defaults to general timeout option"
+    option :delivery_timeout, desc: "delivery timeout in seconds. defaults to general timeout option"
     def execute(*command)
       Execute.new(command, options).execute
     end

data/lib/sonic/execute.rb

@@ -201,7 +201,7 @@ module Sonic
       comment = comment[0..99] # comment has a max of 100 chars
 
       parameters = { "commands" => command }
-      t = @options[:timeout]
+      t = @options[:execution_timeout] || @options[:timeout]
       parameters[:executionTimeout] = [t] if t # weird but executionTimeout expects an Array
 
       options = criteria.merge(
@@ -215,6 +215,10 @@ module Sonic
           cloud_watch_output_enabled: true,
         },
       )
+
+      t = @options[:execution_timeout] || @options[:timeout]
+      options[:timeout_seconds] = t if t
+
       settings_options = settings["send_command"] || {}
       options.merge(settings_options.deep_symbolize_keys)
     end

data/lib/sonic/version.rb

@@ -1,3 +1,3 @@
 module Sonic
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonic-screwdriver
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport