bora 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c886f84ef125c1287e7da22178e0e05add41f1
-  data.tar.gz: 95c81333c0ce5d1889917cf93e16edf4e821e337
+  metadata.gz: 97bb5e174fb739e5d972f9e5de97fb3cace2719c
+  data.tar.gz: 680167b8916dc55560d6ad7558529bf036dd4d06
 SHA512:
-  metadata.gz: b6141f199f67513cdfd3e6b6d4758670d9d922f2b7d54c8fc38fc0aa2706688cb4b3eddd4976eca0e81c8fc62388a23c59d4a8352ceef41810523ea231de1fe5
-  data.tar.gz: dd4a98f29d7d3b62167c8d5f4f0d79de642fd37574b53c725a58e1930f264cece311b4ce9fecb96327edfc2a02456169d6a6d0b3f933315b0f615f8ec32127dd
+  metadata.gz: 47ec7127e767d1c7f6a95df782b9ee8b62021e7843076852523324d1950f3cab0a60e2ea6e9eefa486dd0ed49a7376241dcba7756f1e279523a1257ff3fae6b9
+  data.tar.gz: e420921e96864718b6826e720fff544af5868b132032c5bc9ec74f0535f45a4e74326abcf88a12c6e950b4ced2c60889960a00c8297d0f646a78ef6abf07d847

data/README.md

@@ -15,6 +15,8 @@ Given this config, Bora then provides commands (or Rake tasks) to work with thos
 
 ## Installation
 
+This gem requires Ruby 2.1 or greater.
+
 If you're using Bundler, add this line to your application's `Gemfile`:
 
 ```ruby
@@ -63,6 +65,10 @@ To get a full list of available tasks run `rake -T`.
 The example below is a `bora.yml` file showing all available options:
 
 ```yaml
+# Optional. The default region for all stacks in the file.
+# See below for further information.
+default_region: us-east-1
+
 # A map defining all the CloudFormation templates available.
 # A "template" is effectively a single CloudFormation JSON (or cfndsl template).
 templates:
@@ -75,6 +81,11 @@ templates:
     # (see CloudFormation docs for more details)
     capabilities: [CAPABILITY_IAM]
 
+    # Optional. The default region for all stacks in this template.
+    # Overrides "default_region" at the global level.
+    # See below for further information.
+    default_region: us-west-2
+
     # A map defining all the "stacks" associated with this template
     # for example, "uat" and "prod"
     stacks:
@@ -92,6 +103,12 @@ templates:
         # name concatenated with the stack name as defined in this file,
         # eg: "app-prod".
         stack_name: prod-application-stack
+
+        # Optional. Default region for this stack.
+        # Overrides "default_region" at the template level.
+        # See below for further information.
+        default_region: ap-southeast-2
+
         params:
           InstanceType: m4.xlarge
           AMI: ami-11032472
@@ -120,7 +137,7 @@ templates:
 
           # You can refer to outputs of other stacks using "${}" notation too.
           # See below for further details.
-          app_url: http://${app-uat/outputs/Domain}/api
+          app_url: http://${cfn://app-uat/outputs/Domain}/api
 
           # Traditional CloudFormation parameters
           InstanceType: t2.micro
@@ -129,27 +146,6 @@ templates:
       prod: {}
 ```
 
-## Parameter Substitution
-
-Bora supports looking up parameter values from other stacks and interpolating them into input parameters.
-At present you can only look up the outputs of other stacks,
-however in the future it may support looking up stack parameters or resources.
-Other future possibilities include looking up values from other services,
-for example AMI IDs.
-
-The format is as follows:
-
-`${<stack_name>/outputs/<output_name>}`
-
-For example:
-```yaml
-params:
-  api_url: http://${api-stack/outputs/Domain}/api
-```
-
-This will look up the `Domain` output from the stack named `api-stack` and substitute it into the `api_url` parameter.
-
-
 ## Command Reference
 
 The following commands are available through the command line and rake tasks.
@@ -167,7 +163,7 @@ The following commands are available through the command line and rake tasks.
 * **validate** - Validates the template using the AWS CloudFormation "validate" API call
 
 
-## Command Line
+### Command Line
 
 Run `bora help` to see all available commands.
 
@@ -175,7 +171,7 @@ Run `bora help` to see all available commands.
 eg: `bora help apply`.
 
 
-## Rake Tasks
+### Rake Tasks
 
 To use the rake tasks, simply put this in your `Rakefile`:
 ```ruby
@@ -186,6 +182,88 @@ Bora.new.rake_tasks
 To get a full list of available tasks run `rake -T`.
 
 
+## Specifying Regions
+You can specify the region in which to create a stack in a few ways.
+The order of precedence is as follows (first non-empty value found wins):
+
+- The `--region` parameter on the command line (only available in the CLI, not in the Rake tasks)
+- The `default_region` setting within the stack section in `bora.yml`
+- The `default_region` setting within the template section in `bora.yml`
+- The `default_region` setting at the top level of `bora.yml`
+- The [default region as determined by the AWS Ruby SDK](https://docs.aws.amazon.com/sdkforruby/api/index.html).
+
+
+## Parameter Substitution
+
+Bora supports looking up parameter values from various locations and interpolating them into stack parameters.
+This is useful so that you don't have to hard-code values into your stack parameters that may change across regions or over time.
+For example, you might have a VPC template that creates a subnet and returns the subnet ID as a stack output.
+You could then have an application template that creates an EC2 instance in that subnet,
+with the subnet ID parameter looked up dynamically from the VPC stack.
+
+These lookup parameters are specified using `${}` syntax within the parameter value,
+and the lookup target is a URI.
+
+For example:
+
+```yaml
+params:
+  api_url: http://${cfn://api-stack/outputs/Domain}/api
+```
+
+This will look up the `Domain` output from the stack named `api-stack` and substitute it into the `api_url` parameter.
+The URI "scheme" (`cfn` in the above example) controls which resolver will handle the lookup.
+The format of the rest of the URI is dependent on the resolver.
+
+There are a number of resolvers that come with Bora (documented below),
+or you can write your own.
+
+
+### Stack Output Lookup
+
+You can look up outputs from stacks in the same region.
+
+For example:
+```bash
+# Look up output "MyOutput" from stack "my-stack" in the same region as the current stack.
+${cfn://my-stack/outputs/MyOutput}
+
+# Look up an output from a stack in another region
+${cfn://my-stack.ap-southeast-2/outputs/MyOutput}
+```
+
+
+### CredStash Key Lookup
+[CredStash](https://github.com/fugue/credstash) is a utility for storing secrets using AWS KMS.
+You can pass these secrets as parameters to your stack.
+If you do so, you should use a CloudFormation parameter with the ["NoEcho" flag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html) to true,
+so as to not expose the secret in the template.
+
+For example:
+```bash
+# Simple key lookup in same region as the stack. Note 3 slashes. Will run `credstash get mykey`.
+${credstash:///mykey}
+
+# Lookup with a key context. Will run `credstash get mykey app=webapp`.
+${credstash:///mykey?app=webapp}
+
+# Lookup a credstash in another region.
+${credstash://ap-southeast-2/mykey?app=webapp}
+```
+
+
+### Route53 Hosted Zone ID Lookup
+Looks up the Route53 hosted zone ID given a hosted zone name (eg: example.com).
+Also allows you to specify if you want the private or public hosted zone for a given name,
+which can be useful if you have set up split-view DNS with both public and private zones for the same name.
+
+```bash
+${hostedzone://example.com}
+${hostedzone://example.com/public}
+${hostedzone://example.com/private}
+```
+
+
 ## Overriding Stack Parameters from the Command Line
 
 Some commands accept a list of parameters that will override those defined in the YAML file.
@@ -205,6 +283,7 @@ $ rake web-uat:apply[instance_type=t2.micro,ami=ami-11032472]
 ## Related Projects
 The following projects provided inspiration for Bora:
 * [CfnDsl](https://github.com/stevenjack/cfndsl) - A Ruby DSL for CloudFormation templates
+* [StackMaster](https://github.com/envato/stack_master) - Very similar in goals to Bora
 * [CloudFormer](https://github.com/kunday/cloudformer) - Rake tasks for CloudFormation
 * [Cumulus](https://github.com/cotdsa/cumulus) - A Python YAML based tool for working with CloudFormation
 

data/bora.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency "aws-sdk", "~> 2.0"
   spec.add_dependency "cfndsl", "~> 0.4"
@@ -26,4 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.12"
 end

data/lib/bora.rb

@@ -6,13 +6,16 @@ require "bora/tasks"
 
 class Bora
   DEFAULT_CONFIG_FILE = "bora.yml"
+  INHERITABLE_PROPERTIES = ["default_region"]
 
-  def initialize(config_file_or_hash: DEFAULT_CONFIG_FILE, colorize: true)
+  def initialize(config_file_or_hash: DEFAULT_CONFIG_FILE, override_config: {}, colorize: true)
     @templates = {}
     config = load_config(config_file_or_hash)
     String.disable_colorization = !colorize
+    raise "No templates defined" if !config['templates']
     config['templates'].each do |template_name, template_config|
-      @templates[template_name] = Template.new(template_name, template_config)
+      resolved_config = resolve_template_config(config, template_config, override_config)
+      @templates[template_name] = Template.new(template_name, resolved_config, override_config)
     end
   end
 
@@ -44,4 +47,15 @@ class Bora
     end
   end
 
+
+  private
+
+  def resolve_template_config(bora_config, template_config, override_config)
+    inheritable_properties(bora_config).merge(template_config).merge(inheritable_properties(override_config))
+  end
+
+  def inheritable_properties(config)
+    config.select { |k| INHERITABLE_PROPERTIES.include?(k) }
+  end
+
 end

data/lib/bora/cfn/stack.rb

@@ -12,8 +12,9 @@ class Bora
     class Stack
       NO_UPDATE_MESSAGE = "No updates are to be performed"
 
-      def initialize(stack_name)
+      def initialize(stack_name, region = nil)
         @stack_name = stack_name
+        @region = region
         @processed_events = Set.new
       end
 
@@ -88,7 +89,9 @@ class Bora
       private
 
       def cloudformation
-        @cfn ||= Aws::CloudFormation::Client.new
+        @cfn ||= begin
+          @region ? Aws::CloudFormation::Client.new(region: @region) : Aws::CloudFormation::Client.new
+        end
       end
 
       def method_missing(sym, *args, &block)

data/lib/bora/cfn/stack_status.rb

@@ -4,6 +4,8 @@ class Bora
   module Cfn
 
     class StackStatus
+      DOES_NOT_EXIST_MESSAGE = "Stack does not exist"
+
       def initialize(underlying_stack)
         @stack = underlying_stack
         if @stack
@@ -24,7 +26,7 @@ class Bora
           status_reason = @stack.stack_status_reason ? " - #{@stack.stack_status_reason}" : ""
           "#{@stack.stack_name} - #{@status}#{status_reason}"
         else
-          "Stack does not exist"
+          DOES_NOT_EXIST_MESSAGE
         end
       end
     end

data/lib/bora/cli.rb

@@ -3,7 +3,17 @@ require "bora"
 
 class Bora
   class Cli < Thor
-    class_option :file, type: :string, aliases: :f, default: Bora::DEFAULT_CONFIG_FILE, desc: "The Bora config file to use"
+    class_option :file,
+      type: :string,
+      aliases: :f,
+      default: Bora::DEFAULT_CONFIG_FILE,
+      desc: "The Bora config file to use"
+
+    class_option :region,
+      type: :string,
+      aliases: :r,
+      default: nil,
+      desc: "The region to use for the stack operation. Overrides any regions specified in the Bora config file."
 
     desc "list", "Lists the available stacks"
     def list
@@ -15,8 +25,9 @@ class Bora
 
     desc "apply STACK_NAME", "Creates or updates the stack"
     option :params, type: :array, aliases: :p, desc: "Parameters to be passed to the template, eg: --params 'instance_type=t2.micro'"
+    option :pretty, type: :boolean, default: false, desc: "Send pretty (formatted) JSON to AWS (only works for cfndsl templates)"
     def apply(stack_name)
-      stack(options.file, stack_name).apply(params)
+      stack(options.file, stack_name).apply(params, options.pretty)
     end
 
     desc "delete STACK_NAME", "Deletes the stack"
@@ -72,7 +83,9 @@ class Bora
     private
 
     def stack(config_file, stack_name)
-      bora = bora(config_file)
+      region = options.region
+      override_config = region ? {"default_region" => region} : {}
+      bora = bora(config_file, override_config)
       stack = bora.stack(stack_name)
       if !stack
         STDERR.puts "Could not find stack #{stack_name}"
@@ -81,8 +94,8 @@ class Bora
       stack
     end
 
-    def bora(config_file)
-      Bora.new(config_file_or_hash: config_file)
+    def bora(config_file, override_config = {})
+      Bora.new(config_file_or_hash: config_file, override_config: override_config)
     end
 
     def params

data/lib/bora/parameter_resolver.rb

@@ -0,0 +1,48 @@
+require 'uri'
+require 'bora/parameter_resolver_loader'
+
+class Bora
+  class ParameterResolver
+    def initialize(stack)
+      @stack = stack
+      @loader = ParameterResolverLoader.new
+      @resolver_cache = {}
+    end
+
+    def resolve(params)
+      params.map { |k, v| [k, process_param_substitutions(v)] }.to_h
+    end
+
+
+    private
+
+    def process_param_substitutions(val)
+      return val unless val.is_a? String
+      old_val = nil
+      while old_val != val
+        old_val = val
+        val = val.sub(/\${[^}]+}/) do |m|
+          token = m[2..-2]
+          uri = parse_uri(token)
+          resolver_name = uri.scheme
+          resolver = @resolver_cache[resolver_name] || @loader.load_resolver(resolver_name).new(@stack)
+          resolver.resolve(uri)
+        end
+      end
+      val
+    end
+
+    def parse_uri(s)
+      uri = URI(s)
+
+      # Support for legacy CFN substitutions without a scheme, eg: ${stack/outputs/foo}.
+      # Will be removed in next breaking version.
+      if !uri.scheme && uri.path && uri.path.count("/") == 2
+        uri = URI("cfn://#{s}")
+      end
+
+      uri
+    end
+
+  end
+end

data/lib/bora/parameter_resolver_loader.rb

@@ -0,0 +1,31 @@
+class Bora
+  class ParameterResolverLoader
+    ResolverNotFound = Class.new(StandardError)
+
+    def load_resolver(name)
+      resolver_class = name.split("_").reject(&:empty?).map { |s| s.capitalize }.join
+      class_name = "Bora::Resolver::#{resolver_class}"
+      begin
+        resolver_class = Kernel.const_get(class_name)
+      rescue NameError
+        require_resolver_file(name)
+        resolver_class = Kernel.const_get(class_name)
+      end
+      resolver_class
+    end
+
+
+    private
+
+    def require_resolver_file(name)
+      require_path = "bora/resolver/#{name}"
+      begin
+        require require_path
+      rescue LoadError
+        raise ResolverNotFound, "Could not find resolver for '#{name}'. Expected to find it at '#{require_path}'"
+      end
+    end
+
+
+  end
+end

data/lib/bora/resolver/cfn.rb

@@ -0,0 +1,40 @@
+require 'bora/cfn/stack'
+
+class Bora
+  module Resolver
+    class Cfn
+      StackDoesNotExist = Class.new(StandardError)
+      ValueNotFound = Class.new(StandardError)
+      InvalidParameter = Class.new(StandardError)
+
+      def initialize(stack)
+        @stack = stack
+        @stack_cache = {}
+      end
+
+      def resolve(uri)
+        stack_name = uri.host
+        section, name = uri.path.split("/").reject(&:empty?)
+        if !stack_name || !section || !name || section != 'outputs'
+          raise InvalidParameter, "Invalid parameter substitution: #{uri}"
+        end
+
+        stack_name, uri_region = stack_name.split(".")
+        region = uri_region || @stack.region
+
+        param_stack = @stack_cache[stack_name] || Bora::Cfn::Stack.new(stack_name, region)
+        if !param_stack.exists?
+          raise StackDoesNotExist, "Output #{name} not found in stack #{stack_name} as the stack does not exist"
+        end
+
+        outputs = param_stack.outputs || []
+        matching_output = outputs.find { |output| output.key == name }
+        if !matching_output
+          raise ValueNotFound, "Output #{name} not found in stack #{stack_name}"
+        end
+
+        matching_output.value
+      end
+    end
+  end
+end

data/lib/bora/resolver/credstash.rb

@@ -0,0 +1,41 @@
+require 'aws-sdk'
+require 'bora/cfn/stack'
+
+class Bora
+  module Resolver
+    class Credstash
+      InvalidParameter = Class.new(StandardError)
+
+      def initialize(stack)
+        @stack = stack
+      end
+
+      def resolve(uri)
+        raise InvalidParameter, "Invalid credstash parameter #{uri}: no credstash key" if !uri.path
+        key = uri.path[1..-1]
+        raise InvalidParameter, "Invalid credstash parameter #{uri}: no credstash key" if !key || key.empty?
+        region = resolve_region(uri, @stack)
+        context = parse_key_context(uri)
+        output = `credstash --region #{region} get #{key}#{context}`
+        exit_code = $?
+        raise NotFound, output if exit_code.exitstatus != 0
+        output.rstrip
+      end
+
+
+      private
+
+      def resolve_region(uri, stack)
+        region = uri.host || stack.region || Aws::CloudFormation::Client.new.config[:region]
+      end
+
+      def parse_key_context(uri)
+        return "" if !uri.query
+        query = URI::decode_www_form(uri.query).to_h
+        context_params = query.map { |k,v| "#{k}=#{v}" }.join(" ")
+        " #{context_params}"
+      end
+
+    end
+  end
+end

data/lib/bora/resolver/hostedzone.rb

@@ -0,0 +1,38 @@
+require 'aws-sdk'
+require 'bora/cfn/stack'
+
+class Bora
+  module Resolver
+    class Hostedzone
+      InvalidParameterError = Class.new(StandardError)
+      NotFoundError = Class.new(StandardError)
+      MultipleMatchesError = Class.new(StandardError)
+
+      def initialize(stack)
+      end
+
+      def resolve(uri)
+        zone_name = uri.host
+        zone_type = uri.path[1..-1]
+        raise InvalidParameterError, "Invalid hostedzone parameter #{uri}" if !zone_name
+        zone_name += "."
+        route53 = Aws::Route53::Client.new
+        res = route53.list_hosted_zones
+        zones = res.hosted_zones.select do |hz|
+          hz.name == zone_name && zone_type_matches(zone_type, hz.config.private_zone)
+        end
+        raise NotFoundError, "Could not find hosted zone #{uri}" if !zones || zones.empty?
+        raise MultipleMatchesError, "Multiple candidates for hosted zone #{uri}. Use public/private discrimiator." if zones.size > 1
+        zones[0].id.split("/")[-1]
+      end
+
+      private
+
+      def zone_type_matches(required_zone_type, is_private_zone)
+        return true if !required_zone_type || required_zone_type.empty?
+        (required_zone_type == "private" && is_private_zone) || (required_zone_type == "public" && !is_private_zone)
+      end
+
+    end
+  end
+end

data/lib/bora/stack.rb

@@ -2,28 +2,39 @@ require 'tempfile'
 require 'colorize'
 require 'cfndsl'
 require 'bora/cfn/stack'
-require 'bora/cfn_param_resolver'
 require 'bora/stack_tasks'
+require 'bora/parameter_resolver'
 
 class Bora
   class Stack
+    STACK_ACTION_SUCCESS_MESSAGE = "%s stack '%s' completed successfully"
+    STACK_ACTION_FAILURE_MESSAGE = "%s stack '%s' failed"
+    STACK_ACTION_NOT_CHANGED_MESSAGE = "%s stack '%s' skipped as template has not changed"
+    STACK_DOES_NOT_EXIST_MESSAGE = "Stack '%s' does not exist"
+    STACK_EVENTS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no events"
+    STACK_EVENTS_MESSAGE = "Events for stack '%s'"
+    STACK_OUTPUTS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no outputs"
+    STACK_VALIDATE_SUCCESS_MESSAGE = "Template for stack '%s' is valid"
+
     def initialize(stack_name, template_file, stack_config)
       @stack_name = stack_name
       @cfn_stack_name = stack_config['stack_name'] || @stack_name
       @template_file = template_file
       @stack_config = stack_config
+      @region = @stack_config['default_region']
       @cfn_options = extract_cfn_options(stack_config)
-      @cfn_stack = Cfn::Stack.new(@cfn_stack_name)
+      @cfn_stack = Cfn::Stack.new(@cfn_stack_name, @region)
+      @resolver = ParameterResolver.new(self)
     end
 
-    attr_reader :stack_name
+    attr_reader :stack_name, :stack_config, :region
 
     def rake_tasks
       StackTasks.new(self)
     end
 
-    def apply(override_params = {})
-      generate(override_params)
+    def apply(override_params = {}, pretty_json = false)
+      generate(override_params, pretty_json)
       success = invoke_action(@cfn_stack.exists? ? "update" : "create", @cfn_options)
       if success
         outputs = @cfn_stack.outputs
@@ -32,6 +43,7 @@ class Bora
           outputs.each { |output| puts output }
         end
       end
+      success
     end
 
     def delete
@@ -47,37 +59,15 @@ class Bora
       events = @cfn_stack.events
       if events
         if events.length > 0
-          puts "Events for stack '#{@cfn_stack_name}'"
-          @cfn_stack.events.each { |e| puts e }
+          puts STACK_EVENTS_MESSAGE % @cfn_stack_name
+          events.each { |e| puts e }
         else
-          puts "Stack '#{@cfn_stack_name}' has no events"
+          puts STACK_EVENTS_DO_NOT_EXIST_MESSAGE % @cfn_stack_name
         end
       else
-        puts "Stack '#{@cfn_stack_name}' does not exist"
-      end
-    end
-
-    def generate(override_params = {})
-      params = process_params(override_params)
-      if File.extname(@template_file) == ".rb"
-        template_body = run_cfndsl(@template_file, params)
-        template_json = JSON.parse(template_body)
-        if template_json["Parameters"]
-          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
-          @cfn_options[:parameters] = cfn_params if !cfn_params.empty?
-        end
-        @cfn_options[:template_body] = template_body
-      else
-        @cfn_options[:template_url] = @template_file
-        if !params.empty?
-          @cfn_options[:parameters] = params.map do |k, v|
-            { parameter_key: k, parameter_value: v }
-          end
-        end
+        puts STACK_DOES_NOT_EXIST_MESSAGE % @cfn_stack_name
       end
+      events
     end
 
     def outputs
@@ -87,11 +77,12 @@ class Bora
           puts "Outputs for stack '#{@cfn_stack_name}'"
           outputs.each { |output| puts output }
         else
-          puts "Stack '#{@cfn_stack_name}' has no outputs"
+          puts STACK_OUTPUTS_DO_NOT_EXIST_MESSAGE % @cfn_stack_name
         end
       else
-        puts "Stack '#{@cfn_stack_name}' does not exist"
+        puts STACK_DOES_NOT_EXIST_MESSAGE % @cfn_stack_name
       end
+      outputs
     end
 
     def recreate(override_params = {})
@@ -106,7 +97,7 @@ class Bora
 
     def show_current
       template = @cfn_stack.template
-      puts template ? template : "Stack '#{@cfn_stack_name}' does not exist"
+      puts template ? template : (STACK_DOES_NOT_EXIST_MESSAGE % @cfn_stack_name)
     end
 
     def status
@@ -115,32 +106,59 @@ class Bora
 
     def validate(override_params = {})
       generate(override_params)
-      puts "Template for stack '#{@cfn_stack_name}' is valid" if @cfn_stack.validate(@cfn_options)
+      is_valid = @cfn_stack.validate(@cfn_options)
+      puts STACK_VALIDATE_SUCCESS_MESSAGE % @cfn_stack_name if is_valid
+      is_valid
     end
 
 
     protected
 
+    def generate(override_params = {}, pretty_json = false)
+      params = process_params(override_params)
+      if File.extname(@template_file) == ".rb"
+        template_body = run_cfndsl(@template_file, params, pretty_json)
+        template_json = JSON.parse(template_body)
+        if template_json["Parameters"]
+          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
+          @cfn_options[:parameters] = cfn_params if !cfn_params.empty?
+        end
+        @cfn_options[:template_body] = template_body
+      else
+        @cfn_options[:template_url] = @template_file
+        if !params.empty?
+          @cfn_options[:parameters] = params.map do |k, v|
+            { parameter_key: k, parameter_value: v }
+          end
+        end
+      end
+    end
+
     def invoke_action(action, *args)
-      puts "#{action.capitalize} stack '#{@cfn_stack_name}'"
+      region_text = @region ? "in region #{@region}" : "in default region"
+      puts "#{action.capitalize} stack '#{@cfn_stack_name}' #{region_text}"
       success = @cfn_stack.send(action, *args) { |event| puts event }
       if success
-        puts "#{action.capitalize} stack '#{@cfn_stack_name}' completed successfully"
+        puts STACK_ACTION_SUCCESS_MESSAGE % [action.capitalize, @cfn_stack_name]
       else
         if success == nil
-          puts "#{action.capitalize} stack '#{@cfn_stack_name}' skipped as template has not changed"
+          puts STACK_ACTION_NOT_CHANGED_MESSAGE % [action.capitalize, @cfn_stack_name]
         else
-          raise("#{action.capitalize} stack '#{@cfn_stack_name}' failed")
+          raise(STACK_ACTION_FAILURE_MESSAGE % [action.capitalize, @cfn_stack_name])
         end
       end
       success
     end
 
-    def run_cfndsl(template_file, params)
+    def run_cfndsl(template_file, params, pretty_json)
       temp_extras = Tempfile.new(["bora", ".yaml"])
       temp_extras.write(params.to_yaml)
       temp_extras.close
-      template_body = CfnDsl.eval_file_with_extras(template_file, [[:yaml, temp_extras.path]]).to_json
+      cfndsl_model = CfnDsl.eval_file_with_extras(template_file, [[:yaml, temp_extras.path]])
+      template_body = pretty_json ? JSON.pretty_generate(cfndsl_model) : cfndsl_model.to_json
       temp_extras.unlink
       template_body
     end
@@ -148,20 +166,7 @@ class Bora
     def process_params(override_params)
       params = @stack_config['params'] || {}
       params.merge!(override_params) if override_params
-      params.map { |k, v| [k, process_param_substitutions(v)] }.to_h
-    end
-
-    def process_param_substitutions(val)
-      return val unless val.is_a? String
-      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
+      @resolver.resolve(params)
     end
 
     def extract_cfn_options(config)

data/lib/bora/template.rb

@@ -2,13 +2,15 @@ require 'bora/stack'
 
 class Bora
   class Template
-    def initialize(template_name, template_config)
+    INHERITABLE_PROPERTIES = ["capabilities", "default_region"]
+
+    def initialize(template_name, template_config, override_config = {})
       @template_name = template_name
       @template_config = template_config
       @stacks = {}
       template_config['stacks'].each do |stack_name, stack_config|
         stack_name = "#{template_name}-#{stack_name}"
-        stack_config = resolve_stack_config(template_config, stack_config)
+        stack_config = resolve_stack_config(template_config, stack_config, override_config)
         @stacks[stack_name] = Stack.new(stack_name, template_config['template_file'], stack_config)
       end
     end
@@ -28,13 +30,12 @@ class Bora
 
     private
 
-    def resolve_stack_config(template_config, stack_config)
-      extract_cfn_options(template_config).merge(stack_config)
+    def resolve_stack_config(template_config, stack_config, override_config)
+      inheritable_properties(template_config).merge(stack_config).merge(inheritable_properties(override_config))
     end
 
-    def extract_cfn_options(config)
-      valid_options = ["capabilities"]
-      config.select { |k| valid_options.include?(k) }
+    def inheritable_properties(config)
+      config.select { |k| INHERITABLE_PROPERTIES.include?(k) }
     end
 
   end

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 class Bora
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 description: 
 email:
 - charles.blaxland@gmail.com
@@ -147,8 +161,12 @@ files:
 - lib/bora/cfn/stack.rb
 - lib/bora/cfn/stack_status.rb
 - lib/bora/cfn/status.rb
-- lib/bora/cfn_param_resolver.rb
 - lib/bora/cli.rb
+- lib/bora/parameter_resolver.rb
+- lib/bora/parameter_resolver_loader.rb
+- lib/bora/resolver/cfn.rb
+- lib/bora/resolver/credstash.rb
+- lib/bora/resolver/hostedzone.rb
 - lib/bora/stack.rb
 - lib/bora/stack_tasks.rb
 - lib/bora/tasks.rb
@@ -165,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/bora/cfn_param_resolver.rb

@@ -1,30 +0,0 @@
-require 'bora/cfn/stack'
-
-class Bora
-  class CfnParamResolver
-    def initialize(param)
-      @param = param
-    end
-
-    def resolve
-      stack_name, section, name = @param.split("/")
-      if !stack_name || !section || !name || section != 'outputs'
-        raise "Invalid parameter substitution: #{@param}"
-      end
-
-      stack = Cfn::Stack.new(stack_name)
-      if !stack.exists?
-        raise "Output #{name} not found in stack #{stack_name} as the stack does not exist"
-      end
-
-      outputs = stack.outputs || []
-      matching_output = outputs.find { |output| output.key == name }
-      if !matching_output
-        raise "Output #{name} not found in stack #{stack_name}"
-      end
-
-      matching_output.value
-    end
-
-  end
-end