rezept 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ba080e87808028a6d1edb483253b8d3bc721e8
-  data.tar.gz: e725df836b7f0b506af99e7a466e94ce7884c20a
+  metadata.gz: e1a63c85f4f727f5f7f62cf237216d194f59e084
+  data.tar.gz: 208608be750743f64f5e4e5b707d7bc1596751f1
 SHA512:
-  metadata.gz: c0bcb318a0130aaab5d6dd78ab73668eaf68dc81074d51ec3a9e50d8b6d7619f6583e362479561e257870cf07de9f3185f18dea62da7edd4a6f072bbfd33c085
-  data.tar.gz: 11bbdf453fa3b64696ad5febbb9cef60096737d3814cc0b0c2c9cc8202234891a921c421f28961b8f7923a5d759fab0bc88c7be4d3a84a513ae42dab989a2be8
+  metadata.gz: 3439526ec9d6f927172b56590bc343d7e24a0c7ff8d2651834145a677fc94ab01f14a699a5413ea9b01021c246843184f85339296671785250a390b9071dd042
+  data.tar.gz: 726585c29de47da270c4129d780bd275a7ec3e0cfa9b101ba2cab6657a4b56a76430299a738fdc58767bdb9a71f6176711363f75a57c3ebd40d47676ee38e8ef

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0
+- Add `--wait-entries option` to `run_command` [#3][]
+  - Change `--wait` option to `--wait-results` option
+  - Add `--wait-entries` option
+  - Bugfix
+
 ## 0.2.0
 - Add `put_inventory` command [#2][]
 - Add the options to search target instances from inventory to `run_command` [#2][]
@@ -17,4 +23,5 @@
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#1]: https://github.com/serverworks/rezept/issues/1
-[#2]: https://github.com/serverworks/rezept/issues/2
+[#2]: https://github.com/serverworks/rezept/issues/2
+[#3]: https://github.com/serverworks/rezept/issues/3

data/README.md

@@ -112,21 +112,22 @@ Usage:
   rezept run_command -d, --document=DOCUMENT
 
 Options:
-  -d, --document=DOCUMENT                  # The name of the document
-  -i, [--instance-ids=one two three]       # EC2 Instance IDs
-  -t, [--tags=key:value]                   # EC2 Instance tags
-  -I, [--inventory=INVENTORY]              # The name of the inventory type
-  -C, [--conditions=one two three]         # The conditions to search inventories (ex. "Foo = Bar", "Buz > 1.0")
-  -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
+  -d, --document=DOCUMENT                    # The name of the document
+  -i, [--instance-ids=one two three]         # EC2 Instance IDs
+  -t, [--tags=key:value]                     # EC2 Instance tags
+  -I, [--inventory=INVENTORY]                # The name of the inventory type
+  -C, [--conditions=one two three]           # The conditions to search inventories (ex. "Foo = Bar", "Buz > 1.0")
+  -p, [--parameters=key:value]               # Parameters for the document
+      [--dry-run], [--no-dry-run]            # Dry run (Only output the targets)
+      [--wait-entries], [--no-wait-entries]  # Wait for entries of managed instances
+      [--wait-results], [--no-wait-results]  # 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(`,`).
@@ -167,7 +168,7 @@ Command "My-RunShellScript" do
   content do
     __dsl do
       schemaVersion "2.0"
-      description "my Run a shell script or specify the path to a script to run."
+      description "Run a shell script."
       mainSteps do |*|
         action "aws:runShellScript"
         name "runShellScript"

data/lib/rezept/actions.rb

@@ -74,28 +74,40 @@ module Rezept
 
     def run_command(options)
       dry_run = options['dry_run'] ? '[Dry run] ' : ''
+      @client.set_options(options)
 
       if options['instance_ids'].nil? and options['tags'].nil? and (options['inventory'].nil? or options['conditions'].nil?)
         raise "Please specify the targets (--instance-ids/-i' or '--target-tags/-t' or '--inventroty/-I and --conditions/-C')"
       end
 
-      instances = @client.get_target_instances(
+      instances = @client.get_instances(
         options['instance_ids'],
         _tags_to_criteria(options['tags'], 'name')
       )
 
+      instance_ids = []
+      instances.each {|i| instance_ids << i.instance_id }
+      managed_instances = @client.get_managed_instances(instance_ids)
+
+      if options['wait_entries']
+        info("#{dry_run}Wait for entries of managed instances...")
+        while instances.length > 0 and managed_instances.length == 0
+          managed_instances = @client.get_managed_instances(instance_ids)
+        end
+      end
+
       info("#{dry_run}Target instances...")
 
       unless options['inventory'].nil?
-        instances = _filter_by_inventory(instances, options['inventory'], options['conditions'])
-        raise "Can't find target instances from inventories" if instances.empty?
+        managed_instances = _filter_by_inventory(managed_instances, options['inventory'], options['conditions'])
+        raise "Can't find target instances from inventories" if managed_instances.empty?
       end
-      _print_instances(instances)
+      _print_instances(managed_instances)
 
       instance_ids = options['instance_ids']
       if instance_ids.nil? and not options['inventory'].nil?
         instance_ids = []
-        instances.each {|i| instance_ids << i.instance_id}
+        managed_instances.each {|i| instance_ids << i.instance_id}
       end
 
       if dry_run.empty?
@@ -105,7 +117,7 @@ module Rezept
           _tags_to_criteria(options['tags'], 'key'),
           _convert_paraeters(options['parameters'])
         )
-        _wait_all_results(command.command_id) if options['wait']
+        _wait_all_results(command.command_id) if options['wait_results']
       end
     end
 
@@ -113,12 +125,12 @@ module Rezept
       filters = _conditions_to_filters(conditions)
       ret = []
       instances.each do |i|
-        inventory = @client.list_inventory_entries(
+        inventory_entries = @client.list_inventory_entries(
           i.instance_id,
           inventory,
           filters,
         )
-        ret << i unless inventory.entries.empty?
+        ret << i unless inventory_entries.entries.empty?
       end
       ret
     end
@@ -134,11 +146,10 @@ module Rezept
 
     def _print_instances(instances)
       instances.each do |instance|
-        name_tag = instance.tags.select {|i| i.key == 'Name'}
-        if name_tag.empty?
+        if instance.name.nil?
           info("- #{instance.instance_id}")
         else
-          info("- #{name_tag[0].value} (#{instance.instance_id})")
+          info("- #{instance.name} (#{instance.instance_id})")
         end
       end
     end

data/lib/rezept/cli.rb

@@ -45,7 +45,8 @@ module Rezept
     option :conditions, aliases: '-C', desc: 'The conditions to search inventories (ex. "Foo = Bar", "Buz > 1.0")', type: :array
     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
+    option :wait_entries, desc: 'Wait for entries of managed instances', type: :boolean, default: false
+    option :wait_results, desc: 'Wait and check for all results', type: :boolean, default: false
     def run_command
       @actions.run_command(options)
     end

data/lib/rezept/client.rb

@@ -62,7 +62,7 @@ module Rezept
       )
     end
 
-    def get_target_instances(instance_ids=nil, filters=nil, next_token=nil)
+    def get_instances(instance_ids=nil, filters=nil, next_token=nil)
       instances = []
 
       ret = @ec2.describe_instances(
@@ -74,7 +74,22 @@ module Rezept
         instances.concat(reservation.instances)
       end
 
-      instances.concat(get_target_instances(instance_ids, filters, ret.next_token)) unless ret.next_token.nil?
+      instances.concat(get_instances(instance_ids, filters, ret.next_token)) unless ret.next_token.nil?
+      instances
+    end
+
+    def get_managed_instances(instance_ids, next_token=nil)
+      instances = []
+
+      ret = @ssm.describe_instance_information(
+        filters: [{
+          key: "InstanceIds",
+          values: instance_ids
+        }],
+        next_token: next_token
+      )
+      instances = ret.instance_information_list
+      instances.concat(get_target_instances(instance_ids, ret.next_token)) unless ret.next_token.nil?
       instances
     end
 

data/lib/rezept/version.rb

@@ -1,3 +1,3 @@
 module Rezept
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rezept
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk