autostacker24 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba5db40a030fc43099e897142221408281fde0f
-  data.tar.gz: e0bdf82e4fe18602a9c5852077c03ef1bfd4a9b4
+  metadata.gz: b732fd31c628afdb647f46c73cf3291deb75a1a8
+  data.tar.gz: 64a7bcd1cbda0d7671901af8007cce921a2d6cdb
 SHA512:
-  metadata.gz: be884bbe188f6ed46c47aba394be80873e582d682c1414070b335be2f725b76644888f9a6b8cf72c741ef065ec228fc891a767de7278503a135bfd2c18f9b3ee
-  data.tar.gz: f406a791a692ed25729778f5970e74e92f94ae02ac4426531243e9f8f32ced4e249fced641434e1f164a2f3db20ebbf5c35fd9ce5c8c5e8585d7572a3eccc03c
+  metadata.gz: bb34baa7e6d305e4003bd17f219cc3cd794fa72dfd11dc132a3d507072f73bc20e0624bdfa9813f2387041a987d90f4a2e8c6d0ce234de5d75ee45a202030b36
+  data.tar.gz: 6b0841d59347522ec965c6b99d4c9c9784b31c062954beff3f81f329890650282222d56a0e7390aa4b9de555aa8e0d9b3aebaa11f5dba496c38237019098f96b

data/lib/autostacker24/service_stack.rb

@@ -14,10 +14,8 @@ class ServiceStack
   attr_reader :name, :sandbox, :version, :stack_name, :global_stack_name
 
   def create_or_update(template, parameters)
-    inputs = JSON(template)['Parameters']
-    global_outputs.each{|k, v| parameters[k.to_sym] = v if inputs.has_key?(k.to_s)}
     parameters[:Version] = version
-    Stacker.create_or_update_stack(stack_name, template, parameters)
+    Stacker.create_or_update_stack(stack_name, template, parameters, global_stack_name)
   end
 
   def delete

data/lib/autostacker24/stacker.rb

@@ -2,15 +2,16 @@ require 'aws-sdk'
 
 module Stacker
 
-  def self.create_or_update_stack(stack_name, template_body, parameters)
+  def self.create_or_update_stack(stack_name, template_body, parameters, parent_stack_name = nil)
     if find_stack(stack_name).nil?
-      create_stack(stack_name, template_body, parameters)
+      create_stack(stack_name, template_body, parameters, parent_stack_name)
     else
-      update_stack(stack_name, template_body, parameters)
+      update_stack(stack_name, template_body, parameters, parent_stack_name)
     end
   end
 
-  def self.create_stack(stack_name, template_body, parameters)
+  def self.create_stack(stack_name, template_body, parameters, parent_stack_name = nil)
+    merge_output_parameters(parent_stack_name, template_body, parameters) if parent_stack_name
     cloud_formation.create_stack(stack_name:    stack_name,
                                  template_body: template_body,
                                  on_failure:    'DELETE',
@@ -19,7 +20,8 @@ module Stacker
     wait_for_stack(stack_name, :create)
   end
 
-  def self.update_stack(stack_name, template_body, parameters)
+  def self.update_stack(stack_name, template_body, parameters, parent_stack_name = nil)
+    merge_output_parameters(parent_stack_name, template_body, parameters) if parent_stack_name
     begin
       cloud_formation.update_stack(stack_name:    stack_name,
                                    template_body: template_body,
@@ -33,6 +35,14 @@ module Stacker
     end
   end
 
+  def merge_output_parameters(stack_name, template_body, parameters)
+    expected_parameters = JSON(template_body)['Parameters']
+    get_stack_outputs(stack_name).each do |k, v|
+      parameters[k.to_sym] = v if expected_parameters.has_key?(k.to_s)
+    end
+    parameters
+  end
+
   def self.delete_stack(stack_name)
     cloud_formation.delete_stack(stack_name: stack_name)
     wait_for_stack(stack_name, :delete)
@@ -68,14 +78,14 @@ module Stacker
     cloud_formation.estimate_template_cost(:template_body => template_body, :parameters => transform_parameters(parameters))
   end
 
-  def self.get_stack_outputs(stack_name, hash = {})
+  def self.get_stack_outputs(stack_name)
     stack = find_stack(stack_name)
     fail "stack #{stack_name} not found" unless stack
-    transform_outputs(stack.outputs, hash).freeze
+    transform_outputs(stack.outputs).freeze
   end
 
-  def self.transform_outputs(outputs, existing_outputs = {})
-    outputs.inject(existing_outputs) { |m, o| m.merge(o.output_key.to_sym => o.output_value) }
+  def self.transform_outputs(outputs)
+    outputs.inject({}) { |m, o| m.merge(o.output_key.to_sym => o.output_value) }
   end
 
   def self.transform_parameters(parameters)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk