sfn 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f61e628a6233ed4d119e00cf0dac4fa2c7346e8c
-  data.tar.gz: f3831c51dd182d23e09cd955182e73cf0a10ffce
+  metadata.gz: 13adf8b1463f4e31619b3ba82661e9d181a576d6
+  data.tar.gz: 7f294f7cb3b0814f6e31fa3bc8c021084f26e5dd
 SHA512:
-  metadata.gz: 36e914b73af9b09977c701c5e08849321d32adcbd5415534c7d3e9cb4c05535db5e521c74db2ac4274846ba1f33df6c592e65a65c7898c8e06a862f6628f3168
-  data.tar.gz: 36eea79e6158f0601e8f6be8e0f0768ee4e14ddbc37e47f941b4c7cf2e605719e0623f78cbc809967377bdd32661cc3e8d40a8c6608d04d84e6aa38c8d486725
+  metadata.gz: 428044e1804b21057eb1ea2981d20377e3256396bc273f65a87e39b612dcd48a81f203c92a6e2931f06059574c681e950bf3a7614a6fd34901a63171267597bc
+  data.tar.gz: f0bec6f1774225739f12a9df1fb5919ad3e956449cd41290ca4e177c02cf6d0e171fe75a290bfaec3fbbef60c93923ee7fad6c9521299ef2034597ea363d2929

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.4
+* [fix] Set template prior to apply on update to find new parameters
+* Disable parameter validation warning on deep nesting
+* Update parameter detection on updates when using deep nesting
+
 ## v1.0.2
 * [fix] Properly detect local pack directory if available
 * Add `print` command for printing generated templates

data/README.md

@@ -7,7 +7,7 @@ with orchestration APIs.
 
 ## Extra Documentation
 
-* [User Documentation](https://sparkleformation.github.io/sfn/UserDocs)
+* [User Documentation](http://www.sparkleformation.io/docs/sfn/)
 
 ## API Compatibility
 
@@ -237,7 +237,7 @@ in JSON format. The `--processing` flag will allow providing Ruby
 files to dynamically generate templates using the SparkleFormation
 library.
 
-_NOTE: (SparkleFormation Usage Documentation)[]._
+_NOTE: (SparkleFormation Usage Documentation)[http://www.sparkleformation.io/docs/sparkle_formation/]._
 
 This plugin supports the advanced stack nesting feature provided by
 the SparkleFormation library.
@@ -436,6 +436,7 @@ $ knife sparkleformation --help
 # Info
 
 * Repository: https://github.com/sparkleformation/sfn
+* Website: http://www.sparkleformation.io/docs/sfn/
 * IRC: Freenode @ #sparkleformation
 
 [miasma]: http://miasma-rb.github.io/miasma/

data/lib/sfn/command/create.rb

@@ -25,7 +25,7 @@ module Sfn
         end
 
         unless(config[:print_only])
-          ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('create', :green)}"
+          ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('create', :green)}"
         end
 
         stack_info = "#{ui.color('Name:', :bold)} #{name}"

data/lib/sfn/command/destroy.rb

@@ -44,7 +44,7 @@ module Sfn
             ui.error "Stack polling is not available when multiple stack deletion is requested!"
           end
         end
-        ui.info "  -> Destroyed Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold, :red)}"
+        ui.info "  -> Destroyed SparkleFormation#{plural}: #{ui.color(stacks.join(', '), :bold, :red)}"
       end
 
       # Cleanup persisted templates if nested stack resources are included

data/lib/sfn/command/update.rb

@@ -38,7 +38,7 @@ module Sfn
             raise "Failed to locate stack: #{name}"
           end
 
-          ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('update', :green)}"
+          ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('update', :green)}"
 
           unless(file)
             if(config[:template])
@@ -50,18 +50,18 @@ module Sfn
           end
           ui.info "  -> #{stack_info}"
 
-          apply_stacks!(stack)
-
           if(file)
             if(config[:print_only])
               ui.puts _format_json(translate_template(file))
               return
             end
-            populate_parameters!(file, :current_parameters => stack.parameters)
             stack.template = translate_template(file)
+            apply_stacks!(stack)
+            populate_parameters!(file, :current_parameters => stack.parameters)
             stack.parameters = config_root_parameters
             stack.template = Sfn::Utils::StackParameterScrubber.scrub!(stack.template)
           else
+            apply_stacks!(stack)
             populate_parameters!(stack.template, :current_parameters => stack.parameters)
             stack.parameters = config_root_parameters
           end

data/lib/sfn/command_module/stack.rb

@@ -248,7 +248,7 @@ module Sfn
             answer = ui.ask_question("Use current value or expected value for #{p_key} [current/expected]?", :valid => ['current', 'expected'])
             answer == 'expected'
           else
-            ui.warn "Unable to check #{p_key} for direct value modification. (Cannot auto-check expected value #{c_value.inspect})"
+#            ui.warn "Unable to check #{p_key} for direct value modification. (Cannot auto-check expected value #{c_value.inspect})"
             true
           end
         end

data/lib/sfn/command_module/template.rb

@@ -141,11 +141,21 @@ module Sfn
             run_callbacks_for(:template, :stack_name => stack_name, :sparkle_stack => stack)
             stack_definition = stack.compile.dump!
             stack_resource = resource._dump
+
+            if(stack.parent)
+              current_parameters = stack.parent.compile.dump!.to_smash.fetch('Resources', stack_name, 'Properties', 'Parameters', Smash.new)
+            else
+              current_parameters = Smash.new
+            end
+            current_stack = c_stack ? c_stack.nested_stacks.detect{|s| s.data[:logical_id] == stack_name} : nil
+            if(current_stack && current_stack.data[:parent_stack])
+              current_parameters.merge!(current_stack.data[:parent_stack].template.fetch('Resources', stack_name, 'Properties', 'Parameters', Smash.new))
+            end
             unless(config[:print_only])
               result = Smash.new(
                 'Parameters' => populate_parameters!(stack,
-                  :stack => c_stack ? c_stack.nested_stacks.detect{|s| s.data[:logical_id] == stack_name} : nil,
-                  :current_parameters => c_stack ? c_stack.template.fetch('Resources', stack_name, 'Properties', 'Parameters', Smash.new) : stack_resource['Properties'].fetch('Parameters', {})
+                  :stack => current_stack,
+                  :current_parameters => current_parameters
                 )
               )
               resource.properties.delete!(:stack)

data/lib/sfn/monkey_patch/stack.rb

@@ -196,7 +196,7 @@ module Sfn
           if(api.data.fetch(:stack_types, []).include?(resource.type))
             # Custom remote load support
             if(resource.type == 'Custom::JackalStack')
-              location, stack_id = resource.id.split('-', 2)
+              location, stack_id = resource.id.to_s.split('-', 2)
               if(l_conf = api.data[:locations][location])
                 n_stack = Miasma.api(
                   :type => :orchestration,

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('1.0.2')
+  VERSION = Gem::Version.new('1.0.4')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli