bora 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda479f0f99b528601bf7581eb924ea786ccdcb7
-  data.tar.gz: 1318e90d4665d1185c07385d684d36d2b1d0fd44
+  metadata.gz: a0e4a8a4f46e58395bd724d7b5b43e47682aa4ad
+  data.tar.gz: 9f457db9cd67e8b64d6c23d2424491f69cd8977f
 SHA512:
-  metadata.gz: c28c0dae89eacea8416d327764a9c1eae4a45cf8a32c230a31c3f7727363ac7a7c4063c66d94fd5d80e26e770205a31c81fd5ffce9e4bedf4e88410d0382146d
-  data.tar.gz: 8d2017b83d7b70aa761c5ec03ec3306de17673bc8f6a268a3c0d8c7733102eebfc4698cdfeda62b6dfd39d4e5120dcf0a4c6318b0e6695e394dc7283352a6f8f
+  metadata.gz: 000fe250f567e4e7e9ad734fdab2f3c8d0783e0d688492163690849cb60c1111e9932267393edce64c7bf856ec7bf1b4b03e925eb4cd9559f6280f0ff6b0dea2
+  data.tar.gz: db0d0bde5699eff9255cf38e98419ca46805b0d57f84505e6568ef42568f7294f82238fd66a28f52109559a8248a946de025ad33b84928ccb08aa454268ea5e6

data/lib/bora/cfn/stack.rb

@@ -55,26 +55,13 @@ class Bora
         underlying_stack.parameters.map { |parameter| Parameter.new(parameter) }
       end
 
-      def template(pretty = true)
+      def template
         return if !exists?
-        template = cloudformation.get_template({stack_name: @stack_name}).template_body
-        template = JSON.pretty_generate(JSON.parse(template)) if pretty
-        template
-      end
-
-      def new_template(options, pretty = true)
-        options = resolve_options(options, true)
-        template = options[:template_body]
-        if template
-          template = JSON.pretty_generate(JSON.parse(template)) if pretty
-          template
-        else
-          raise "new_template not yet implemented for URL #{options[:template_url]}"
-        end
+        cloudformation.get_template({stack_name: @stack_name}).template_body
       end
 
       def validate(options)
-        cloudformation.validate_template(resolve_options(options).select { |k| [:template_body, :template_url].include?(k) })
+        cloudformation.validate_template(options.select { |k| [:template_body, :template_url].include?(k) })
       end
 
       def status
@@ -104,7 +91,7 @@ class Bora
         return true if action == :delete && !exists?
         @previous_event_time = last_event_time
         begin
-          action_options = {stack_name: @stack_name}.merge(resolve_options(options))
+          action_options = {stack_name: @stack_name}.merge(options)
           cloudformation.method("#{action.to_s.downcase}_stack").call(action_options)
           wait_for_completion(&block)
         rescue Aws::CloudFormation::Errors::ValidationError => e
@@ -114,19 +101,6 @@ class Bora
         (action == :delete && !underlying_stack) || status.success?
       end
 
-      def resolve_options(options, load_all = false)
-        return options if options[:template_body] || !options[:template_url]
-        uri = URI(options[:template_url])
-        if uri.scheme != "s3" || load_all
-          resolved_options = options.clone
-          resolved_options[:template_body] = open(options[:template_url]).read
-          resolved_options.delete(:template_url)
-          resolved_options
-        else
-          options
-        end
-      end
-
       def wait_for_completion
         begin
           events = unprocessed_events

data/lib/bora/stack.rb

@@ -29,7 +29,6 @@ class Bora
       @template_file = template_file
       @stack_config = stack_config
       @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)
     end
@@ -41,8 +40,8 @@ class Bora
     end
 
     def apply(override_params = {}, pretty_json = false)
-      generate(override_params, pretty_json)
-      success = invoke_action(@cfn_stack.exists? ? "update" : "create", @cfn_options)
+      cfn_options = generate(override_params, pretty_json)
+      success = invoke_action(@cfn_stack.exists? ? "update" : "create", cfn_options)
       if success
         outputs = @cfn_stack.outputs
         if outputs && outputs.length > 0
@@ -58,9 +57,9 @@ class Bora
     end
 
     def diff(override_params = {}, context_lines = 3)
-      generate(override_params)
-      diff_parameters
-      diff_template(override_params, context_lines)
+      cfn_options = generate(override_params)
+      diff_parameters(cfn_options)
+      diff_template(override_params, context_lines, cfn_options)
     end
 
     def events
@@ -109,17 +108,17 @@ class Bora
     end
 
     def recreate(override_params = {})
-      generate(override_params)
-      invoke_action("recreate", @cfn_options)
+      cfn_options = generate(override_params)
+      invoke_action("recreate", cfn_options)
     end
 
     def show(override_params = {})
-      generate(override_params)
-      puts @cfn_stack.new_template(@cfn_options)
+      cfn_options = generate(override_params)
+      puts get_new_template(cfn_options)
     end
 
     def show_current
-      template = @cfn_stack.template
+      template = get_current_template
       puts template ? template : (STACK_DOES_NOT_EXIST_MESSAGE % @cfn_stack_name)
     end
 
@@ -128,8 +127,8 @@ class Bora
     end
 
     def validate(override_params = {})
-      generate(override_params)
-      is_valid = @cfn_stack.validate(@cfn_options)
+      cfn_options = generate(override_params)
+      is_valid = @cfn_stack.validate(cfn_options)
       puts STACK_VALIDATE_SUCCESS_MESSAGE % @cfn_stack_name if is_valid
       is_valid
     end
@@ -143,29 +142,58 @@ 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
+    def diff_parameters(cfn_options)
+      current_params = current_cfn_parameters
+      new_params = new_bora_parameters(cfn_options)
+      default_params = template_default_parameters(cfn_options)
+      new_params = default_params.merge(new_params || {}) if default_params
 
-      if current_params || new_params
+      current_params_str = params_as_string(current_params)
+      new_params_str = params_as_string(new_params)
+      if current_params_str || new_params_str
         puts "Parameters".colorize(mode: :bold)
         puts "----------"
-        diff = Diffy::Diff.new(current_params, new_params).to_s(String.disable_colorization ? :text : :color).chomp
+        diff = Diffy::Diff.new(current_params_str, new_params_str).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),
+    def params_as_string(params)
+      params ? params.sort.map {|k, v| "#{k} - #{v}" }.join("\n") + "\n" : nil
+    end
+
+    def template_default_parameters(cfn_options)
+      params = nil
+      template = JSON.parse(cfn_options[:template_body])
+      if template["Parameters"]
+        params_with_defaults = template["Parameters"].select { |_, v| v["Default"] }
+        if !params_with_defaults.empty?
+          params = params_with_defaults.map { |k, v| [k, v["Default"]] }.to_h
+        end
+      end
+      params
+    end
+
+    def current_cfn_parameters
+      params = nil
+      if @cfn_stack.parameters && !@cfn_stack.parameters.empty?
+        params = @cfn_stack.parameters.map { |p| [p.key, p.value] }.to_h
+      end
+      params
+    end
+
+    def new_bora_parameters(cfn_options)
+      params = nil
+      cfn_parameters = cfn_options[:parameters]
+      if cfn_parameters && !cfn_parameters.empty?
+        params = cfn_parameters.map { |p| [p[:parameter_key], p[:parameter_value]] }.to_h
+      end
+      params
+    end
+
+    def diff_template(override_params, context_lines, cfn_options)
+      diff = Diffy::Diff.new(get_current_template, get_new_template(cfn_options),
               context: context_lines,
               include_diff_info: true)
       diff = diff.reject { |line| line =~ /^(---|\+\+\+|\\\\)/ }
@@ -190,6 +218,7 @@ class Bora
     end
 
     def generate(override_params = {}, pretty_json = false)
+      cfn_options = cfn_options_from_stack_config
       params = resolved_params(override_params)
       if File.extname(@template_file) == ".rb"
         template_body = run_cfndsl(@template_file, params, pretty_json)
@@ -199,17 +228,18 @@ class Bora
           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?
+          cfn_options[:parameters] = cfn_params if !cfn_params.empty?
         end
-        @cfn_options[:template_body] = template_body
+        cfn_options[:template_body] = template_body
       else
-        @cfn_options[:template_url] = @template_file
+        cfn_options[:template_body] = File.read(@template_file)
         if !params.empty?
-          @cfn_options[:parameters] = params.map do |k, v|
+          cfn_options[:parameters] = params.map do |k, v|
             { parameter_key: k, parameter_value: v }
           end
         end
       end
+      cfn_options
     end
 
     def invoke_action(action, *args)
@@ -237,9 +267,19 @@ class Bora
       template_body
     end
 
-    def extract_cfn_options(config)
+    def cfn_options_from_stack_config
       valid_options = ["capabilities"]
-      config.select { |k| valid_options.include?(k) }
+      @stack_config.select { |k| valid_options.include?(k) }
+    end
+
+    def get_new_template(cfn_options)
+      template = cfn_options[:template_body]
+      JSON.pretty_generate(JSON.parse(template))
+    end
+
+    def get_current_template
+      template = @cfn_stack.template
+      template ? JSON.pretty_generate(JSON.parse(template)) : nil
     end
 
   end

data/lib/bora/tasks.rb

@@ -20,8 +20,11 @@ class Bora
         if @stack_options[:template_body] || @stack_options[:template_url]
           raise "You cannot specify a template in the constructor as well as in the stack_options"
         else
-          @stack_options[:template_url] = template_uri
+          @stack_options[:template_body] = File.read(template_uri)
         end
+      elsif @stack_options[:template_url]
+        @stack_options[:template_body] = File.read(@stack_options[:template_url])
+        @stack_options.delete(:template_url)
       end
 
       define_tasks

data/lib/bora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk