bora 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cd2cfc5042845d206c5fdd8916b6a0212fc943c
-  data.tar.gz: 3a0f73e893cb10e2d871bfe2e8e364fa9500aaf3
+  metadata.gz: bda479f0f99b528601bf7581eb924ea786ccdcb7
+  data.tar.gz: 1318e90d4665d1185c07385d684d36d2b1d0fd44
 SHA512:
-  metadata.gz: 90dd31bc2e7058cf9e65d9c17d30936c5891943c8d390528e721012b64aef849aa9917192589a316915026af429df1e9ecdec107cfbffdb45f7b364eee0cf4c2
-  data.tar.gz: 5669c210393f07cf5c337c911f6a885e29d8dd1d3bd139162e5d02d87eeeff40a6d7bf271cbcd9018ce056e020635fd70ec8625c5a9a80d2f714729bf4efb11c
+  metadata.gz: c28c0dae89eacea8416d327764a9c1eae4a45cf8a32c230a31c3f7727363ac7a7c4063c66d94fd5d80e26e770205a31c81fd5ffce9e4bedf4e88410d0382146d
+  data.tar.gz: 8d2017b83d7b70aa761c5ec03ec3306de17673bc8f6a268a3c0d8c7733102eebfc4698cdfeda62b6dfd39d4e5120dcf0a4c6318b0e6695e394dc7283352a6f8f

data/README.md

@@ -230,6 +230,16 @@ params:
   url: http://${domain}/foo
 ```
 
+This even works within array or hash parameters,
+although you can only look up values from the top level params.
+
+```yaml
+params:
+  domain: example.com
+  site_config:
+    url: http://${domain}/foo
+```
+
 
 ### Stack Output Lookup
 
@@ -274,7 +284,14 @@ ${hostedzone://example.com}
 ${hostedzone://example.com/public}
 ${hostedzone://example.com/private}
 ```
+### AMI Lookup
+
+Looks up an AMI given a name prefix which may contain wildcards. If query returns multiple images the latest is used.
 
+```bash
+${ami://amzn-ami-hv*x86_64-gp2?owner=amazon}
+${ami://my-windows-soe}
+```
 
 ## Overriding Stack Parameters from the Command Line
 

data/lib/bora/parameter_resolver.rb

@@ -35,10 +35,17 @@ class Bora
     private
 
     def process_param_substitutions(val, params)
-      return val unless val.is_a? String
-      val.gsub(PLACEHOLDER_REGEX) do |placeholder|
-        process_placeholder(placeholder, params)
+      result = val
+      if val.is_a? String
+        result = val.gsub(PLACEHOLDER_REGEX) do |placeholder|
+          process_placeholder(placeholder, params)
+        end
+      elsif val.is_a? Array
+        result = val.map { |i| process_param_substitutions(i, params) }
+      elsif val.is_a? Hash
+        result = val.map { |k, v| [k, process_param_substitutions(v, params)] }.to_h
       end
+      result
     end
 
     def process_placeholder(placeholder, params)
@@ -46,17 +53,25 @@ class Bora
       if !uri.scheme
         # This token refers to another parameter, rather than a resolver
         value_to_substitute = params[uri.path]
-        !value_to_substitute || has_unresolved_placeholder?(value_to_substitute) ? placeholder : value_to_substitute
+        return !value_to_substitute || has_unresolved_placeholder?(value_to_substitute) ? placeholder : value_to_substitute
       else
         # This token needs to be resolved by a resolver
         resolver_name = uri.scheme
         resolver = @resolver_cache[resolver_name] || @loader.load_resolver(resolver_name).new(@stack)
-        resolver.resolve(uri)
+        return resolver.resolve(uri)
       end
     end
 
     def has_unresolved_placeholder?(val)
-      val =~ PLACEHOLDER_REGEX
+      result = false
+      if val.is_a? String
+        result = val =~ PLACEHOLDER_REGEX
+      elsif val.is_a? Array
+        result = val.find { |i| has_unresolved_placeholder?(i) }
+      elsif val.is_a? Hash
+        result = val.find { |_, v| has_unresolved_placeholder?(v) }
+      end
+      result
     end
 
     def parse_uri(s)

data/lib/bora/resolver/ami.rb

@@ -0,0 +1,42 @@
+require 'bora/cfn/stack'
+
+class Bora
+  module Resolver
+    class Ami
+      NoAMI = Class.new(StandardError)
+      InvalidParameter = Class.new(StandardError)
+
+      def initialize(stack)
+        @stack = stack
+      end
+
+      def resolve(uri)
+        owner = 'self' # Default to account owner
+        ami_prefix = uri.host
+        raise InvalidParameter, "Invalid ami parameter #{uri}" unless ami_prefix
+        if !uri.query.nil? && uri.query.include?('owner')
+          query = URI.decode_www_form(uri.query).to_h
+          owner = query['owner']
+        end
+
+        ec2 = Aws::EC2::Client.new(region: @stack.region)
+        images = ec2.describe_images(
+          owners: [owner],
+          filters: [
+            {
+              name:   'name',
+              values: [ami_prefix]
+            },
+            {
+              name:   'state',
+              values: ['available']
+            }
+          ]
+        ).images
+
+        raise NoAMI, "No Matching AMI's for prefix #{ami_prefix}" if images.empty?
+        images.sort! { |a, b| DateTime.parse(a.creation_date) <=> DateTime.parse(b.creation_date) }.last.image_id
+      end
+    end
+  end
+end

data/lib/bora/resolver/credstash.rb

@@ -26,7 +26,7 @@ class Bora
       private
 
       def resolve_region(uri, stack)
-        region = uri.host || stack.region || Aws::CloudFormation::Client.new.config[:region]
+        region = uri.host || stack.region
       end
 
       def parse_key_context(uri)

data/lib/bora/stack.rb

@@ -17,6 +17,8 @@ class Bora
     STACK_OUTPUTS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no outputs"
     STACK_PARAMETERS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no parameters"
     STACK_VALIDATE_SUCCESS_MESSAGE = "Template for stack '%s' is valid"
+    STACK_DIFF_TEMPLATE_UNCHANGED_MESSAGE = "Template has not changed"
+    STACK_DIFF_PARAMETERS_UNCHANGED_MESSAGE = "Parameters have not changed"
 
     def initialize(stack_name, template_file, stack_config)
       @stack_name = stack_name
@@ -26,7 +28,7 @@ class Bora
       end
       @template_file = template_file
       @stack_config = stack_config
-      @region = @stack_config['default_region']
+      @region = @stack_config['default_region'] || Aws::CloudFormation::Client.new.config[:region]
       @cfn_options = extract_cfn_options(stack_config)
       @cfn_stack = Cfn::Stack.new(@cfn_stack_name, @region)
       @resolver = ParameterResolver.new(self)
@@ -57,23 +59,8 @@ class Bora
 
     def diff(override_params = {}, context_lines = 3)
       generate(override_params)
-      diff = Diffy::Diff.new(@cfn_stack.template, @cfn_stack.new_template(@cfn_options),
-              context: context_lines,
-              include_diff_info: true)
-      diff = diff.reject { |line| line =~ /^(---|\+\+\+|\\\\)/ }
-      diff = diff.map do |line|
-        case line
-        when /^\+/
-          line.chomp.colorize(:green)
-        when /^-/
-          line.chomp.colorize(:red)
-        when /^@@/
-          line.chomp.colorize(:cyan)
-        else
-          line.chomp
-        end
-      end
-      puts diff.join("\n")
+      diff_parameters
+      diff_template(override_params, context_lines)
     end
 
     def events
@@ -156,6 +143,52 @@ class Bora
 
     protected
 
+    def diff_parameters
+      if @cfn_stack.parameters && !@cfn_stack.parameters.empty?
+        current_params = @cfn_stack.parameters.sort { |a, b| a.key <=> b.key }.map(&:to_s).join("\n") + "\n"
+      end
+      if @cfn_options[:parameters] && !@cfn_options[:parameters].empty?
+        new_params = @cfn_options[:parameters].sort { |a, b|
+          a[:parameter_key] <=> b[:parameter_key]
+        }.map { |p|
+          "#{p[:parameter_key] } - #{p[:parameter_value]}"
+        }.join("\n") + "\n"
+      end
+
+      if current_params || new_params
+        puts "Parameters".colorize(mode: :bold)
+        puts "----------"
+        diff = Diffy::Diff.new(current_params, new_params).to_s(String.disable_colorization ? :text : :color).chomp
+        puts diff && !diff.empty? ? diff : STACK_DIFF_PARAMETERS_UNCHANGED_MESSAGE
+        puts
+      end
+    end
+
+    def diff_template(override_params, context_lines)
+      diff = Diffy::Diff.new(@cfn_stack.template, @cfn_stack.new_template(@cfn_options),
+              context: context_lines,
+              include_diff_info: true)
+      diff = diff.reject { |line| line =~ /^(---|\+\+\+|\\\\)/ }
+      diff = diff.map do |line|
+        case line
+        when /^\+/
+          line.chomp.colorize(:green)
+        when /^-/
+          line.chomp.colorize(:red)
+        when /^@@/
+          line.chomp.colorize(:cyan)
+        else
+          line.chomp
+        end
+      end
+      diff = diff.join("\n")
+
+      puts "Template".colorize(mode: :bold)
+      puts "--------"
+      puts diff && !diff.empty? ? diff : STACK_DIFF_TEMPLATE_UNCHANGED_MESSAGE
+      puts
+    end
+
     def generate(override_params = {}, pretty_json = false)
       params = resolved_params(override_params)
       if File.extname(@template_file) == ".rb"
@@ -180,8 +213,7 @@ class Bora
     end
 
     def invoke_action(action, *args)
-      region_text = @region ? "in region #{@region}" : "in default region"
-      puts "#{action.capitalize} stack '#{@cfn_stack_name}' #{region_text}"
+      puts "#{action.capitalize} stack '#{@cfn_stack_name}' in region #{@region}"
       success = @cfn_stack.send(action, *args) { |event| puts event }
       if success
         puts STACK_ACTION_SUCCESS_MESSAGE % [action.capitalize, @cfn_stack_name]
@@ -205,12 +237,6 @@ class Bora
       template_body
     end
 
-    def process_params(override_params)
-      params = @stack_config['params'] || {}
-      params.merge!(override_params) if override_params
-      @resolver.resolve(params)
-    end
-
     def extract_cfn_options(config)
       valid_options = ["capabilities"]
       config.select { |k| valid_options.include?(k) }

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 class Bora
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -165,6 +165,7 @@ files:
 - lib/bora/cli.rb
 - lib/bora/parameter_resolver.rb
 - lib/bora/parameter_resolver_loader.rb
+- lib/bora/resolver/ami.rb
 - lib/bora/resolver/cfn.rb
 - lib/bora/resolver/credstash.rb
 - lib/bora/resolver/hostedzone.rb