stackit 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37957a0ab7a75459eea8abaa2069aacf28cf4add
-  data.tar.gz: 516c9bd146cb7771de86751bd9aba7126582fcca
+  metadata.gz: 2377e14f70d1702952ef7978585e929fc40e3c78
+  data.tar.gz: 1a5f3f05d472161b4c935f8b5e19e395da6c4e39
 SHA512:
-  metadata.gz: 0fc16655e92b18cbc1ff896b90dd9587e42e07bd711aa7020976d8b816f3acee6b9dccf227f8d8fbf598a7250fa405806408f9dbb1e9f0ebd83d376eeedb4c1c
-  data.tar.gz: 9b51f7362a14c70c0901999588c3a1d715909a242e3da30beb4d382540ef2a72c180817613dce1b050ee0cd198daafb260466b5deb182961e243c619dc532e8a
+  metadata.gz: 1630a4ec8a5da72b513fa1036a05cda0a955f4953c6dc6be838c0abba3a386675d0304129b146ddd4f46f30214d64384b7714ed3b5134910760600fbe62d0ecf
+  data.tar.gz: be2b35681a4fe8ed567ffbdac24a3a266a3907bbadb569db500d8dae9b38e76d359ad53b47a86f0889f4f312ada1740b1ef3224f20e91a74b9c1c7bd0b1f0007

data/lib/stackit/stack/managed_stack.rb

@@ -200,6 +200,7 @@ module Stackit
 
     def parse_file_parameters(parameters_file)
       if File.exist?(parameters_file)
+        Stackit.logger.info "Parsing cloudformation parameters file: #{parameters_file}"
         @file_parameters = {}
         file_params = JSON.parse(File.read(parameters_file))
         file_params.inject(@file_parameters) do |hash, param|
@@ -239,15 +240,16 @@ module Stackit
     def create_cloudformation_options(action)
       case action
       when :create_stack
-        {
+        create_stack_request_params.merge(
           parameters: to_request_parameters(merged_parameters),
           capabilities: capabilities
-        }.reverse_merge(template.options).reverse_merge(create_stack_request_params)
+        )
       when :update_stack
-        {
+        update_stack_request_params.merge(
           parameters: to_request_parameters(merged_parameters),
-          capabilities: capabilities
-        }.merge(template.options).merge(update_stack_request_params)
+          capabilities: capabilities,
+          use_previous_template: template.options[:template_body].nil? && template.options[:template_url].nil?
+        )
       else
         delete_stack_request_params
       end
@@ -255,9 +257,8 @@ module Stackit
 
     def merged_parameters
       merged_params = template.parsed_parameters
-      return parsed_parameters unless depends.length
       merged_params.merge!(file_parameters) if file_parameters
-      depends.each do |dependent_stack_name|
+      depends.each do |dependent_stack_name|        
         this_stack = Stack.new({
           cloudformation: cloudformation,
           stack_name: dependent_stack_name

data/lib/stackit/stack/managed_stack_service.rb

@@ -48,15 +48,18 @@ module Stackit
   protected
 
     def stack_name
-      return options[:stack_name] ||  "#{Stackit.environment}-#{options[:stack_name]}"
+      return options[:stack_name] ||  
+        "#{Stackit.environment}-#{options[:stack_name]}"
     end
 
     def template
-      return options[:template] || File.expand_path("#{options[:stack_name]}.json", template_dir)
+      return options[:template] ||
+        File.expand_path("#{options[:stack_name]}.json", template_dir)
     end
 
     def parameters_file
-      return options[:parameters_file || File.expand_path("#{options[:stack_name]}.parameters", template_dir)
+      return options[:parameters_file] ||
+        File.expand_path("#{options[:stack_name]}.parameters", template_dir)
     end
 
     def parameter_mappings

data/lib/stackit/stack.rb

@@ -32,7 +32,7 @@ module Stackit
       @capabilities = options[:capabilities]
       @tags = options[:tags]
       @on_failure = options[:on_failure]
-      @use_previous_template = options[:use_previous_template] || true
+      @use_previous_template = options[:use_previous_template]
       @retain_resources = options[:retain_resources]
     end
 

data/lib/stackit/version.rb

@@ -1,3 +1,3 @@
 module Stackit
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackit
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Jeremy Hahn