bora 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc84ca6ace21cd7997bea10fd35850740536f13
-  data.tar.gz: 5e7df220869080122165cd28082d4c1e024320fe
+  metadata.gz: 051a9f9d9023048aa57a43f69a4fa40694976b39
+  data.tar.gz: 015a4c14851b8448634116b8363455f728a75117
 SHA512:
-  metadata.gz: bfbf29a13e209ddd100e88150d5e6cccf76b118fea3c4f7dcc739e83cd38c33070763d6cfe92fa0c1bda3f074a079d6570e2d5d83c5f856f438c71e893c2de73
-  data.tar.gz: 0f34aa4bf376a58b367d61c0187a206cbc197be67c2dcb4d200d374de6c5435fde0138eebf846bb8a97c9c8deb4ea23e3521987c9a679f819b990872df5652c9
+  metadata.gz: 2ddc7cc56506aa31329a61310c6315c5f3b61164c0153ad3e56851e23c91bf21b056c2031e9d6598d1b6f546cebb0589f4ffc2232050bee049e9c1db22ccb1be
+  data.tar.gz: 80ef8eb03d677a97fbf49fbf21625fc9adc8e2c104326dea6337e13462daf6e0ec0f07b95013e34962741154138ca6eb7417e81d07d2cc183fd22afd8397ad2a

data/lib/bora/rake_tasks.rb

@@ -36,20 +36,25 @@ module Bora
 
         task :generate do |_, args|
           params = extract_params(stack_config, args)
-          t.stack_options[:parameters] = params.map do |k,v|
-            { parameter_key: k, parameter_value: v }
-          end
 
           if File.extname(template_file) == ".rb"
             template_body = run_cfndsl(template_file, params)
             template_json = JSON.parse(template_body)
             if template_json["Parameters"]
-              cfn_params = template_json["Parameters"].keys
-              t.stack_options[:parameters].keep_if {|cfn_param| cfn_params.include?(cfn_param[:parameter_key]) }
+              cfn_param_keys = template_json["Parameters"].keys
+              cfn_params = params.select { |k, v| cfn_param_keys.include?(k) }.map do |k, v|
+                { parameter_key: k, parameter_value: v }
+              end
+              t.stack_options[:parameters] = cfn_params if !cfn_params.empty?
             end
             t.stack_options[:template_body] = template_body
           else
             t.stack_options[:template_url] = template_file
+            if !params.empty?
+              t.stack_options[:parameters] = params.map do |k, v|
+                { parameter_key: k, parameter_value: v }
+              end
+            end
           end
         end
       end

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 module Bora
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Charles Blaxland