rezept 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e46b66acf98930fd5070f065439fd87ea1418e
-  data.tar.gz: 5145a5beb089d59c11980b4d007b58a67f8bc9ad
+  metadata.gz: a084f39244aeebaf00fd8d2307de6c7dd189a4e5
+  data.tar.gz: f6b24452efdbdf3798883f4be75515d6b57ee779
 SHA512:
-  metadata.gz: c8df9983eed7551c6715fe1c2cf9215489636d609966a532523d0a1ff51f14dff8ed09c6f3e6b73e933087d341d08aef65a549c9049d6baf15890c170ad01870
-  data.tar.gz: 12f87f8f44a03d21a7027988d221323c61ecea92c3bb252e4f19ba85caeccdfb6d2fedcf7b3266f3aea514c36f8b2839f62718e529e6d0c48eafa0c2e1287941
+  metadata.gz: ce615a416a985a938879af31ca0f6d6628c3b86f446a94bd5a0379066c6cad75506387b50ee54438a6f75b7a638515c6b6a40b80aa19ab549f24190fec4e570b
+  data.tar.gz: 796d1a2eab98ee9ca2bf847126a67b416f5f4ca778f3e4c1ba589083555f07c82cb055109cbceff53023a877f312828d05e6b8b112c672901984b4aeadfba116

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## 0.1.0
+
+- Add `run_command` command [#1][]
+- Some small fixes
+
+## 0.0.2
+
+- Initial release
+
+## 0.0.1 (yunked)
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#1]: https://github.com/serverworks/rezept/issues/1

data/Docfile

@@ -9,7 +9,8 @@ template "runShellScriptTemplate" do
         action "aws:runShellScript"
         name "runShellScript"
         inputs do
-          commands __script(context.commands)
+          runCommand __script(context.commands)
+          TimeoutSeconds 10
         end
       end
     end
@@ -18,7 +19,7 @@ end
 
 Command "My-RunShellScript" do
   account_ids []
-  include_template "runShellScriptTemplate", commands: "echo 1"
+  include_template "runShellScriptTemplate", commands: "echo 1 >> /tmp/result.txt"
 end
 
 Command "My-RunShellScript-2" do
@@ -31,29 +32,13 @@ Command "My-RunShellScript-2" do
         action "aws:runShellScript"
         name "runShellScript"
         inputs do
-          commands __script(<<-'EOS')
+          runCommand __script(<<-'EOS')
 #! /bin/bash
-echo 1
-echo 2
-echo 3
+echo 1 >> /tmp/results.txt
+echo 2 >> /tmp/results.txt
+exit 1
 EOS
-        end
-      end
-    end
-  end
-end
-
-Command "My-RunShellScript-3" do
-  account_ids []
-  content do
-    __dsl do
-      schemaVersion "2.0"
-      description "Run a shell script"
-      mainSteps do |*|
-        action "aws:runShellScript"
-        name "runShellScript"
-        inputs do
-          commands __script_file("script.sh")
+          TimeoutSeconds 10
         end
       end
     end

data/README.md

@@ -1,5 +1,7 @@
 # Rezept
 
+[![Gem Version](https://badge.fury.io/rb/rezept.svg)](https://badge.fury.io/rb/rezept)
+
 A tool to manage EC2 Systems Manager (SSM) Documents with programmable DSL.
 
 ## Installation
@@ -101,6 +103,33 @@ Options:
                                            # Default: true
 ```
 
+#### run_command
+Run the commands
+
+```
+$ rezept help run_command
+Usage:
+  rezept run_command -n, --name=NAME
+
+Options:
+  -n, --name=NAME                          # Name of the document
+  -i, [--instance-ids=one two three]       # EC2 Instance IDs
+  -t, [--tags=key:value]                   # EC2 Instance tags
+  -p, [--parameters=key:value]             # Parameters for the document
+      [--dry-run], [--no-dry-run]          # Dry run (Only output the targets)
+      [--wait], [--no-wait]                # Wait and check for all results
+  -f, [--file=FILE]                        # Configuration file
+                                           # Default: Docfile
+      [--color], [--no-color]              # Disable colorize
+                                           # Default: true
+      [--amazon-docs], [--no-amazon-docs]  # Include Amazon owned documents
+      [--dsl-content], [--no-dsl-content]  # Convert JSON contents to DSL
+                                           # Default: true
+```
+
+- If you specify multiple values to `tags` and `parameters`, separate them with commas(`,`).
+- When you use the `wait` option, the exit code will be `0` if the commands succeed on the all instances, else it will be `1`.
+
 ## Advanced methods
 
 #### Script styled commands (__script)
@@ -118,7 +147,7 @@ Command "My-RunShellScript" do
         action "aws:runShellScript"
         name "runShellScript"
         inputs do
-          commands __script(<<-'EOS')
+          runCommand __script(<<-'EOS')
 #! /bin/bash
 echo 1
 echo 2
@@ -145,7 +174,7 @@ Document Type: 'Command'
       "action": "aws:runShellScript",
       "name": "runShellScript",
       "inputs": {
-        "commands": [
+        "runCommand": [
           "#! /bin/bash",
           "echo 1",
           "echo 2",
@@ -172,7 +201,7 @@ Command "My-RunShellScript" do
         action "aws:runShellScript"
         name "runShellScript"
         inputs do
-          commands __script_file("script.sh")
+          runCommand __script_file("script.sh")
         end
       end
     end
@@ -203,7 +232,7 @@ Document Type: 'Command'
       "action": "aws:runShellScript",
       "name": "runShellScript",
       "inputs": {
-        "commands": [
+        "runCommand": [
           "#! /bin/bash",
           "echo 1",
           "echo 2",
@@ -229,7 +258,7 @@ template "runShellScriptTemplate" do
         action "aws:runShellScript"
         name "runShellScript"
         inputs do
-          commands __script(context.commands)
+          runCommand __script(context.commands)
         end
       end
     end
@@ -256,7 +285,7 @@ Document Type: 'Command'
       "action": "aws:runShellScript",
       "name": "runShellScript",
       "inputs": {
-        "commands": [
+        "runCommand": [
           "echo 1"
         ]
       }

data/lib/rezept/actions.rb

@@ -72,6 +72,85 @@ module Rezept
       _export_file(ret, options['output']) unless options['output'].nil?
     end
 
+    def run_command(options)
+      dry_run = options['dry_run'] ? '[Dry run] ' : ''
+
+      if options['instance_ids'].nil? and options['tags'].nil?
+        raise "Please specify the targets (--instance-ids/-i' or '--target-tags/-t')"
+      end
+
+      instances = @client.get_target_instances(
+        options['instance_ids'],
+        _tags_to_criteria(options['tags'], 'name')
+      )
+      info("#{dry_run}Target instances...")
+      instances.each do |instance|
+        name_tag = instance.tags.select {|i| i.key == 'Name'}
+        if name_tag.empty?
+          info("- #{instance.instance_id}")
+        else
+          info("- #{name_tag[0].value} (#{instance.instance_id})")
+        end
+      end
+
+      if dry_run.empty?
+        command = @client.run_command(
+          options['name'],
+          options['instance_ids'],
+          _tags_to_criteria(options['tags'], 'key'),
+          _convert_paraeters(options['parameters'])
+        )
+        _wait_all_results(command.command_id) if options['wait']
+      end
+    end
+
+    def _tags_to_criteria(targets, key_name)
+      return nil if targets.nil?
+      ret = []
+      targets.each {|k,v| ret << {key_name => "tag:#{k}", 'values' => v.split(',')} }
+      ret
+    end
+
+    def _convert_paraeters(parameters)
+      return nil if parameters.nil?
+      ret = {}
+      parameters.each do |k,v|
+        ret[k] = v.split(',')
+      end
+      ret
+    end
+
+    def _wait_all_results(command_id)
+      info("Wait for all results...")
+
+      done = false
+      failure = false
+      done_instances = []
+
+      until done do
+        sleep 1
+        invocations = @client.list_command_invocations(command_id)
+        invocations.each do |invocation|
+          break if done_instances.include?(invocation.instance_id)
+          unless ['Pending', 'InProgress'].include?(invocation.status)
+            case invocation.status
+            when 'Success'
+              info("- #{invocation.instance_id} => #{invocation.status}")
+            when 'Delayed'
+              warn("- #{invocation.instance_id} => #{invocation.status}")
+            else
+              fatal("- #{invocation.instance_id} => #{invocation.status}")
+              failure = true
+            end
+            done_instances << invocation.instance_id
+            done = true if done_instances.length == invocations.length
+          end
+        end
+      end
+
+      exit(1) if failure
+    end
+
     def _apply_docs(local, remote, dry_run)
       local.each do |l|
         l_ids = l.delete('account_ids')

data/lib/rezept/cli.rb

@@ -29,12 +29,23 @@ module Rezept
     end
 
     desc "convert", "Convert the documents to the other format"
-    option :name, aliases: '-n', desc: 'Name of document', type: :string, required: true
-    option :type, aliases: '-t', desc: 'Type of document (Command|Automation)', type: :string, required: true
+    option :name, aliases: '-n', desc: 'Name of the document', type: :string, required: true
+    option :type, aliases: '-t', desc: 'Type of the document (Command|Automation)', type: :string, required: true
     option :format, desc: 'Output format (json|ruby)', type: :string
     option :output, aliases: '-o', desc: 'Output filename (path)', type: :string
     def convert
       @actions.convert(options)
     end
+
+    desc "run_command", "Run the commands"
+    option :name, aliases: '-n', desc: 'Name of the document', type: :string, required: true
+    option :instance_ids, aliases: '-i', desc: 'EC2 Instance IDs', type: :array
+    option :tags, aliases: '-t', desc: 'EC2 Instance tags', type: :hash
+    option :parameters, aliases: '-p', desc: 'Parameters for the document', type: :hash
+    option :dry_run, desc: 'Dry run (Only output the targets)', type: :boolean, default: false
+    option :wait, desc: 'Wait and check for all results', type: :boolean, default: false
+    def run_command
+      @actions.run_command(options)
+    end
   end
 end

data/lib/rezept/client.rb

@@ -5,6 +5,7 @@ module Rezept
 
     def initialize
       @ssm = Aws::SSM::Client.new
+      @ec2 = Aws::EC2::Client.new
     end
 
     def set_options(options)
@@ -57,7 +58,40 @@ module Rezept
         name: doc['name'],
         permission_type: 'Share',
         account_ids_to_add: add_ids,
-        account_ids_to_remove: rm_ids)
+        account_ids_to_remove: rm_ids
+      )
+    end
+
+    def get_target_instances(instance_ids, filters, next_token=nil)
+      instances = []
+
+      ret = @ec2.describe_instances(
+        instance_ids: instance_ids,
+        filters: filters,
+        next_token: next_token
+      )
+      ret.reservations.each do |reservation|
+        instances.concat(reservation.instances)
+      end
+
+      instances.concat(get_target_instances(instance_ids, filters, ret.next_token)) unless ret.next_token.nil?
+      instances
+    end
+
+    def run_command(name, instance_ids, targets, parameters)
+      @ssm.send_command(
+        document_name: name,
+        instance_ids: instance_ids,
+        targets: targets,
+        parameters: parameters
+      ).command
+    end
+
+    def list_command_invocations(command_id, next_token=nil)
+      ret = @ssm.list_command_invocations(command_id: command_id)
+      invocations = ret.command_invocations
+      invocations.concat(list_command_invocations(command_id, ret.next_token)) unless ret.next_token.nil?
+      invocations
     end
 
   end

data/lib/rezept/logger.rb

@@ -53,8 +53,8 @@ module Rezept
       super { Rezept::TermColor.red(msg) }
     end
 
-    def error(progname = nil, method_name = nil, msg, backtrace)
-      super(progname) { { method_name: method_name, message: msg, backtrace: backtrace } }
+    def error(msg)
+      super { Rezept::TermColor.red(msg) }
     end
 
     module Helper

data/lib/rezept/version.rb

@@ -1,3 +1,3 @@
 module Rezept
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rezept
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -148,6 +148,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Docfile
 - Gemfile
 - LICENSE.txt