knife-cloudformation 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b24aa4ad8bd90e9b02f130ee8dc992e657ce1b
-  data.tar.gz: c1916b7656ed73950454349fb236407c94805013
+  metadata.gz: 83a445d83a052179cb88558b3f2b1a159a9c3c6f
+  data.tar.gz: e097d47c746572b17f0015be0570754816f83bc6
 SHA512:
-  metadata.gz: b3927c0adb0eac79ce40f4468361814cc3cd22d7e50c5003f646164576e12a4180b480a0b3dc7eabd7ee2bc62a44a99234236f78b6e301d733834dbfcc93469f
-  data.tar.gz: dda8df44d640cb443a66e9757b0535d59d1d164bf3d33306b237063208b34ab9041cda45ca82ad160b311300cc4312080558a7855ada16d277b32fac2ab2d955
+  metadata.gz: cb4823fea15e14b41b321f56606788050a2f8b61cc482c9a2637ad49a60da9f4ca0f4245a798c4762318c28b315af70ea189b7e9ff4f64dc3798c2609b231344
+  data.tar.gz: a2ded11aad1e6847373b48ed92f21aacb4c357324ff2789538a84ee3eafe044054eccca83404a0d4cc0389fdb9aa9b505a7f0b9cb5038794f9c1946e726cdbec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.10
+* Add initial nested stack support
+
 ## v0.2.8
 * Update stack lookup implementation to make faster from CLI
 * Prevent constant error on exception when Redis is not in use

data/LICENSE

@@ -0,0 +1,13 @@
+   Copyright 2014 Heavy Water Operations LLC.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/knife-cloudformation.gemspec

@@ -5,13 +5,14 @@ Gem::Specification.new do |s|
   s.version = KnifeCloudformation::VERSION.version
   s.summary = 'Knife tooling for Cloud Formation'
   s.author = 'Chris Roberts'
-  s.email = 'chrisroberts.code@gmail.com'
-  s.homepage = 'http://github.com/heavywater/knife-cloudformation'
+  s.email = 'code@chrisroberts.org'
+  s.homepage = 'http://github.com/hw-labs/knife-cloudformation'
   s.description = 'Knife tooling for Cloud Formation'
+  s.license = 'Apache-2.0'
   s.require_path = 'lib'
   s.add_dependency 'chef'
   s.add_dependency 'miasma'
   s.add_dependency 'net-ssh'
   s.add_dependency 'sparkle_formation', '~> 0.2.0'
-  s.files = Dir['lib/**/*'] + %w(knife-cloudformation.gemspec README.md CHANGELOG.md)
+  s.files = Dir['lib/**/*'] + %w(knife-cloudformation.gemspec README.md CHANGELOG.md LICENSE)
 end

data/lib/chef/knife/cloudformation_create.rb

@@ -100,6 +100,10 @@ class Chef
           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]
 

data/lib/chef/knife/cloudformation_destroy.rb

@@ -26,6 +26,7 @@ class Chef
         stacks.each do |stack_name|
           stack = provider.connection.stacks.get(stack_name)
           if(stack)
+            nested_stack_cleanup!(stack)
             stack.destroy
           else
             ui.warn "Failed to locate requested stack: #{ui.color(stack_name, :bold)}"
@@ -41,6 +42,30 @@ class Chef
         ui.info "  -> Destroyed Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold, :red)}"
       end
 
+      # Cleanup persisted templates if nested stack resources are included
+      def nested_stack_cleanup!(stack)
+        nest_stacks = stack.template.fetch('Resources', {}).values.find_all do |resource|
+          resource['Type'] == 'AWS::CloudFormation::Stack'
+        end.each do |resource|
+          url = resource['Properties']['TemplateURL']
+          if(url)
+            _, bucket_name, path = URI.parse(url).path.split('/', 3)
+            bucket = provider.connection.api_for(:storage).buckets.get(bucket_name)
+            if(bucket)
+              file = bucket.files.get(path)
+              if(file)
+                file.destroy
+                ui.info "Deleted nested stack template! (Bucket: #{bucket_name} Template: #{path})"
+              else
+                ui.warn "Failed to locate template file within bucket for deletion! (#{path})"
+              end
+            else
+              ui.warn "Failed to locate bucket containing template file for deletion! (#{bucket_name})"
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/chef/knife/cloudformation_events.rb

@@ -56,13 +56,27 @@ class Chef
             cycle_events = true
             while(cycle_events)
               cycle_events = stack.in_progress?
-              sleep(Chef::Config[:knife][:cloudformation][:poll_delay] || 15)
+              sleep(Chef::Config[:knife][:cloudformation][:poll_delay] || 10)
               stack.events.reload
               events = get_events(stack, last_id)
               unless(events.empty?)
                 last_id = events.last[:id]
                 things_output(nil, events, 'events', :no_title, :ignore_empty_output)
               end
+              nest_stacks = stack.resources.all.find_all do |resource|
+                resource.state.to_s.end_with?('in_progress') &&
+                  resource.type == 'AWS::CloudFormation::Stack'
+              end
+              if(nest_stacks)
+                nest_stacks.each do |nest_stack|
+                  begin
+                    poll_stack(nest_stack.id)
+                    ui.info "Complete event listing for nested stack (#{nest_stack.name})"
+                  rescue => e
+                    ui.warn "Error encountered on event listing for nested stack - #{e} (#{nest_stack.name})"
+                  end
+                end
+              end
               stack.reload
             end
             # Extra to see completion
@@ -70,7 +84,7 @@ class Chef
           end
         else
           ui.fatal "Failed to locate requested stack: #{ui.color(name, :bold, :red)}"
-          exit -1
+          raise "Failed to locate stack: #{name}!"
         end
       end
 

data/lib/chef/knife/cloudformation_update.rb

@@ -41,10 +41,10 @@ class Chef
 
         if(stack)
           ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('update', :green)}"
-          file = load_template_file(:allow_missing)
           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]}"
           else
             stack_info << " #{ui.color('(no temlate update)', :yellow)}"
@@ -54,10 +54,8 @@ class Chef
           apply_stacks!(stack)
 
           if(file)
-            redefault_stack_parameters(file, stack)
-            populate_parameters!(file)
-            file = translate_template(file)
-            stack.template = file
+            stack_parameters_update!(stack)
+            stack.template = translate_template(file)
             stack.parameters = Chef::Config[:knife][:cloudformation][:parameters]
           else
             stack_parameters_update!(stack)

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

@@ -138,7 +138,7 @@ module KnifeCloudformation
               Chef::Config[:knife][:cloudformation][:credentials] ||= Mash.new
               Chef::Config[:knife][:cloudformation][:options] ||= Mash.new
               Chef::Config[:knife][:cloudformation][:ignore_parameters] = []
-              %w(poll interactive_parameters).each do |key|
+              %w(poll interactive_parameters apply_nesting).each do |key|
                 if(Chef::Config[:knife][:cloudformation][key].nil?)
                   Chef::Config[:knife][:cloudformation][key] = true
                 end

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

@@ -29,7 +29,30 @@ module KnifeCloudformation
             Chef::Config[:knife][:cloudformation][:template]
           elsif(Chef::Config[:knife][:cloudformation][:file])
             if(Chef::Config[:knife][:cloudformation][:processing])
-              SparkleFormation.compile(Chef::Config[:knife][:cloudformation][:file])
+              sf = SparkleFormation.compile(Chef::Config[:knife][:cloudformation][:file], :sparkle)
+              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})!"
+                  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
+              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
               _from_json(File.read(Chef::Config[:knife][:cloudformation][:file]))
             end
@@ -162,6 +185,18 @@ module KnifeCloudformation
             :description => 'Chunk length for serialization',
             :proc => lambda {|val| Chef::Config[:knife][:cloudformation][:translate_chunk_size] = val}
           )
+          option(:apply_nesting,
+            :long => '--[no-]apply-nesting',
+            :description => 'Apply stack nesting',
+            :default => false,
+            :boolean => true,
+            :proc => lambda{|val| Chef::Config[:knife][:cloudformation][:apply_nesting] = val}
+          )
+          option(:nesting_bucket,
+            :long => '--nesting-bucket',
+            :description => 'Bucket to use for storing nested stack templates',
+            :proc => lambda{|val| Chef::Config[:knife][:cloudformation][:nesting_bucket] = val}
+          )
 
           Chef::Config[:knife][:cloudformation][:file_path_prompt] = true
 

data/lib/knife-cloudformation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -67,12 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: Knife tooling for Cloud Formation
-email: chrisroberts.code@gmail.com
+email: code@chrisroberts.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE
 - README.md
 - knife-cloudformation.gemspec
 - lib/chef/knife/cloudformation_create.rb
@@ -107,8 +108,9 @@ files:
 - lib/knife-cloudformation/utils/stack_parameter_scrubber.rb
 - lib/knife-cloudformation/utils/stack_parameter_validator.rb
 - lib/knife-cloudformation/version.rb
-homepage: http://github.com/heavywater/knife-cloudformation
-licenses: []
+homepage: http://github.com/hw-labs/knife-cloudformation
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []