sonic-screwdriver 2.2.2 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58baac92cd0720ee6f66d62b668d53eaf77a9b0bb184241dbbb69bdb2b7b120b
-  data.tar.gz: 593b326eee1fffa6da70b87f133a4cc1a61ae41b465962b5fa9077f1998c4dc5
+  metadata.gz: 2090155cf49be41cd1fb602d13b4f569fb251d9a69be4459fb2e101b19bc1229
+  data.tar.gz: 4d59f16423169fe0866c67645644a6e7a6362edb2c8375137376653eb743f3b7
 SHA512:
-  metadata.gz: 01b85739677b31d02caeb2c34a585fc2f711972ff086574b138f68b38ba156e9325dd0f8ba6fb76bd698f5b7bf422b4a1a11336f27b4695d2f2de153688dcc3b
-  data.tar.gz: d42107ab7218aab71cf6b500dc377e34a587b27155e696f729633a870b2788ab0807fc16c680c49083c99597ab466631b5e8f92b7d343a388379f5e2ce918c3c
+  metadata.gz: 8b3ad10084e43b02d44a4ef98e9f2b33966fa78f61a1baf82374890dfe4246ac32d2baf2ee20e6ad4ecfb672a7dfaa9bcc6aac68d98a59d2ec5b4f1b1aa6dad0
+  data.tar.gz: 357b1c2b01c2848980fd5307a00fdda27fffe56762b455e5a071067ebcedfccf233562cd098794e8b8fc17484bf47acb6902e7402117cf425923d8dbc7c4f7b5

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.7] - 2021-04-30
+- aws ssm send_command sdk requires string for timeout values
+
+## [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
 

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,7 +53,7 @@ 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"
@@ -66,7 +66,7 @@ module Sonic
     end
 
     def exit_status(code)
-      exit(code) unless cli?
+      exit(code) if cli?
 
       if code == 0
         true
@@ -197,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.to_s] if t # weird but executionTimeout expects an Array with String element
+
       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: {
@@ -208,6 +215,10 @@ module Sonic
           cloud_watch_output_enabled: true,
         },
       )
+
+      t = @options[:execution_timeout] || @options[:timeout]
+      options[:timeout_seconds] = t.to_s 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.2"
+  VERSION = "2.2.7"
 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.2
+  version: 2.2.7
 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