kumogata2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1010d8128a3e5f2c9c81ad72f7ecaea602862393
-  data.tar.gz: cd630b4ebcee5f7a4138f083b1d939b8579fa97d
+  metadata.gz: fb5540a3229d5f4102d1d96eb3f126e6a84a7828
+  data.tar.gz: 15b8e947a3be07b0b2432be90ade1f813b2072c3
 SHA512:
-  metadata.gz: 22aa199e0c3c7a082dd6857637662628d0f75ea0199373f73d9187ca7da1d7a3069292b0f5a77e6ee4d06267321c9120a208240853d29bc313ca99ae35114905
-  data.tar.gz: 1c4503049e67d11cbabd6dbc8f450842698c6e47c8865206fdcf6f23740be2f49b70b642f591e695a775b6b7aaa59733d40644c3345e6dc7464f7131bd96e316
+  metadata.gz: 56fd1a43761ac31258d23e7dce325531c517f61a63daf17d4cd60396145d5e41fbcd650a530ddd625b7be6e6910554914ea65f5a9d129afed834aea763146262
+  data.tar.gz: 1eeee2ea9d80d9266b68e4aef6a5d6e7cc208291b3f05d25f5a193ff6e598feb3f653c378e4ab0d9e97fb7a28420a14fd7286e74cd35ead7626d669c88316835

data/README.md

@@ -26,18 +26,20 @@ Or install it yourself as:
 Usage: kumogata2 <command> [args] [options]
 
 Commands:
-  create         PATH_OR_URL [STACK_NAME]   Create resources as specified in the template
-  update         PATH_OR_URL STACK_NAME     Update a stack as specified in the template
-  delete         STACK_NAME                 Delete a specified stack
-  validate       PATH_OR_URL                Validate a specified template
-  list           [STACK_NAME]               List summary information for stacks
-  export         STACK_NAME                 Export a template from a specified stack
-  convert        PATH_OR_URL                Convert a template format
-  diff           PATH_OR_URL1 PATH_OR_URL2  Compare templates logically (file, http://..., stack://...)
-  dry-run        PATH_OR_URL STACK_NAME     Create a change set and show it
-  show-events    STACK_NAME                 Show events for a specified stack
-  show-outputs   STACK_NAME                 Show outputs for a specified stack
-  show-resources STACK_NAME                 Show resources for a specified stack
+  describe         STACK_NAME                 Describe a specified stack
+  create           PATH_OR_URL [STACK_NAME]   Create resources as specified in the template
+  update           PATH_OR_URL STACK_NAME     Update a stack as specified in the template
+  delete           STACK_NAME                 Delete a specified stack
+  validate         PATH_OR_URL                Validate a specified template
+  list             [STACK_NAME]               List summary information for stacks
+  export           STACK_NAME                 Export a template from a specified stack
+  convert          PATH_OR_URL                Convert a template format
+  diff             PATH_OR_URL1 PATH_OR_URL2  Compare templates logically (file, http://..., stack://...)
+  dry-run          PATH_OR_URL STACK_NAME     Create a change set and show it
+  show-events      STACK_NAME                 Show events for a specified stack
+  show-outputs     STACK_NAME                 Show outputs for a specified stack
+  show-resources   STACK_NAME                 Show resources for a specified stack
+  template-summary PATH_OR_URL                Show template information for a specified stack
 
 Support Format:
   json, js, template

data/lib/kumogata2/cli/option_parser.rb

@@ -7,6 +7,10 @@ module Kumogata2::CLI
     }
 
     COMMANDS = {
+      describe: {
+        description: 'Describe a specified stack',
+        arguments: [:stack_name],
+      },
       create: {
         description: 'Create resources as specified in the template',
         arguments: [:path_or_url, :stack_name?],
@@ -59,6 +63,10 @@ module Kumogata2::CLI
         description: 'Show resources for a specified stack',
         arguments: [:stack_name],
       },
+      template_summary: {
+        description: 'Show template information for a specified stack',
+        arguments: [:path_or_url],
+      },
     }
 
     class << self
@@ -142,8 +150,9 @@ module Kumogata2::CLI
 
       orig_command = command
       command = command.gsub('-', '_').to_sym
+      command = find_command(command)
 
-      unless COMMANDS.has_key?(command)
+      unless command
         raise "Unknown command: #{orig_command}"
       end
 
@@ -185,6 +194,16 @@ module Kumogata2::CLI
 
     private
 
+    def find_command(command)
+      selected = COMMANDS.keys.select {|i| i =~ /\A#{command}/ }
+
+      if selected.length == 1
+        selected.first
+      else
+        nil
+      end
+    end
+
     def exit_parse!(exit_code)
       exit(exit_code)
     end

data/lib/kumogata2/client.rb

@@ -8,7 +8,15 @@ class Kumogata2::Client
     @plugin_by_ext = {}
   end
 
+  def describe(stack_name)
+    stack_name = normalize_stack_name(stack_name)
+    validate_stack_name(stack_name)
+    stack = describe_stack(stack_name)
+    JSON.pretty_generate(stack).colorize_as(:json)
+  end
+
   def create(path_or_url, stack_name = nil)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name) if stack_name
     template = open_template(path_or_url)
     update_deletion_policy(template, delete_stack: !stack_name)
@@ -21,6 +29,7 @@ class Kumogata2::Client
   end
 
   def update(path_or_url, stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     template = open_template(path_or_url)
     update_deletion_policy(template, update_metadate: true)
@@ -33,6 +42,7 @@ class Kumogata2::Client
   end
 
   def delete(stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     @resource.stack(stack_name).stack_status
 
@@ -47,12 +57,14 @@ class Kumogata2::Client
   end
 
   def list(stack_name = nil)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name) if stack_name
     stacks = describe_stacks(stack_name)
     JSON.pretty_generate(stacks).colorize_as(:json)
   end
 
   def export(stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     template = export_template(stack_name)
     convert0(template)
@@ -87,6 +99,7 @@ class Kumogata2::Client
   end
 
   def dry_run(path_or_url, stack_name = nil)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name) if stack_name
     template = open_template(path_or_url)
     update_deletion_policy(template, delete_stack: !stack_name)
@@ -96,25 +109,49 @@ class Kumogata2::Client
   end
 
   def show_events(stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     events = describe_events(stack_name)
     JSON.pretty_generate(events).colorize_as(:json)
   end
 
   def show_outputs(stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     outputs = describe_outputs(stack_name)
     JSON.pretty_generate(outputs).colorize_as(:json)
   end
 
   def show_resources(stack_name)
+    stack_name = normalize_stack_name(stack_name)
     validate_stack_name(stack_name)
     resources = describe_resources(stack_name)
     JSON.pretty_generate(resources).colorize_as(:json)
   end
 
+  def template_summary(path_or_url)
+    params = {}
+
+    if path_or_url =~ %r|\Astack://(.*)|
+      stack_name = $1 || ''
+      validate_stack_name(stack_name)
+      params[:stack_name] = stack_name
+    else
+      template = open_template(path_or_url)
+      params[:template_body] = JSON.pretty_generate(template)
+    end
+
+    summary = describe_template_summary(params)
+    JSON.pretty_generate(summary).colorize_as(:json)
+  end
+
   private
 
+  def describe_stack(stack_name)
+    resp = @client.describe_stacks(stack_name: stack_name)
+    resp.stacks.first.to_h
+  end
+
   def create_stack(template, stack_name)
     stack_will_be_deleted = !stack_name
 
@@ -325,6 +362,11 @@ class Kumogata2::Client
     resource_summaries_for(stack)
   end
 
+  def describe_template_summary(params)
+    resp = @client.get_template_summary(params)
+    resp.to_h
+  end
+
   def convert0(template)
     ext = @options.output_format || 'template'
     plugin = find_or_create_plugin('xxx.' + ext)
@@ -584,4 +626,12 @@ EOS
     stack_name = stack_name.join('-')
     stack_name.gsub(/[^-a-zA-Z0-9]+/, '-').gsub(/-+/, '-')
   end
+
+  def normalize_stack_name(stack_name)
+    if %r|\Astack://| =~ stack_name
+      stack_name.sub(%r|\Astack://|, '')
+    else
+      stack_name
+    end
+  end
 end

data/lib/kumogata2/version.rb

@@ -1,3 +1,3 @@
 module Kumogata2
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara