cloudformation-tool 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20f67bcc37c49351026eb98cef017457edc1f32
-  data.tar.gz: 38ff68d4a7bb51911051098d13540b5549093629
+  metadata.gz: e7b9610569b0d65c7af93fc51430e33d2020f8cc
+  data.tar.gz: 9d0199f6d1ed1193418eb7a912c313abadd10e5e
 SHA512:
-  metadata.gz: 1ecb42453c9cd9152c221aa204d76d1286b57daae0fb969a5bda8cab794a32e34e1c1855f78c9b3f24b82d918ca0bc95dcb00cf179b10281b4a8780f500f3134
-  data.tar.gz: 5e35126a9b55dd57ad87378934cface4dcb24fc6877d8ff9f2bea8e8aa9962e7ea8f6e621259bc64a2002d4bd7e3685cb0d24896c4401c53a8e780bd113bf5fe
+  metadata.gz: d1e0e9be5c9ece04814e98fb42831508cc1310adbae7c615e2b4fba6b604b0fdf0b5132a094a0f8bd8a327c9c8af53666fd6d67cdc189589ac156923b7756169
+  data.tar.gz: c9aced3e58604de4d2c33285ccb9ffcb99eba55ec1b77f0320770550ea99b78035303279777c1d9a56782a33c53ee253a3dddc464ecb31ff843ed491d0b3369f

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -17,7 +17,7 @@ module CloudFormationTool
       @path = "#{@path}.yaml" if !File.exist? @path and File.exist? "#{@path}.yaml"
       @basedir = File.dirname(@path)
       @compiled = false
-      @params = {}
+      @params = nil
       text = File.read(@path)
       # remove comments because white space seen between comments can seriously psych Psych
       text.gsub!(/^#.*\n/s,'')
@@ -128,10 +128,17 @@ module CloudFormationTool
       case value
       when Hash
         if value['Ref']
-          @params[value['Ref']] || # parameters are set for this template - we can resolve
-            # no parameters, we are probably in a sub template, just return the ref and hope a parent template
-            # has what it takes to resolve the ref
+          if @params.nil?
+            # no parameters, we are probably in a sub template, just return the ref and hope
+            # a parent template has what it takes to resolve the ref
             value
+          else # parameters are set for this template - we can try to resolve
+            res = @params[value['Ref']] || (@data['Parameters']||{})[value['Ref']] 
+            if res.nil?
+              raise CloudFormationTool::Errors::AppError, "Reference #{value['Ref']} can't be resolved"
+            end
+            res
+          end
         else
           raise CloudFormationTool::Errors::AppError, "Value #{value} is not a valid value or reference"
         end
@@ -154,7 +161,13 @@ module CloudFormationTool
             { "Fn::Base64" => { "Fn::Sub" => CloudInit.new("#{@basedir}/#{val["File"]}").compile } }
           elsif (key == "Code") and (val["URL"])
             # Support Lambda Code from arbitrary URLs
-            LambdaCode.new(resolveVal(val["URL"])).to_cloudformation 
+            url = resolveVal(val["URL"])
+            if url.is_a? String # resolving works
+              LambdaCode.new(url).to_cloudformation
+            else # resolving didn't work - we probably don't have parameters
+              # push it upstream and hope a parent template can resolve it
+              val
+            end
           else 
             load_files(val)
           end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Oded Arbel