sonic-screwdriver 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7012e35108a2515bf2ad5abe18cbe39502a4dc58e64732199334414cfb7b0808
-  data.tar.gz: 9cb1113b9bb23ce2605b01594d54d477e3f10f6322f0d97c8ebbd8a6fae5aa0b
+  metadata.gz: 6bbef13564fb67b71ae83ef8b80d9c67f3a7898bbdc5dd0215adb5309b478322
+  data.tar.gz: d27e4a05ccadc3bb45987fdfeaac328b6d620cef08fe4b5af89d7def964e9087
 SHA512:
-  metadata.gz: 99ccd14a805e3bb635bd41c65565d35a6afed559ecf0bd781b36ddc61bfd05e8c3dff926018b2605385647fb55c3eb0e1bc322bec609a56c0e274143c2bc5bb1
-  data.tar.gz: c27388fc985c3ac35e02189ccdd748b28fe3f3d1399aa36cc2f601b6fe5fa54cf9634f9984230d9067c3d8060c7c34a052782abf8e889a6695e1a9391b753e13
+  metadata.gz: 2fb10c05307747cb731e28d9e30b3cbacbc929b8a0f5f4ccdc303c0e2ceb1a6f0e7234f62d7336f0e21e80d197cd843314b41773478c8e9251a67bdbd23e0b1b
+  data.tar.gz: 725ec5a6aaa226b6e70b042db8551665976803ec74a6dfa13d10a114a616a93301d2df8aa5e074ce75c8886300e8539a19d1de864579b1b450c9bb5948af2006

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.5] - 2021-04-24
+- [#14](https://github.com/boltops-tools/sonic/pull/14) execute --timeout option: executionTimeout
+
 ## [2.2.4] - 2021-04-13
 - [#13](https://github.com/boltops-tools/sonic/pull/13) execute --comment option
 

data/lib/sonic/cli.rb

@@ -30,6 +30,7 @@ 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"
     def execute(*command)
       Execute.new(command, options).execute
     end

data/lib/sonic/execute.rb

@@ -199,10 +199,15 @@ module Sonic
       command = build_command(@command)
       comment = @options[:comment] || "sonic #{ARGV.join(' ')}"
       comment = comment[0..99] # comment has a max of 100 chars
+
+      parameters = { "commands" => command }
+      t = @options[:timeout]
+      parameters[:executionTimeout] = [t] if t # weird but executionTimeout expects an Array
+
       options = criteria.merge(
         document_name: "AWS-RunShellScript", # default
         comment: comment,
-        parameters: { "commands" => command },
+        parameters: parameters,
         # Default CloudWatchLog settings. Can be overwritten with settings.yml send_command
         # IMPORTANT: make sure the EC2 instance the command runs on has access to write to CloudWatch Logs.
         cloud_watch_output_config: {

data/lib/sonic/version.rb

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

metadata

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