knife-cloudformation 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a445d83a052179cb88558b3f2b1a159a9c3c6f
-  data.tar.gz: e097d47c746572b17f0015be0570754816f83bc6
+  metadata.gz: 23cf366cd18f3224855b2d3e09863a0695dbb7eb
+  data.tar.gz: 2e0f8941b6131cdfcc5eadbcb9f50681b8d0119d
 SHA512:
-  metadata.gz: cb4823fea15e14b41b321f56606788050a2f8b61cc482c9a2637ad49a60da9f4ca0f4245a798c4762318c28b315af70ea189b7e9ff4f64dc3798c2609b231344
-  data.tar.gz: a2ded11aad1e6847373b48ed92f21aacb4c357324ff2789538a84ee3eafe044054eccca83404a0d4cc0389fdb9aa9b505a7f0b9cb5038794f9c1946e726cdbec
+  metadata.gz: e69f7ec1cab91bcf3805ac23771a9162e41bd3b52fe921992821af2bd256043e1edafd8c422a338c8a05966de2e743152d1c06a260e29d36401fa0aa52180f43
+  data.tar.gz: 7c0de5e87fc4c5631037dc1a115dd3ca3dac39c89836e5664c9df5edfac2f92705b6a776c6f4a6d0178adf98699663f7145f28fb511f39f328969959efb4f7ea

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.2.12
+* Use template to provide logical parameter ordering on stack update
+* Only set parameters when not the default template value
+* Do not save nested stacks to remote bucket when in print-only mode
+* Add initial support for un-nested stack create and update
+* Fix nested stack flagging usage
+
 ## v0.2.10
 * Add initial nested stack support
 

data/lib/chef/knife/cloudformation_create.rb

@@ -71,6 +71,7 @@ class Chef
           file = Chef::Config[:knife][:cloudformation][:template]
         else
           file = load_template_file
+          nested_stacks = file.delete('sfn_nested_stack')
         end
         ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('create', :green)}"
         stack_info = "#{ui.color('Name:', :bold)} #{name}"
@@ -85,30 +86,39 @@ class Chef
           ui.info "  -> #{stack_info}"
         end
 
-        stack = provider.connection.stacks.build(
-          Chef::Config[:knife][:cloudformation][:options].dup.merge(
-            :name => name,
-            :template => file
+        if(nested_stacks)
+
+          if(config[:print_only])
+            ui.info _format_json(translate_template(file))
+            exit 0
+          end
+
+          unpack_nesting(name, file, :create)
+
+        else
+
+          stack = provider.connection.stacks.build(
+            Chef::Config[:knife][:cloudformation][:options].dup.merge(
+              :name => name,
+              :template => file
+            )
           )
-        )
 
-        apply_stacks!(stack)
-        stack.template = KnifeCloudformation::Utils::StackParameterScrubber.scrub!(stack.template)
+          apply_stacks!(stack)
+          stack.template = KnifeCloudformation::Utils::StackParameterScrubber.scrub!(stack.template)
 
-        if(config[:print_only])
-          ui.info _format_json(translate_template(stack.template))
-          exit 0
-        end
+          if(config[:print_only])
+            ui.info _format_json(translate_template(stack.template))
+            exit 0
+          end
 
-        # TODO: if nested stacks and not extracted (based on config
-        # option, break resources out and iterate each stack and use
-        # apply-stack as we iterate the list
+          populate_parameters!(stack.template)
+          stack.parameters = Chef::Config[:knife][:cloudformation][:options][:parameters]
 
-        populate_parameters!(stack.template)
-        stack.parameters = Chef::Config[:knife][:cloudformation][:options][:parameters]
+          stack.template = translate_template(stack.template)
+          stack.save
 
-        stack.template = translate_template(stack.template)
-        stack.save
+        end
 
         if(Chef::Config[:knife][:cloudformation][:poll])
           poll_stack(stack.name)

data/lib/chef/knife/cloudformation_update.rb

@@ -37,56 +37,82 @@ class Chef
           exit 1
         end
 
-        stack = provider.connection.stacks.get(name)
+        stack_info = "#{ui.color('Name:', :bold)} #{name}"
 
-        if(stack)
-          ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('update', :green)}"
-          stack_info = "#{ui.color('Name:', :bold)} #{name}"
+        if(Chef::Config[:knife][:cloudformation][:file])
+          file = load_template_file
+          stack_info << " #{ui.color('Path:', :bold)} #{Chef::Config[:knife][:cloudformation][:file]}"
+          nested_stacks = file.delete('sfn_nested_stack')
+        end
 
-          if(Chef::Config[:knife][:cloudformation][:file])
-            file = load_template_file
-            stack_info << " #{ui.color('Path:', :bold)} #{Chef::Config[:knife][:cloudformation][:file]}"
-          else
-            stack_info << " #{ui.color('(no temlate update)', :yellow)}"
-          end
-          ui.info "  -> #{stack_info}"
+        if(nested_stacks)
 
-          apply_stacks!(stack)
+          unpack_nesting(name, file, :update)
 
-          if(file)
-            stack_parameters_update!(stack)
-            stack.template = translate_template(file)
-            stack.parameters = Chef::Config[:knife][:cloudformation][:parameters]
-          else
-            stack_parameters_update!(stack)
-          end
+        else
+          stack = provider.connection.stacks.get(name)
+
+          if(stack)
+            ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('update', :green)}"
+
+            unless(file)
+              if(Chef::Config[:knife][:cloudformation][:template])
+                file = Chef::Config[:knife][:cloudformation][:template]
+                stack_info << " #{ui.color('(template provided)', :green)}"
+              else
+                stack_info << " #{ui.color('(no template update)', :yellow)}"
+              end
+            end
+            ui.info "  -> #{stack_info}"
+
+            apply_stacks!(stack)
+
+            if(file)
+              populate_parameters!(file, stack.parameters)
+              stack.template = translate_template(file)
+              stack.parameters = Chef::Config[:knife][:cloudformation][:parameters]
+              stack.template = KnifeCloudformation::Utils::StackParameterScrubber.scrub!(stack.template)
+            else
+              populate_parameters!(stack.template, stack.parameters)
+              stack.parameters = Chef::Config[:knife][:cloudformation][:parameters]
+            end
 
-          stack.save
+            begin
+              stack.save
+            rescue Miasma::Error::ApiError::RequestError => e
+              if(e.message.downcase.include?('no updates')) # :'(
+                ui.warn "No updates detected for stack (#{stack.name})"
+              else
+                raise
+              end
+            end
 
-          if(Chef::Config[:knife][:cloudformation][:poll])
-            poll_stack(stack.name)
-            if(stack.success?)
-              ui.info "Stack update 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
+            if(Chef::Config[:knife][:cloudformation][:poll])
+              poll_stack(stack.name)
+              if(stack.success?)
+                ui.info "Stack update 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 "Update of 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.fatal "Update of 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
+              ui.warn 'Stack state polling has been disabled.'
+              ui.info "Stack update initialized for #{ui.color(name, :green)}"
             end
           else
-            ui.warn 'Stack state polling has been disabled.'
-            ui.info "Stack update initialized for #{ui.color(name, :green)}"
+            ui.fatal "Failed to locate requested stack: #{ui.color(name, :red, :bold)}"
+            exit -1
           end
-        else
-          ui.fatal "Failed to locate requested stack: #{ui.color(name, :red, :bold)}"
-          exit -1
+
         end
       end
 
@@ -116,7 +142,7 @@ class Chef
           remote_stack = provider.connection.stacks.get(stack_name)
           if(remote_stack)
             remote_stack.parameters.each do |key, value|
-              next if Chef::Config[:knife][:cloudformation][:stacks][:ignore_parameters].include?(key)
+              next if Chef::Config[:knife][:cloudformation].fetch(:stacks, {}).fetch(:ignore_parameters, []).include?(key)
               if(stack.parameters.has_key?(key))
                 stack.parameters[key] = value
               end
@@ -129,17 +155,6 @@ class Chef
         stack
       end
 
-      # Update parameters within existing stack
-      #
-      # @param stack [Miasma::Models::Orchestration::Stack]
-      # @return [Miasma::Models::Orchestration::Stack]
-      def stack_parameters_update!(stack)
-        stack.parameters.each do |key, value|
-          answer = ui.ask_question("#{key.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}: ", :default => value)
-          stack.parameters[key] = answer
-        end
-      end
-
     end
   end
 end

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

@@ -11,25 +11,66 @@ module KnifeCloudformation
         # maximum number of attempts to get valid parameter value
         MAX_PARAMETER_ATTEMPTS = 5
 
+        # Unpack nested stack and run action on each stack, applying
+        # the previous stacks automatically
+        #
+        # @param name [String] container stack name
+        # @param file [Hash] stack template
+        # @param action [String] create or update
+        # @return [TrueClass]
+        def unpack_nesting(name, file, action)
+
+          # @todo move this init into setup
+          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]
+
+          file['Resources'].each do |stack_resource_name, stack_resource|
+
+            nested_stack_name = "#{name}-#{stack_resource_name}"
+            nested_stack_template = stack_resource['Properties']['Stack']
+            Chef::Config[:knife][:cloudformation][:options][:parameters] = orig_params
+
+            klass = Chef::Knife.const_get("Cloudformation#{action.to_s.capitalize}")
+            nested_stack_runner = klass.new
+            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!
+            Chef::Config[:knife][:cloudformation][:template] = nil
+            provider.connection.stacks.reload
+
+          end
+
+          true
+        end
+
         # Prompt for parameter values and store result
         #
         # @param stack [Hash] stack template
         # @return [Hash]
-        def populate_parameters!(stack)
+        def populate_parameters!(stack, current_params={})
           if(Chef::Config[:knife][:cloudformation][:interactive_parameters])
-            if(stack['Parameters'] || stack['parameters'])
+            if(stack['Parameters'])
               Chef::Config[:knife][:cloudformation][:options][:parameters] ||= Mash.new
-              stack.fetch('Parameters', stack.fetch('parameters', {})).each do |k,v|
+              stack.fetch('Parameters', {}).each do |k,v|
                 next if Chef::Config[:knife][:cloudformation][:options][:parameters][k]
                 attempt = 0
                 valid = false
                 until(valid)
                   attempt += 1
-                  default = Chef::Config[:knife][:cloudformation][:options][:parameters][k] || v['Default'] || v['default']
+                  default = Chef::Config[:knife][:cloudformation][:options][:parameters].fetch(
+                    k, current_params.fetch(
+                      k, v['Default']
+                    )
+                  )
                   answer = ui.ask_question("#{k.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}: ", :default => default)
                   validation = KnifeCloudformation::Utils::StackParameterValidator.validate(answer, v)
                   if(validation == true)
-                    Chef::Config[:knife][:cloudformation][:options][:parameters][k] = answer
+                    unless(answer == default)
+                      Chef::Config[:knife][:cloudformation][:options][:parameters][k] = answer
+                    end
                     valid = true
                   else
                     validation.each do |validation_error|

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

@@ -30,27 +30,31 @@ module KnifeCloudformation
           elsif(Chef::Config[:knife][:cloudformation][:file])
             if(Chef::Config[:knife][:cloudformation][:processing])
               sf = SparkleFormation.compile(Chef::Config[:knife][:cloudformation][:file], :sparkle)
+              if(sf.nested? && !sf.isolated_nests?)
+                raise TypeError.new('Template does not contain isolated stack nesting! Cannot process in existing state.')
+              end
               if(sf.nested? && Chef::Config[:knife][:cloudformation][:apply_nesting])
                 sf.apply_nesting do |stack_name, stack_definition|
                   bucket = provider.connection.api_for(:storage).buckets.get(
                     Chef::Config[:knife][:cloudformation][:nesting_bucket]
                   )
-                  unless(bucket)
-                    raise "Failed to locate configured bucket for stack template storage (#{bucket})!"
+                  if(options[:print_only])
+                    "http://example.com/bucket/#{name_args.first}_#{stack_name}.json"
+                  else
+                    unless(bucket)
+                      raise "Failed to locate configured bucket for stack template storage (#{bucket})!"
+                    end
+                    file = bucket.files.build
+                    file.name = "#{name_args.first}_#{stack_name}.json"
+                    file.content_type = 'text/json'
+                    file.body = MultiJson.dump(KnifeCloudformation::Utils::StackParameterScrubber.scrub!(stack_definition))
+                    file.save
+                    # TODO: what if we need extra params?
+                    url = URI.parse(file.url)
+                    "#{url.scheme}://#{url.host}#{url.path}"
                   end
-                  file = bucket.files.build
-                  file.name = "#{name_args.first}_#{stack_name}.json"
-                  file.content_type = 'text/json'
-                  file.body = MultiJson.dump(KnifeCloudformation::Utils::StackParameterScrubber.scrub!(stack_definition))
-                  file.save
-                  # TODO: what if we need extra params?
-                  url = URI.parse(file.url)
-                  "#{url.scheme}://#{url.host}#{url.path}"
-                end
+                end.merge('sfn_nested_stack' => !!sf.nested?)
               else
-                if(sf.nested? && !sf.isolated_nests?)
-                  raise TypeError.new('Template does not contain isolated stack nesting! Cannot process in existing state.')
-                end
                 sf.dump
               end
             else

data/lib/knife-cloudformation/version.rb

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

metadata

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