knife-cloudformation 0.1.4 → 0.1.6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.1.6
+* Adds inspect action
+* Updates to commons
+* Allow multiple stack destroys at once
+* Updates to options to make consistent
+
 ## v0.1.4
 * Support outputs on stack creation
 * Poll on destroy by default

data/knife-cloudformation.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.description = 'Knife tooling for Cloud Formation'
   s.require_path = 'lib'
   s.add_dependency 'chef'
-  s.add_dependency 'fog', '~> 1.12.1'
+  s.add_dependency 'fog', '~> 1.15'
+  s.add_dependency 'net-sftp'
   s.add_dependency 'attribute_struct', '~> 0.1.6'
   s.files = Dir['**/*']
 end

data/lib/chef/knife/cloudformation_base.rb

@@ -53,8 +53,8 @@ module KnifeCloudformation
         columns = allowed_attributes.size
         output += aws.process(things, :flat => true, :attributes => allowed_attributes)
         output.compact.flatten
-        if(output.empty? && !args.include?(:ignore_empty_output))
-          ui.warn 'No information found'
+        if(output.empty?)
+          ui.warn 'No information found' unless args.include?(:ignore_empty_output)
         else
           ui.info "#{what.to_s.capitalize} for stack: #{ui.color(stack, :bold)}" if stack
           ui.info "#{ui.list(output, :uneven_columns_across, columns)}"

data/lib/chef/knife/cloudformation_create.rb

@@ -59,11 +59,11 @@ class Chef
                 :proc => lambda {|val| Chef::Config[:knife][:cloudformation][:processing] = val }
               )
               option(:polling,
-                :long => '--[no-]polling',
+                :long => '--[no-]poll',
                 :description => 'Enable stack event polling.',
                 :boolean => true,
                 :default => true,
-                :proc => lambda {|val| Chef::Config[:knife][:cloudformation][:polling] = val }
+                :proc => lambda {|val| Chef::Config[:knife][:cloudformation][:poll] = val }
               )
               option(:notifications,
                 :long => '--notification ARN',
@@ -158,7 +158,7 @@ class Chef
               valid = false
               until(valid)
                 default = Chef::Config[:knife][:cloudformation][:options][:parameters][k] || v['Default']
-                answer = ui.ask_question("#{k.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')} ", :default => default)
+                answer = ui.ask_question("#{k.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}: ", :default => default)
                 validation = KnifeCloudformation::AwsCommons::Stack::ParameterValidator.validate(answer, v)
                 if(validation == true)
                   Chef::Config[:knife][:cloudformation][:options][:parameters][k] = answer

data/lib/chef/knife/cloudformation_destroy.rb

@@ -6,15 +6,31 @@ class Chef
 
       include KnifeCloudformation::KnifeBase
 
-      banner 'knife cloudformation destroy NAME'
+      banner 'knife cloudformation destroy NAME [NAME]'
+
+      option(:polling,
+        :long => '--[no-]poll',
+        :description => 'Enable stack event polling.',
+        :boolean => true,
+        :default => true,
+        :proc => lambda {|val| Chef::Config[:knife][:cloudformation][:poll] = val }
+      )
 
       def run
-        stack_name = name_args.last
-        ui.warn "Destroying Cloud Formation: #{ui.color(stack_name, :bold)}"
-        ui.confirm 'Destroy this formation'
-        destroy_formation!(stack_name)
-        poll_stack(stack_name)
-        ui.info "  -> Destroyed Cloud Formation: #{ui.color(stack_name, :bold, :red)}"
+        stacks = name_args.sort
+        plural = 's' if stacks.size > 1
+        ui.warn "Destroying Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold)}"
+        ui.confirm "Destroy formation#{plural}"
+        stacks.each do |stack_name|
+          destroy_formation!(stack_name)
+          ui.info "Destroy request sent for stack: #{ui.color(stack_name, :bold)}"
+        end
+        if(config[:polling])
+          stacks.each do |stack_name|
+            poll_stack(stack_name)
+          end
+          ui.info "  -> Destroyed Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold, :red)}"
+        end
       end
 
       def destroy_formation!(stack_name)

data/lib/chef/knife/cloudformation_events.rb

@@ -11,8 +11,10 @@ class Chef
       option(:polling,
         :short => '-p',
         :long => '--[no-]poll',
+        :boolean => true,
+        :default => false,
         :description => 'Poll events while stack status is "in progress"',
-        :proc => lambda {|v| Chef::Config[:knife][:cloudformation][:polling] = v }
+        :proc => lambda {|v| Chef::Config[:knife][:cloudformation][:poll] = v }
       )
 
       option(:attribute,

data/lib/chef/knife/cloudformation_inspect.rb

@@ -26,6 +26,13 @@ class Chef
         }
       )
 
