autostacker24 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb4509f5f4de852d4a73842ca71a47c1760a611
-  data.tar.gz: a1ddf79a2755d3d4317a8061f32dfce803485dfb
+  metadata.gz: 61080d80be23cf4281dce0607e034ea71639ba98
+  data.tar.gz: bd143c77bd1bbc32c7d487e87b095a7f67ab3bc2
 SHA512:
-  metadata.gz: 083b9eda935b77896c93e73bc2623ac5397a2f5b1f50fc1d28aa9f9aa59d714fd3f3281d51e3334cb9f154608dcc7d996eb855e7b28f386db8a07ca6e505707b
-  data.tar.gz: dffd875d8a1e7703df826b15cc901d7c1a52da97b4a189bf5dc143cf71f91eb62ee373f4af55d09b265052a2daad5ae32815c5884a40faa2e7d8b64aee84db4d
+  metadata.gz: 85d3a43d7cf983610b4206d07d7eea0d784cf443d2f76d7e88bd204b33694905275546751863eea7a95be98e72a6bce4b900eec4453114c112ae90c56d8a669a
+  data.tar.gz: d27c6861e9d0e2c74e32f56edd6e74288d71a85cdd2c1bef9786ee756e4b4ca64f1156b5e98ff23725d3d8d48e2c7510d0b08e722a25c3f5fa4644c3731d04a2

data/lib/autostacker24/stacker.rb

@@ -1,5 +1,5 @@
 require 'aws-sdk-core'
-require 'json'
+require 'set'
 
 module Stacker
 
@@ -26,21 +26,21 @@ module Stacker
   end
 
   def create_stack(stack_name, template, parameters, parent_stack_name = nil)
-    merge_output_parameters(parent_stack_name, template, parameters) if parent_stack_name
+    merge_and_validate(template, parameters, parent_stack_name)
     cloud_formation.create_stack(stack_name:    stack_name,
                                  template_body: template_body(template),
                                  on_failure:    'DELETE',
-                                 parameters:    transform_parameters(parameters),
+                                 parameters:    transform_input(parameters),
                                  capabilities:  ['CAPABILITY_IAM'])
     wait_for_stack(stack_name, :create)
   end
 
   def update_stack(stack_name, template, parameters, parent_stack_name = nil)
-    merge_output_parameters(parent_stack_name, template, parameters) if parent_stack_name
     begin
+      merge_and_validate(template, parameters, parent_stack_name)
       cloud_formation.update_stack(stack_name:    stack_name,
                                    template_body: template_body(template),
-                                   parameters:    transform_parameters(parameters),
+                                   parameters:    transform_input(parameters),
                                    capabilities:  ['CAPABILITY_IAM'])
     rescue Aws::CloudFormation::Errors::ValidationError => error
       raise error unless error.message =~ /No updates are to be performed/i # may be flaky, do more research in API
@@ -50,13 +50,27 @@ module Stacker
     end
   end
 
-  def merge_output_parameters(stack_name, template, parameters)
-    expected_parameters = JSON(template_body(template))['Parameters']
-    get_stack_outputs(stack_name).each do |k, v|
-      parameters[k.to_sym] = v if expected_parameters.has_key?(k.to_s)
+  # if stack_name is given assign read the output parameters and copy them to the given template parameters
+  # if a aparameter is already defined, it will not be overwritten
+  # finally, if mandatory parameters are missing, an error will be raised
+  def merge_and_validate(template, parameters, stack_name)
+    valid = validate_template(template).parameters
+    if stack_name
+      present = valid.map{|p| p.parameter_key.to_sym}
+      get_stack_output(stack_name).each do |key, value|
+        parameters[key] ||= value if present.include?(key)
+      end
     end
+    mandatory = valid.select{|p| p.default_value.nil?}.map{|p| p.parameter_key.to_sym}
+    diff = mandatory.to_set - parameters.keys.to_set
+    raise "Missing one ore more mandatory parameters: #{diff.to_a.join(', ')}" if diff.length > 0
     parameters
   end
+  private :merge_and_validate
+
+  def validate_template(template)
+    cloud_formation.validate_template(template_body: template_body(template))
+  end
 
   def delete_stack(stack_name)
     cloud_formation.delete_stack(stack_name: stack_name)
@@ -75,11 +89,11 @@ module Stacker
                           when :delete then /DELETE_COMPLETE$/
                         end
       return true if status =~ expected_status
-      fail "#{stack_name} failed, current status #{status}" if status =~ finished
+      raise "#{operation} #{stack_name} failed, current status #{status}" if status =~ finished
       puts "waiting for #{stack_name}, current status #{status}"
       sleep(7)
     end
-    fail "waiting for stack timeout after #{timeout_in_minutes} minutes"
+    raise "waiting for stack timeout after #{timeout_in_minutes} minutes"
   end
 
   def find_stack(stack_name)
@@ -98,22 +112,27 @@ module Stacker
   end
 
   def estimate_template_cost(template, parameters)
-    cloud_formation.estimate_template_cost(:template_body => template_body(template), :parameters => transform_parameters(parameters))
+    cloud_formation.estimate_template_cost(:template_body => template_body(template), :parameters => transform_input(parameters))
   end
 
   def get_stack_outputs(stack_name)
+    puts 'get_stack_outputs is obsolete, please use get_stack_output'
+    get_stack_output(stack_name)
+  end
+
+  def get_stack_output(stack_name)
     stack = find_stack(stack_name)
-    fail "stack #{stack_name} not found" unless stack
-    transform_outputs(stack.outputs).freeze
+    raise "stack #{stack_name} not found" unless stack
+    transform_output(stack.outputs).freeze
   end
 
-  def transform_outputs(outputs)
-    outputs.inject({}) { |m, o| m.merge(o.output_key.to_sym => o.output_value) }
+  def transform_output(output)
+    output.inject({}) { |m, o| m.merge(o.output_key.to_sym => o.output_value) }
   end
 
-  def transform_parameters(parameters)
-    parameters.each{|k,v| fail "#{k} must not be nil" if v.nil? }
-    parameters.inject([]) { |m, kv| m << {parameter_key: kv[0].to_s, parameter_value: kv[1].to_s} }
+  def transform_input(input)
+    input.each{|k,v| raise "#{k} must not be nil" if v.nil? }
+    input.inject([]) { |m, kv| m << {parameter_key: kv[0].to_s, parameter_value: kv[1].to_s} }
   end
 
   def get_stack_resources(stack_name)
@@ -122,14 +141,13 @@ module Stacker
   end
 
   def cloud_formation # lazy CloudFormation client
-    @lazy_cloud_formation ||= Aws::CloudFormation::Client.new(cloud_formation_parameters)
-  end
-
-  def cloud_formation_parameters
-    params = {}
-    params[:credentials] = @credentials if @credentials
-    params[:region] = @region if @region
-    params
+    unless @lazy_cloud_formation
+      params = {}
+      params[:credentials] = @credentials if @credentials
+      params[:region] = @region if @region
+      @lazy_cloud_formation = Aws::CloudFormation::Client.new(params)
+    end
+    @lazy_cloud_formation
   end
 
   def template_body(template)
@@ -140,15 +158,3 @@ module Stacker
   extend self
 
 end
-
-if $0 ==__FILE__ # placeholder for interactive testing
-  template = <<-EOL
-    bla bla //comment
-    bla "//no comment"
-    bla // still a "comment"
-    bla "some string" // comment
-  EOL
-
-  puts Stacker.template_body(template)
-
-end

data/lib/autostacker24/stacker_tests.rb

@@ -0,0 +1,21 @@
+require 'openssl'
+require_relative 'stacker.rb'
+
+def template_body
+  template = <<-EOL
+    bla bla //comment
+    bla "//no comment"
+    bla // still a "comment"
+    bla "some string" // comment
+  EOL
+
+  puts Stacker.template_body(template)
+end
+
+if $0 ==__FILE__ # placeholder for interactive testing
+
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # Windows Hack
+
+  template_body
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -25,20 +25,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: n/a
 email:
 - jmueller@autoscout24.com
@@ -49,6 +35,7 @@ extra_rdoc_files: []
 files:
 - lib/autostacker24.rb
 - lib/autostacker24/stacker.rb
+- lib/autostacker24/stacker_tests.rb
 homepage: https://github.com/AutoScout24/autostacker24
 licenses:
 - MIT