sonic-screwdriver 2.2.1 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0ee2f6b882f119c6e607c3de2c38391c8c17236f9ef892211cb55e887c7c95
-  data.tar.gz: a4592ac7afc7d3c875be3f02b26f5a884d2bd09423f518cf53fc5b027c963436
+  metadata.gz: 29aac04bb7f8d0a6b49d6a30813edbcb2aeaab5616fc33e641f80343a0e6e821
+  data.tar.gz: 00d10d65f3e2ba80fb946ea67ef4c8ece025bfcd1f4283979e25634c0b0a0599
 SHA512:
-  metadata.gz: e4c02076435af8641128a6487769362b4a3cb4f428a88fe07f14cb0455f8a5ab3bf80ea1950748b9ea0690307e7c38f4f779165e01a3e5279801ad798e4b279f
-  data.tar.gz: f0a7a5cea95e05190b5cf2fe767cc212d49e4063b9cfd4e04c18fb95ed20f2ae4b59b7bfe5a245b1616750aba6eb562ab53cddc196034af98977f8c25af56845
+  metadata.gz: 5623fd72b4faa65edcb42e63b7210a5254752e6c909a2c3343cd23e68adfb954d623ddc4d4bd9915e5d578a492ec8d2772e7f96a69b351d1d2e61ab69adc9c5a
+  data.tar.gz: ff9854b28d81f8f094fbe1d087624797fd00c9d6cba4fe59acbaf86fa70f7483f41d0c7edb48e704c80c8aff97e03ceb619a6e371b226f507970f59e3225745c

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 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
+
+## [2.2.4] - 2021-04-13
+- [#13](https://github.com/boltops-tools/sonic/pull/13) execute --comment option
+
+## [2.2.3] - 2021-04-12
+- [#12](https://github.com/boltops-tools/sonic/pull/12) fix cli check
+
+## [2.2.2] - 2021-04-12
+- [#11](https://github.com/boltops-tools/sonic/pull/11) cli check
+
 ## [2.2.1] - 2021-04-12
 - [#9](https://github.com/boltops-tools/sonic/pull/9) improve command array handling
 

data/lib/sonic/cli.rb

@@ -29,6 +29,10 @@ module Sonic
     # filter - Filter ec2 instances by tag name or instance_ids separated by commas
     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. 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

@@ -53,18 +53,32 @@ module Sonic
       puts
       return if @options[:noop]
       status = wait(command_id)
-      instances_found = display_ssm_output(command_id)
+      display_ssm_output(command_id)
       display_console_url(command_id)
 
       if status == "Success"
         puts "Command successful: #{status}".color(:green)
-        exit(0)
+        exit_status(0)
       else
         puts "Command unsuccessful: #{status}".color(:red)
-        exit(1)
+        exit_status(1)
       end
     end
 
+    def exit_status(code)
+      exit(code) if cli?
+
+      if code == 0
+        true
+      else
+        raise "Error running command"
+      end
+    end
+
+    def cli?
+      $0.include?('sonic')
+    end
+
     def wait(command_id)
       ongoing_states = ["Pending", "InProgress", "Delayed"]
 
@@ -183,10 +197,17 @@ module Sonic
     def build_ssm_options
       criteria = transform_filter_option
       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[:execution_timeout] || @options[:timeout]
+      parameters[:executionTimeout] = [t] if t # weird but executionTimeout expects an Array
+
       options = criteria.merge(
         document_name: "AWS-RunShellScript", # default
-        comment: "sonic #{ARGV.join(' ')}"[0..99], # comment has a max of 100 chars
-        parameters: { "commands" => command },
+        comment: comment,
+        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: {
@@ -194,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.1"
+  VERSION = "2.2.6"
 end

data/sonic.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://sonic-screwdriver.cloud/"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = File.directory?('.git') ? `git ls-files`.split($/) : Dir.glob("**/*")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

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