+      option(:nodes,
+        :short => '-N',
+        :long => '--nodes',
+        :boolean => true,
+        :description => 'Display ec2 nodes of stack'
+      )
+
       option(:ssh_user,
         :short => '-x SSH_USER',
         :long => '--ssh-user SSH_USER',
@@ -40,6 +47,17 @@ class Chef
         if(config[:instance_failure])
           do_instance_failure(stack_name)
         end
+        if(config[:nodes])
+          do_node_list(stack_name)
+        end
+      end
+
+      def do_node_list(stack_name)
+        nodes = stack(stack_name).nodes.map do |n|
+          [n.id, n.public_ip_address]
+        end.flatten
+        ui.info "Nodes for stack: #{ui.color(stack_name, :bold)}"
+        ui.info "#{ui.list(nodes, :uneven_columns_across, 2)}"
       end
 
       def do_instance_failure(stack_name)

data/lib/knife-cloudformation/aws_commons/stack.rb

@@ -5,11 +5,18 @@ module KnifeCloudformation
     class Stack
 
       include KnifeCloudformation::Utils::JSON
+      include KnifeCloudformation::Utils::AnimalStrings
 
       attr_reader :name, :raw_stack, :raw_resources, :common
 
       class << self
 
+        ALLOWED_PARAMETER_ATTRIBUTES = %w(
+          Type Default NoEcho AllowedValues AllowedPattern
+          MaxLength MinLength MaxValue MinValue Description
+          ConstraintDescription
+        )
+
         include KnifeCloudformation::Utils::JSON
 
         def create(name, definition, aws_common)
@@ -26,6 +33,7 @@ module KnifeCloudformation
             stack[format_key] = value
           end
           enable_capabilities!(stack, template)
+          clean_parameters!(template)
           stack['TemplateBody'] = _to_json(template)
           stack
         end
@@ -40,13 +48,25 @@ module KnifeCloudformation
           nil
         end
 
+        def clean_parameters!(template)
+          template['Parameters'].each do |name, options|
+            options.delete_if do |attribute, value|
+              !ALLOWED_PARAMETER_ATTRIBUTES.include?(attribute)
+            end
+          end
+        end
+
       end
 
-      def initialize(name, common)
+      def initialize(name, common, raw_stack=nil)
         @name = name
         @common = common
         @memo = {}
-        load_stack
+        if(raw_stack)
+          @raw_stack = raw_stack
+        else
+          load_stack
+        end
         @force_refresh = false
         @force_refresh = in_progress?
       end
@@ -54,11 +74,25 @@ module KnifeCloudformation
       ## Actions ##
 
       def update(definition)
+        if(definition.keys.detect{|k|k.is_a?(Symbol)})
+          definition = format_definition(definition)
+        end
         res = common.aws(:cloud_formation).update_stack(name, definition)
         reload!
         res
       end
 
+      def format_definition(def_hash)
+        new_hash = {}
+        def_hash.each do |k,v|
+          new_hash[camel(k)] = v
+        end
+        if(new_hash['TemplateBody'].is_a?(Hash))
+          new_hash['TemplateBody'] = _to_json(new_hash['TemplateBody'])
+        end
+        new_hash
+      end
+
       def destroy
         res = common.aws(:cloud_formation).delete_stack(name)
         reload!
@@ -66,14 +100,18 @@ module KnifeCloudformation
       end
 
       def load_stack
-        @raw_stack = common.aws(:cloud_formation).describe_stacks('StackName' => name).body['Stacks'].first
+        @raw_stack = common.aws(:cloud_formation)
+          .describe_stacks('StackName' => name)
+          .body['Stacks'].first
       end
 
       def load_resources
-        @raw_resources = common.aws(:cloud_formation).describe_stack_resources('StackName' => name).body['StackResources']
+        @raw_resources = common.aws(:cloud_formation)
+          .describe_stack_resources('StackName' => name)
+          .body['StackResources']
       end
 
-      def refresh?(bool)
+      def refresh?(bool=false)
         bool || (bool.nil? && @force_refresh)
       end
 
@@ -93,7 +131,7 @@ module KnifeCloudformation
 
       def to_hash(extra_data={})
         {
-          :template => template,
+          :template_body => template,
           :parameters => parameters,
           :capabilities => capabilities,
           :disable_rollback => disable_rollback,
@@ -112,15 +150,20 @@ module KnifeCloudformation
         @memo[:template]
       end
 
-      def parameters
-        unless(@memo[:parameters])
-          @memo[:parameters] = Hash[*(
-              @raw_stack['Parameters'].map do |ary|
-                [ary['ParameterKey'], ary['ParameterValue']]
-              end.flatten
-          )]
+      ## Stack metadata ##
+      def parameters(raw=false)
+        if(raw)
+          @raw_stack['Parameters']
+        else
+          unless(@memo[:parameters])
+            @memo[:parameters] = Hash[*(
+                @raw_stack['Parameters'].map do |ary|
+                  [ary['ParameterKey'], ary['ParameterValue']]
+                end.flatten
+            )]
+          end
+          @memo[:parameters]
         end
-        @memo[:parameters]
       end
 
       def capabilities
@@ -135,6 +178,21 @@ module KnifeCloudformation
         @raw_stack['NotificationARNs']
       end
 
+      def timeout_in_minutes
+        @raw_stack['TimeoutInMinutes']
+      end
+      alias_method :timeout_in_minutes, :timeout
+
+      def stack_id
+        @raw_stack['StackId']
+      end
+      alias_method :id, :stack_id
+
+      def creation_time
+        @raw_stack['CreationTime']
+      end
+      alias_method :created_at, :creation_time
+
       def status(force_refresh=nil)
         load_stack if refresh?(force_refresh)
         @raw_stack['StackStatus']
@@ -148,10 +206,11 @@ module KnifeCloudformation
       def events(all=false)
         res = common.aws(:cloud_formation).describe_stack_events(name).body['StackEvents']
         @memo[:events] ||= []
-        res.delete_if{|e| @memo[:events].include?(e['EventId'])}
-        @memo[:events] += res.map{|e| e['EventId']}
+        current = @memo[:events].map{|e| e['EventId']}
+        res.delete_if{|e| current.include?(e['EventId'])}
+        @memo[:events] += res
         @memo[:events].uniq!
-        res
+        all ? @memo[:events] : res
       end
 
       def outputs(style=:unformatted)
@@ -201,19 +260,24 @@ module KnifeCloudformation
 
       def expand_resource(resource)
         kind = resource['ResourceType'].split('::')[1]
-        kind_snake = common.snake(kind)
+        kind_snake = snake(kind)
         aws = common.aws(kind_snake)
-        aws.send("#{common.snake(resource['ResourceType'].split('::').last).to_s.split('_').last}s").get(resource['PhysicalResourceId'])
+        aws.send("#{snake(resource['ResourceType'].split('::').last).to_s.split('_').last}s").get(resource['PhysicalResourceId'])
       end
 
       def nodes
-        as_resources = resources.find_all{|r|r['ResourceType'] == 'AWS::AutoScaling::AutoScalingGroup'}
-        as_resources.map do |as_resource|
-          as_group = expand_resource(as_resource)
-          as_group.instances.map do |inst|
-            common.aws(:ec2).servers.get(inst.id)
-          end
-        end.flatten
+        reload! if refresh?
+        unless(@memo[:nodes])
+          as_resources = resources.find_all{|r|r['ResourceType'] == 'AWS::AutoScaling::AutoScalingGroup'}
+          @memo[:nodes] =
+            as_resources.map do |as_resource|
+            as_group = expand_resource(as_resource)
+            as_group.instances.map do |inst|
+              common.aws(:ec2).servers.get(inst.id)
+            end
+          end.flatten
+        end
+        @memo[:nodes]
       end
 
     end

data/lib/knife-cloudformation/aws_commons/stack_parameter_validator.rb

@@ -11,6 +11,7 @@ module KnifeCloudformation
           include KnifeCloudformation::Utils::AnimalStrings
 
           def validate(value, parameter_definition)
+            return [[:blank, 'Value cannot be blank']] if value.to_s.strip.empty?
             result = %w(AllowedValues AllowedPattern MaxLength MinLength MaxValue MinValue).map do |key|
               if(parameter_definition[key])
                 res = self.send(snake(key), value, parameter_definition)

data/lib/knife-cloudformation/aws_commons.rb

@@ -23,12 +23,25 @@ module KnifeCloudformation
       }
     end
 
+    def clear_cache(*types)
+      keys = types.empty? ? @memo.keys : types.map(&:to_sym)
+      keys.each do |key|
+        @memo[key].clear if @memo[key]
+      end
+      true
+    end
+
     def build_connection(type)
       type = type.to_sym
       type = FOG_MAP[type] if FOG_MAP[type]
       unless(@connections[type])
-        if(type == :compute)
+        case type
+        when :compute
           @connections[:compute] = Fog::Compute::AWS.new(@creds)
+        when :dns
+          dns_creds = @creds.dup
+          dns_creds.delete(:region) || dns_creds.delete('region')
+          @connections[:dns] = Fog::DNS::AWS.new(dns_creds)
         else
           Fog.credentials = Fog.symbolize_credentials(@creds)
           @connections[type] = Fog::AWS[type]
@@ -69,11 +82,44 @@ module KnifeCloudformation
       @memo[:stack_list][key]
     end
 
-    def stack(name)
-      unless(@memo[:stacks][name])
-        @memo[:stacks][name] = Stack.new(name, self)
+    def name_from_stack_id(name)
+      found = stacks.detect do |s|
+        s['StackId'] == name
+      end
+      if(found)
+        s['StackName']
+      else
+        raise "Failed to locate stack with ID: #{name}"
+      end
+    end
+
+    def stack(*names)
+      names = names.map do |name|
+        if(name.start_with?('arn:'))
+          name_from_stack_id(name)
+        else
+          name
+        end
+      end
+      if(names.size == 1)
+        name = names.first
+        unless(@memo[:stacks][name])
+          @memo[:stacks][name] = Stack.new(name, self)
+        end
+        @memo[:stacks][name]
+      else
+        to_fetch = names - @memo[:stacks].keys
+        slim_stacks = {}
+        unless(to_fetch.empty?)
+          to_fetch.each do |name|
+            slim_stacks[name] = Stack.new(name, self, stacks.detect{|s| s['StackName'] == name})
+          end
+        end
+        result = names.map do |n|
+          @memo[:stacks][n] || slim_stacks[n]
+        end
+        result
       end
-      @memo[:stacks][name]
     end
 
     def create_stack(name, definition)

data/lib/knife-cloudformation/version.rb

@@ -2,5 +2,5 @@ module KnifeCloudformation
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('0.1.4')
+  VERSION = Version.new('0.1.6')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attribute_struct
   requirement: !ruby/object:Gem::Requirement