knife-cloudformation 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23cf366cd18f3224855b2d3e09863a0695dbb7eb
-  data.tar.gz: 2e0f8941b6131cdfcc5eadbcb9f50681b8d0119d
+  metadata.gz: b30587ee32086876e78507495f1b16ceff7313c0
+  data.tar.gz: 996465e857261b97b0e5c095793a77a8f95058f1
 SHA512:
-  metadata.gz: e69f7ec1cab91bcf3805ac23771a9162e41bd3b52fe921992821af2bd256043e1edafd8c422a338c8a05966de2e743152d1c06a260e29d36401fa0aa52180f43
-  data.tar.gz: 7c0de5e87fc4c5631037dc1a115dd3ca3dac39c89836e5664c9df5edfac2f92705b6a776c6f4a6d0178adf98699663f7145f28fb511f39f328969959efb4f7ea
+  metadata.gz: bcdf25a7f2ff0749235cf6069c3614e4e01a39464be4d403f64ef886f07c3e060d0930516a99ad24f59c9f6ea1b5971457d69dbfcdc845d016495dbee1e74489
+  data.tar.gz: d91141b3eecffb0a776090e52b88ced51fd87a9bf515763635e11cbdd0a307e4d19b595b2e948626a265bb0d5cbc4e4b2100f0bb60440632e0a37555a41e7974

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.2.14
+* Pass command configuration through when unpacking
+* Force stack list reload prior to polling to prevent lookup errors
+* Add glob support on name arguments provided for `destroy`
+* Add unpacked stack support to `--apply-stack` flag
+* Retry events polling when started from different command
+
 ## v0.2.12
 * Use template to provide logical parameter ordering on stack update
 * Only set parameters when not the default template value

data/lib/chef/knife/cloudformation_create.rb

@@ -71,7 +71,7 @@ class Chef
           file = Chef::Config[:knife][:cloudformation][:template]
         else
           file = load_template_file
-          nested_stacks = file.delete('sfn_nested_stack')
+          nested_stacks_unpack = file.delete('sfn_nested_stack')
         end
         ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('create', :green)}"
         stack_info = "#{ui.color('Name:', :bold)} #{name}"
@@ -86,12 +86,7 @@ class Chef
           ui.info "  -> #{stack_info}"
         end
 
-        if(nested_stacks)
-
-          if(config[:print_only])
-            ui.info _format_json(translate_template(file))
-            exit 0
-          end
+        if(nested_stacks_unpack)
 
           unpack_nesting(name, file, :create)
 
@@ -109,7 +104,7 @@ class Chef
 
           if(config[:print_only])
             ui.info _format_json(translate_template(stack.template))
-            exit 0
+            return
           end
 
           populate_parameters!(stack.template)
@@ -120,48 +115,31 @@ class Chef
 
         end
 
-        if(Chef::Config[:knife][:cloudformation][:poll])
-          poll_stack(stack.name)
-          stack = provider.connection.stacks.get(name)
-
-          if(stack.reload.success?)
-            ui.info "Stack create complete: #{ui.color('SUCCESS', :green)}"
-            knife_output = Chef::Knife::CloudformationDescribe.new
-            knife_output.name_args.push(name)
-            knife_output.config[:outputs] = true
-            knife_output.run
-          else
-            ui.fatal "Create of new stack #{ui.color(name, :bold)}: #{ui.color('FAILED', :red, :bold)}"
-            ui.info ""
-            knife_inspect = Chef::Knife::CloudformationInspect.new
-            knife_inspect.name_args.push(name)
-            knife_inspect.config[:instance_failure] = true
-            knife_inspect.run
-            exit 1
-          end
-        else
-          ui.warn 'Stack state polling has been disabled.'
-          ui.info "Stack creation initialized for #{ui.color(name, :green)}"
-        end
-      end
-
-      # Apply any defined remote stacks
-      #
-      # @param stack [Miasma::Models::Orchestration::Stack]
-      # @return [Miasma::Models::Orchestration::Stack]
-      def apply_stacks!(stack)
-        remote_stacks = Chef::Config[:knife][:cloudformation].
-          fetch(:create, {}).fetch(:apply_stacks, [])
-        remote_stacks.each do |stack_name|
-          remote_stack = provider.connection.stacks.get(stack_name)
-          if(remote_stack)
-            stack.apply_stack(remote_stack)
+        if(stack)
+          if(Chef::Config[:knife][:cloudformation][:poll])
+            poll_stack(stack.name)
+            stack = provider.connection.stacks.get(name)
+
+            if(stack.reload.success?)
+              ui.info "Stack create complete: #{ui.color('SUCCESS', :green)}"
+              knife_output = Chef::Knife::CloudformationDescribe.new
+              knife_output.name_args.push(name)
+              knife_output.config[:outputs] = true
+              knife_output.run
+            else
+              ui.fatal "Create of new stack #{ui.color(name, :bold)}: #{ui.color('FAILED', :red, :bold)}"
+              ui.info ""
+              knife_inspect = Chef::Knife::CloudformationInspect.new
+              knife_inspect.name_args.push(name)
+              knife_inspect.config[:instance_failure] = true
+              knife_inspect.run
+              exit 1
+            end
           else
-            ui.error "Failed to apply requested stack. Unable to locate. (#{stack_name})"
-            exit 1
+            ui.warn 'Stack state polling has been disabled.'
+            ui.info "Stack creation initialized for #{ui.color(name, :green)}"
           end
         end
-        stack
       end
 
     end

data/lib/chef/knife/cloudformation_destroy.rb

@@ -21,6 +21,19 @@ class Chef
       def _run
         stacks = name_args.sort
         plural = 's' if stacks.size > 1
+        globs = stacks.find_all do |s|
+          s !~ /^[a-zA-Z0-9-]+$/
+        end
+        unless(globs.empty?)
+          glob_stacks = provider.connection.stacks.all.find_all do |remote_stack|
+            globs.detect do |glob|
+              File.fnmatch(glob, remote_stack.name)
+            end
+          end
+          stacks += glob_stacks.map(&:name)
+          stacks -= globs
+          stacks.sort!
+        end
         ui.warn "Destroying Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold)}"
         ui.confirm "Destroy formation#{plural}"
         stacks.each do |stack_name|

data/lib/chef/knife/cloudformation_update.rb

@@ -122,6 +122,7 @@ class Chef
       # @param template [Hash] stack template
       # @param stack [Fog::Orchestration::Stack]
       # @return [Hash]
+      # @todo to be scrubbed
       def redefault_stack_parameters(template, stack)
         stack.parameters.each do |key, value|
           if(template['Parameters'][key])
@@ -131,30 +132,6 @@ class Chef
         template
       end
 
-      # Apply any defined remote stacks
-      #
-      # @param stack [Miasma::Models::Orchestration::Stack]
-      # @return [Miasma::Models::Orchestration::Stack]
-      def apply_stacks!(stack)
-        remote_stacks = Chef::Config[:knife][:cloudformation].
-          fetch(:update, {}).fetch(:apply_stacks, [])
-        remote_stacks.each do |stack_name|
-          remote_stack = provider.connection.stacks.get(stack_name)
-          if(remote_stack)
-            remote_stack.parameters.each do |key, value|
-              next if Chef::Config[:knife][:cloudformation].fetch(:stacks, {}).fetch(:ignore_parameters, []).include?(key)
-              if(stack.parameters.has_key?(key))
-                stack.parameters[key] = value
-              end
-            end
-          else
-            ui.error "Failed to apply requested stack. Unable to locate. (#{stack_name})"
-            exit 1
-          end
-        end
-        stack
-      end
-
     end
   end
 end

data/lib/knife-cloudformation/knife/base.rb

@@ -60,10 +60,23 @@ module KnifeCloudformation
         #
         # @param name [String] name of stack
         def poll_stack(name)
-          knife_events = Chef::Knife::CloudformationEvents.new
-          knife_events.name_args.push(name)
-          Chef::Config[:knife][:cloudformation][:poll] = true
-          knife_events.run
+          retry_attempts = 0
+          begin
+            provider.connection.stacks.reload
+            knife_events = Chef::Knife::CloudformationEvents.new
+            knife_events.name_args.push(name)
+            Chef::Config[:knife][:cloudformation][:poll] = true
+            knife_events.run
+          rescue => e
+            if(retry_attempts < Chef::Config[:knife][:cloudformation].fetch(:max_poll_retries, 5))
+              retry_attempts += 1
+              warn "Unexpected error encountered (#{e.class}: #{e}) Retrying [retry count: #{retry_attempts}]"
+              sleep(1)
+              retry
+            else
+              raise
+            end
+          end
         end
 
         # Wrapper for information retrieval. Provides consistent error

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

@@ -8,9 +8,49 @@ module KnifeCloudformation
 
       module InstanceMethods
 
+        # un-packed stack name joiner/identifier
+        UNPACK_NAME_JOINER = '-sfn-'
         # maximum number of attempts to get valid parameter value
         MAX_PARAMETER_ATTEMPTS = 5
 
+        # Apply any defined remote stacks
+        #
+        # @param stack [Miasma::Models::Orchestration::Stack]
+        # @return [Miasma::Models::Orchestration::Stack]
+        def apply_stacks!(stack)
+          action = self.class.name.downcase.end_with?('create') ? :create : :update
+          remote_stacks = Chef::Config[:knife][:cloudformation].
+            fetch(action, {}).fetch(:apply_stacks, [])
+          remote_stacks.each do |stack_name|
+            remote_stack = provider.connection.stacks.get(stack_name)
+            if(remote_stack)
+              stack.apply_stack(remote_stack)
+            else
+              apply_unpacked_stack!(stack_name, stack)
+            end
+          end
+          stack
+        end
+
+        # Apply all stacks from an unpacked stack
+        #
+        # @param stack_name [String] name of parent stack
+        # @param stack [Miasma::Models::Orchestration::Stack]
+        # @return [Miasma::Models::Orchestration::Stack]
+        def apply_unpacked_stack!(stack_name, stack)
+          result = provider.connection.stacks.all.find_all do |remote_stack|
+            remote_stack.name.start_with?("#{stack_name}#{UNPACK_NAME_JOINER}")
+          end.sort_by(&:name).map do |remote_stack|
+            stack.apply_stack(remote_stack)
+          end
+          unless(result.empty?)
+            stack
+          else
+            ui.error "Failed to apply requested stack. Unable to locate. (#{stack_name})"
+            exit 1
+          end
+        end
+
         # Unpack nested stack and run action on each stack, applying
         # the previous stacks automatically
         #
@@ -24,20 +64,24 @@ module KnifeCloudformation
           Chef::Config[:knife][:cloudformation][action.to_sym] ||= Mash.new
           Chef::Config[:knife][:cloudformation][action.to_sym][:apply_stacks] ||= []
 
-          orig_params = Chef::Config[:knife][:cloudformation][:options][:parameters]
+          orig_options = Chef::Config[:knife][:cloudformation][:options].dup
+          stack_count = 0
 
           file['Resources'].each do |stack_resource_name, stack_resource|
 
-            nested_stack_name = "#{name}-#{stack_resource_name}"
+            nested_stack_name = "#{name}#{UNPACK_NAME_JOINER}#{stack_count}-#{stack_resource_name}"
             nested_stack_template = stack_resource['Properties']['Stack']
-            Chef::Config[:knife][:cloudformation][:options][:parameters] = orig_params
+            Chef::Config[:knife][:cloudformation][:options] = orig_options.dup
 
             klass = Chef::Knife.const_get("Cloudformation#{action.to_s.capitalize}")
             nested_stack_runner = klass.new
+            nested_stack_runner.config = config.dup
             nested_stack_runner.name_args.push(nested_stack_name)
             Chef::Config[:knife][:cloudformation][:template] = nested_stack_template
             nested_stack_runner.run
-            Chef::Config[:knife][:cloudformation][action.to_sym][:apply_stacks].push(nested_stack_name).uniq!
+            unless(config[:print_only])
+              Chef::Config[:knife][:cloudformation][action.to_sym][:apply_stacks].push(nested_stack_name).uniq!
+            end
             Chef::Config[:knife][:cloudformation][:template] = nil
             provider.connection.stacks.reload
 

data/lib/knife-cloudformation/knife/template.rb

@@ -53,9 +53,9 @@ module KnifeCloudformation
                     url = URI.parse(file.url)
                     "#{url.scheme}://#{url.host}#{url.path}"
                   end
-                end.merge('sfn_nested_stack' => !!sf.nested?)
+                end
               else
-                sf.dump
+                sf.dump.merge('sfn_nested_stack' => !!sf.nested?)
               end
             else
               _from_json(File.read(Chef::Config[:knife][:cloudformation][:file]))

data/lib/knife-cloudformation/version.rb

@@ -1,4 +1,4 @@
 module KnifeCloudformation
   # Current library version
-  VERSION = Gem::Version.new('0.2.12')
+  VERSION = Gem::Version.new('0.2.14')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef