sonic-screwdriver 2.2.0 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e79b9c9806e506eb5630a849af60ce17517059460e98949c54a75f741b4639
-  data.tar.gz: 8723c524148eb771d887fb79bc5aca90b3aaa322c71ba14de11cd4c69c6d1c98
+  metadata.gz: 6bbef13564fb67b71ae83ef8b80d9c67f3a7898bbdc5dd0215adb5309b478322
+  data.tar.gz: d27e4a05ccadc3bb45987fdfeaac328b6d620cef08fe4b5af89d7def964e9087
 SHA512:
-  metadata.gz: 977d962d7ef3e133d055ecf252a8d93b33403daa7f09b0d21c31ddc7720a5a0eb4ea9ff418c3c3705eca0be4f1035efcae06c3f7fb15e7da0e42cdb82f6bcc2c
-  data.tar.gz: 23c9dfa55f8a04cbffcd0c2997bb89cc52f465d0af27d4cbeb5b93bd52c9d4ec801150e4593abda76428591ef53049c2937cdaee87a38484955907969b05c997
+  metadata.gz: 2fb10c05307747cb731e28d9e30b3cbacbc929b8a0f5f4ccdc303c0e2ceb1a6f0e7234f62d7336f0e21e80d197cd843314b41773478c8e9251a67bdbd23e0b1b
+  data.tar.gz: 725ec5a6aaa226b6e70b042db8551665976803ec74a6dfa13d10a114a616a93301d2df8aa5e074ce75c8886300e8539a19d1de864579b1b450c9bb5948af2006

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.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
+
 ## [2.2.0]
 - #7 sonic execute command: `--tags` and `--instance-id` options instead of polymorphic list. Breaking behavior.
 - display output even if tags used

data/docs/_includes/footer.html

@@ -6,11 +6,12 @@
                     <div class="footer-col col-md-4">
                         <h3>More Tools</h3>
                         <ul class="list-unstyled tools">
-                            <li><a href="http://rubyonjets.com">Jets</a></li>
-                            <li><a href="http://ufoships.com">Ufo</a></li>
-                            <li><a href="http://lono.cloud">Lono</a></li>
-                            <li><a href="http://jack-eb.com">Jack</a></li>
-                            <li><a href="https://boltops.com/toolbelt">Toolbelt</a></li>
+                            <li><a href="https://terraspace.cloud">Terraspace</a></li>
+                            <li><a href="https://kubes.guru">Kubes</a></li>
+                            <li><a href="https://rubyonjets.com">Jets</a></li>
+                            <li><a href="https://ufoships.com">Ufo</a></li>
+                            <li><a href="https://lono.cloud">Lono</a></li>
+                            <li><a href="https://jack-eb.com">Jack</a></li>
                         </ul>
                     </div>
                     <div class="footer-col col-md-4">

data/lib/sonic/cli.rb

@@ -29,6 +29,8 @@ 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. default to nil which uses AWS-RunShellScript default of 3600"
     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[: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: {
@@ -256,7 +277,7 @@ module Sonic
         # The script is being feed inline so just join the command together into one script.
         # Still keep in an array form because that's how ssn.send_command works with AWS-RunShellScript
         # usually reads the command.
-        [command.join(" ")]
+        command.is_a?(Array) ? command : [command]
       end
     end
 

data/lib/sonic/version.rb

@@ -1,3 +1,3 @@
 module Sonic
-  VERSION = "2.2.0"
+  VERSION = "2.2.5"
 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.0
+  version: 2.2.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -263,7 +263,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -420,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Multi-functional tool to manage AWS infrastructure