rezept 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a084f39244aeebaf00fd8d2307de6c7dd189a4e5
-  data.tar.gz: f6b24452efdbdf3798883f4be75515d6b57ee779
+  metadata.gz: 93ba080e87808028a6d1edb483253b8d3bc721e8
+  data.tar.gz: e725df836b7f0b506af99e7a466e94ce7884c20a
 SHA512:
-  metadata.gz: ce615a416a985a938879af31ca0f6d6628c3b86f446a94bd5a0379066c6cad75506387b50ee54438a6f75b7a638515c6b6a40b80aa19ab549f24190fec4e570b
-  data.tar.gz: 796d1a2eab98ee9ca2bf847126a67b416f5f4ca778f3e4c1ba589083555f07c82cb055109cbceff53023a877f312828d05e6b8b112c672901984b4aeadfba116
+  metadata.gz: c0bcb318a0130aaab5d6dd78ab73668eaf68dc81074d51ec3a9e50d8b6d7619f6583e362479561e257870cf07de9f3185f18dea62da7edd4a6f072bbfd33c085
+  data.tar.gz: 11bbdf453fa3b64696ad5febbb9cef60096737d3814cc0b0c2c9cc8202234891a921c421f28961b8f7923a5d759fab0bc88c7be4d3a84a513ae42dab989a2be8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+- Add `put_inventory` command [#2][]
+- Add the options to search target instances from inventory to `run_command` [#2][]
+  - `--inventory/-I`
+  - `--conditions/-C`
+
 ## 0.1.0
 
 - Add `run_command` command [#1][]
@@ -10,4 +16,5 @@
 ## 0.0.1 (yunked)
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#1]: https://github.com/serverworks/rezept/issues/1
+[#1]: https://github.com/serverworks/rezept/issues/1
+[#2]: https://github.com/serverworks/rezept/issues/2

data/README.md

@@ -109,12 +109,14 @@ Run the commands
 ```
 $ rezept help run_command
 Usage:
-  rezept run_command -n, --name=NAME
+  rezept run_command -d, --document=DOCUMENT
 
 Options:
-  -n, --name=NAME                          # Name of the document
+  -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
@@ -130,6 +132,29 @@ Options:
 - 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`.
 
+#### put_inventory
+Put the inventory
+
+```
+$ rezept help put_inventory
+Usage:
+  rezept put_inventory -c, --content=key:value -i, --instance-id=INSTANCE_ID -n, --name=NAME
+
+Options:
+  -n, --name=NAME                          # The name of the inventory type
+  -i, --instance-id=INSTANCE_ID            # EC2 Instance ID
+  -c, --content=key:value                  # Parameters for the document
+      [--schema-version=SCHEMA_VERSION]    # The schema version for the inventory item
+                                           # Default: 1.0
+  -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
+```
+
 ## Advanced methods
 
 #### Script styled commands (__script)

data/lib/rezept/actions.rb

@@ -50,18 +50,18 @@ module Rezept
         fmt = 'ruby'
       end
 
-      info("Document: '#{options['name']}'")
+      info("Document: '#{options['document']}'")
       info("Document Type: '#{options['type']}'")
 
       case fmt
       when 'json'
         docs = @converter.dslfile_to_h(options['file'])
-        docs = docs.select {|d| d['name'] == options['name'] }
+        docs = docs.select {|d| d['name'] == options['document'] }
         ret = JSON.pretty_generate(JSON.parse(docs[0]['content']))
         Rezept::Utils.print_json(ret)
       when 'ruby'
         doc = {}
-        doc['name'] = options['name']
+        doc['name'] = options['document']
         doc['document_type'] = options['type']
         doc['content'] = File.read(options['file'])
         ret = @converter.to_dsl(doc)
@@ -75,15 +75,64 @@ module Rezept
     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')"
+      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(
         options['instance_ids'],
         _tags_to_criteria(options['tags'], 'name')
       )
+
       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?
+      end
+      _print_instances(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}
+      end
+
+      if dry_run.empty?
+        command = @client.run_command(
+          options['document'],
+          instance_ids,
+          _tags_to_criteria(options['tags'], 'key'),
+          _convert_paraeters(options['parameters'])
+        )
+        _wait_all_results(command.command_id) if options['wait']
+      end
+    end
+
+    def _filter_by_inventory(instances, inventory, conditions)
+      filters = _conditions_to_filters(conditions)
+      ret = []
+      instances.each do |i|
+        inventory = @client.list_inventory_entries(
+          i.instance_id,
+          inventory,
+          filters,
+        )
+        ret << i unless inventory.entries.empty?
+      end
+      ret
+    end
+
+    def put_inventory(options)
+      @client.put_inventory(
+        options['instance_id'],
+        options['name'],
+        options['schema_version'],
+        options['content']
+      )
+    end
+
+    def _print_instances(instances)
       instances.each do |instance|
         name_tag = instance.tags.select {|i| i.key == 'Name'}
         if name_tag.empty?
@@ -92,16 +141,23 @@ module Rezept
           info("- #{name_tag[0].value} (#{instance.instance_id})")
         end
       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']
+    def _conditions_to_filters(conditions)
+      ret = []
+      cond_simbols = {
+        '=' => 'Equal',
+        '!=' => 'NotEqual',
+        '<' =>  'LessThan',
+        '>' => 'GreaterThan',
+      }
+      regexp = /^(?<key>[^=!<>\s]+)\s*(?<type>[=!<>]+)+\s*(?<value>.+)$/
+
+      conditions.each do |c|
+        m = regexp.match(c)
+        ret << {key: m[:key], values: m[:value].split(','), type: cond_simbols[m[:type]]}
       end
+      ret
     end
 
     def _tags_to_criteria(targets, key_name)

data/lib/rezept/cli.rb

@@ -29,7 +29,7 @@ module Rezept
     end
 
     desc "convert", "Convert the documents to the other format"
-    option :name, aliases: '-n', desc: 'Name of the document', type: :string, required: true
+    option :document, aliases: '-d', desc: 'The 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
@@ -38,14 +38,25 @@ module Rezept
     end
 
     desc "run_command", "Run the commands"
-    option :name, aliases: '-n', desc: 'Name of the document', type: :string, required: true
+    option :document, aliases: '-d', desc: 'The 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 :inventory, aliases: '-I', desc: 'The name of the inventory type', type: :string
+    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
     def run_command
       @actions.run_command(options)
     end
+
+    desc "put_inventory", "Put the inventory"
+    option :name, aliases: '-n', desc: 'The name of the inventory type', type: :string, required: true
+    option :instance_id, aliases: '-i', desc: 'EC2 Instance ID', type: :string, required: true
+    option :content, aliases: '-c', desc: 'Parameters for the document', type: :hash, required: true
+    option :schema_version, desc: 'The schema version for the inventory item', type: :string, default: '1.0'
+    def put_inventory
+      @actions.put_inventory(options)
+    end
   end
 end

data/lib/rezept/client.rb

@@ -62,7 +62,7 @@ module Rezept
       )
     end
 
-    def get_target_instances(instance_ids, filters, next_token=nil)
+    def get_target_instances(instance_ids=nil, filters=nil, next_token=nil)
       instances = []
 
       ret = @ec2.describe_instances(
@@ -94,5 +94,27 @@ module Rezept
       invocations
     end
 
+    def put_inventory(instance_id, type_name, schema_version, content)
+      @ssm.put_inventory(
+        instance_id: instance_id,
+        items: [
+          {
+            type_name: type_name,
+            schema_version: schema_version,
+            capture_time: Time.now.strftime('%Y-%m-%dT%H:%M:%SZ'),
+            content: [content],
+          },
+        ],
+      )
+    end
+
+    def list_inventory_entries(instance_id, type_name, filters)
+      @ssm.list_inventory_entries(
+        instance_id: instance_id,
+        type_name: type_name,
+        filters: filters,
+      )
+    end
+
   end
 end

data/lib/rezept/version.rb

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

metadata

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