bora 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb9cb634611af62cf8cbcdf7a2e14dfce79c0ee
-  data.tar.gz: b0be2ce0d4e56b6c39bca1eaca8e2368e20632f3
+  metadata.gz: ea4493a9644738e50bf62a8083150dfc6f1aa76e
+  data.tar.gz: c32798fe76ef04770c196b5700e406b1c6f6e1e0
 SHA512:
-  metadata.gz: 371de3c1092a9b94aede3507bcd103e41b5b0ac9b34b15af07a9fa2017adb407bcdaf65f98e66684259702352b6a138218bcb64c814b8b1cdb665f9a10b850eb
-  data.tar.gz: b4521c15f3dc649788233b09049926f4a3b3565bb0797886dbf1dbafba4e319441e713ab588f61dc074eb186f1883a26cada8a60edf747f64f90418dd754a08b
+  metadata.gz: 51e688533cfc524b0178efb0943e13caae0632fe4f0e38afd5006d0c8cee17e922b1ff70d5cb195a83d1a3fd17b49027decf3d116acea27ebd3e163fe1246996
+  data.tar.gz: 06f9d9b9ae1e690b02e24542107fad4c679865220cab46f394be233c56b2f02546031235957303d2bce7ba50540b8b87210a6f2937af99e6d8c0bafc823e8503

data/lib/bora/cfn_param_resolver.rb

@@ -0,0 +1,22 @@
+require 'bora/stack'
+
+module Bora
+  class CfnParamResolver
+    def initialize(param)
+      @param = param
+    end
+
+    def resolve
+      stack, section, name = @param.split("/")
+      if !stack || !section || !name || section != 'outputs'
+        raise "Invalid parameter substitution: #{@param}"
+      end
+
+      outputs = Stack.new(stack).outputs
+      matching_output = outputs.find { |output| output.key == name }
+      raise "Output #{name} not found in stack #{stack}" if !matching_output
+      matching_output.value
+    end
+
+  end
+end

data/lib/bora/output.rb

@@ -4,6 +4,14 @@ module Bora
       @output = output
     end
 
+    def key
+      @output.output_key
+    end
+
+    def value
+      @output.output_value
+    end
+
     def to_s
       desc = @output.description ? " (#{@output.description})" : ""
       "#{@output.output_key} - #{@output.output_value} #{desc}"

data/lib/bora/rake_tasks.rb

@@ -4,6 +4,7 @@ require 'colorize'
 require 'rake/tasklib'
 require 'cfndsl'
 require 'bora/tasks'
+require 'bora/cfn_param_resolver'
 
 module Bora
   class RakeTasks < Rake::TaskLib
@@ -33,8 +34,7 @@ module Bora
       Bora::Tasks.new(stack_name) do |t|
         if File.extname(template_file) == ".rb"
           task :generate do |_, args|
-            params = stack_config['params']
-            params.merge!(extract_params_from_args(args.extras))
+            params = extract_params(stack_config, args)
             stack_options[:template_body] = run_cfndsl(template_file, params)
           end
         else
@@ -58,6 +58,24 @@ module Bora
       config.select { |k| valid_options.include?(k) }
     end
 
+    def extract_params(stack_config, args)
+      params = stack_config['params'] || {}
+      params.merge!(extract_params_from_args(args.extras))
+      params.map { |k, v| [k, process_param_value(v)] }.to_h
+    end
+
+    def process_param_value(val)
+      old_val = nil
+      while old_val != val
+        old_val = val
+        val = val.sub(/\${[^}]+}/) do |m|
+          token = m[2..-2]
+          CfnParamResolver.new(token).resolve
+        end
+      end
+      val
+    end
+
     def extract_params_from_args(args)
       args ? Hash[args.map { |arg| arg.split("=", 2) }] : {}
     end

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 module Bora
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -125,6 +125,7 @@ files:
 - bin/setup
 - bora.gemspec
 - lib/bora.rb
+- lib/bora/cfn_param_resolver.rb
 - lib/bora/event.rb
 - lib/bora/output.rb
 - lib/bora/rake_tasks.rb