sfn 3.0.24 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c7a832bd18a4660d0184280dc1818f2fe13aeaa
-  data.tar.gz: 6fd33f44b62ac8c3ca7836963e9c22ba355d5e9a
+  metadata.gz: 1000514f95a36a106dc13fd6eaf7a38a9e716776
+  data.tar.gz: fc0d733bafcd09198a2a56252c574956ded1ae22
 SHA512:
-  metadata.gz: 7a2392c1bbfe0bd9f7a1c5bebf5f1c9ec316a262286757cecbdfd9b56df3c8bc1bb7e79b606f993149f3f5994fa31d8bc4a69644f0f9ab7dcc1d1978da247eec
-  data.tar.gz: f66df1b8a616ed132f51a2ec06d7495fc3eb93499d79171b16f38a4346fe7f67900a0e76d70eb99c57ba1e768f070985c9cae112f45020f2a8a7327b0b854d5c
+  metadata.gz: 7ef25e6f6722a338b428d5707dde1912d0c94a8c3adab30a297fe9ad830f0cbc415eff1130e3f824bcc0d46bd2f6e423259595f6093486dd3efe51d50e8d801c
+  data.tar.gz: a179f76dd94173102a5e6d07fb20e91a4f689b21a02a6d79024d09bc10c373dee37403f8e15e7152692642de738c457039d76523c9a5c693408e195df8e2b4dc

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.0.26
+* [fix] Properly support compile time parameter setting with/without stack name (#261)
+* [fix] Default stack name when storing policy internally if no name provided
+* [fix] Apply stack parameters via accessor on update so changes are detected properly
+* [fix] Prevent planner from splitting non-String values
+* [fix] Process template through grapher as dumped Hash, error on non-AWS providers
+* [enhancement] Support processing complex compile time parameter types
+
 # v3.0.24
 * [fix] Quieter print only output (#258)
 * [fix] Require all modules for lint (#248)

data/lib/sfn/callback/stack_policy.rb

@@ -63,7 +63,7 @@ module Sfn
       # @param info [Hash]
       def template(info)
         if(info[:sparkle_stack])
-          @policies.set(info[:stack_name],
+          @policies.set(info.fetch(:stack_name, 'unknown'),
             info[:sparkle_stack].generate_policy
           )
         end

data/lib/sfn/command/graph.rb

@@ -21,34 +21,40 @@ module Sfn
         config[:print_only] = true
         validate_graph_style!
         file = load_template_file
-        @outputs = Smash.new
-        ui.info "Template resource graph generation - Style: #{ui.color(config[:graph_style], :bold)}"
-        if(config[:file])
-          ui.puts "  -> path: #{config[:file]}"
-        end
-        run_action 'Pre-processing template for graphing' do
-          output_discovery(file, @outputs, nil, nil)
-          ui.debug 'Output remapping results from pre-processing:'
-          @outputs.each_pair do |o_key, o_value|
-            ui.debug "#{o_key} -> #{o_value}"
+        if(file.provider == :aws)
+          @outputs = Smash.new
+          ui.info "Template resource graph generation - Style: #{ui.color(config[:graph_style], :bold)}"
+          if(config[:file])
+            ui.puts "  -> path: #{config[:file]}"
           end
-          nil
-        end
-        graph = nil
-        run_action 'Generating resource graph' do
-          graph = generate_graph(file)
-          nil
-        end
-        run_action 'Writing graph result' do
-          FileUtils.mkdir_p(File.dirname(config[:output_file]))
-          if(config[:output_type] == 'dot')
-            File.open("#{config[:output_file]}.dot", 'w') do |o_file|
-              o_file.puts graph.to_s
+          template_dump = file.compile.dump!.to_smash
+          run_action 'Pre-processing template for graphing' do
+            output_discovery(template_dump, @outputs, nil, nil)
+            ui.debug 'Output remapping results from pre-processing:'
+            @outputs.each_pair do |o_key, o_value|
+              ui.debug "#{o_key} -> #{o_value}"
             end
-          else
-            graph.save config[:output_file], config[:output_type]
+            nil
+          end
+          graph = nil
+          run_action 'Generating resource graph' do
+            graph = generate_graph(template_dump)
+            nil
           end
-          nil
+          run_action 'Writing graph result' do
+            FileUtils.mkdir_p(File.dirname(config[:output_file]))
+            if(config[:output_type] == 'dot')
+              File.open("#{config[:output_file]}.dot", 'w') do |o_file|
+                o_file.puts graph.to_s
+              end
+            else
+              graph.save config[:output_file], config[:output_type]
+            end
+            nil
+          end
+        else
+          ui.error "Graphing for provider `#{file.provider}` not currently supported."
+          ui.error "Currently supported providers: `aws`."
         end
       end
 
@@ -72,11 +78,11 @@ module Sfn
       end
 
       def output_discovery(template, outputs, resource_name, parent_template, name='')
-        unless(template.resources.nil?)
-          template.resources.keys!.each do |r_name|
-            r_info = template.resources[r_name]
-            if(r_info.type == template._self.stack_resource_name)
-              output_discovery(r_info.properties.stack, outputs, r_name, template, r_name)
+        if(template['Resources'])
+          template['Resources'].keys.each do |r_name|
+            r_info = template['Resources'][r_name]
+            if(r_info['Type'] == 'AWS::CloudFormation::Stack')
+              output_discovery(r_info['Properties']['Stack'], outputs, r_name, template, r_name)
             end
           end
         end

data/lib/sfn/command/update.rb

@@ -51,6 +51,8 @@ module Sfn
           ui.debug "Compile parameters - #{config[:compile_parameters]}"
           file = load_template_file(:stack => stack)
           stack_info << " #{ui.color('Path:', :bold)} #{config[:file]}"
+        else
+          file = stack.template.dup if config[:plan]
         end
 
         unless(stack)
@@ -114,20 +116,20 @@ module Sfn
             end
           end
           stack.parameters = config_root_parameters
+
+          if(config[:upload_root_template])
+            upload_result = store_template(name, file, Smash.new)
+            stack.template_url = upload_result[:url]
+          else
+            stack.template = parameter_scrub!(template_content(file, :scrub))
+          end
         else
           apply_stacks!(stack)
           original_parameters = stack.parameters
-          populate_parameters!(file, :current_parameters => stack.root_parameters)
+          populate_parameters!(stack.template, :current_parameters => stack.root_parameters)
           stack.parameters = config_root_parameters
         end
 
-        if(config[:upload_root_template])
-          upload_result = store_template(name, file, Smash.new)
-          stack.template_url = upload_result[:url]
-        else
-          stack.template = parameter_scrub!(template_content(file, :scrub))
-        end
-
         # Set options defined within config into stack instance for update request
         if(config[:merge_api_options])
           config.fetch(:options, Smash.new).each_pair do |key, value|

data/lib/sfn/command_module/template.rb

@@ -48,57 +48,67 @@ module Sfn
         def request_compile_parameter(p_name, p_config, cur_val, nested=false)
           result = nil
           attempts = 0
-          unless(cur_val || p_config[:default].nil?)
-            cur_val = p_config[:default]
-          end
-          if(cur_val.is_a?(Array))
-            cur_val = cur_val.map(&:to_s).join(',')
-          end
-          until(result && (!result.respond_to?(:empty?) || !result.empty?))
-            attempts += 1
-            if(config[:interactive_parameters] && (!nested || !p_config.key?(:prompt_when_nested) || p_config[:prompt_when_nested] == true))
-              result = ui.ask_question(
-                p_name.to_s.split('_').map(&:capitalize).join,
-                :default => cur_val.to_s.empty? ? nil : cur_val.to_s
-              )
+          parameter_type = p_config.fetch(:type, 'string').to_s.downcase.to_sym
+          if(parameter_type == :complex)
+            ui.debug "Compile time parameter `#{p_name}` is a complex type. Not requesting value from user."
+            if(cur_val.nil?)
+              raise ArgumentError.new "No value provided for `#{p_name}` parameter (Complex data type)"
             else
-              result = cur_val.to_s
+              cur_val
+            end
+          else
+            unless(cur_val || p_config[:default].nil?)
+              cur_val = p_config[:default]
+            end
+            if(cur_val.is_a?(Array))
+              cur_val = cur_val.map(&:to_s).join(',')
             end
-            case p_config.fetch(:type, 'string').to_s.downcase.to_sym
-            when :string
-              if(p_config[:multiple])
-                result = result.split(',').map(&:strip)
+            until(result && (!result.respond_to?(:empty?) || !result.empty?))
+              attempts += 1
+              if(config[:interactive_parameters] && (!nested || !p_config.key?(:prompt_when_nested) || p_config[:prompt_when_nested] == true))
+                result = ui.ask_question(
+                  p_name.to_s.split('_').map(&:capitalize).join,
+                  :default => cur_val.to_s.empty? ? nil : cur_val.to_s
+                )
+              else
+                result = cur_val.to_s
               end
-            when :number
-              if(p_config[:multiple])
-                result = result.split(',').map(&:strip)
-                new_result = result.map do |item|
-                  new_item = item.to_i
-                  new_item if new_item.to_s == item
+              case parameter_type
+              when :string
+                if(p_config[:multiple])
+                  result = result.split(',').map(&:strip)
+                end
+              when :number
+                if(p_config[:multiple])
+                  result = result.split(',').map(&:strip)
+                  new_result = result.map do |item|
+                    new_item = item.to_i
+                    new_item if new_item.to_s == item
+                  end
+                  result = new_result.size == result.size ? new_result : []
+                else
+                  new_result = result.to_i
+                  result = new_result.to_s == result ? new_result : nil
                 end
-                result = new_result.size == result.size ? new_result : []
               else
-                new_result = result.to_i
-                result = new_result.to_s == result ? new_result : nil
+                raise ArgumentError.new "Unknown compile time parameter type provided: `#{p_config[:type].inspect}` (Parameter: #{p_name})"
               end
-            else
-              raise ArgumentError.new "Unknown compile time parameter type provided: `#{p_config[:type].inspect}` (Parameter: #{p_name})"
-            end
-            valid = validate_parameter(result, p_config.to_smash)
-            unless(valid == true)
-              result = nil
-              valid.each do |invalid_msg|
-                ui.error invalid_msg.last
+              valid = validate_parameter(result, p_config.to_smash)
+              unless(valid == true)
+                result = nil
+                valid.each do |invalid_msg|
+                  ui.error invalid_msg.last
+                end
               end
-            end
-            if(result.nil? || (result.respond_to?(:empty?) && result.empty?))
-              if(attempts > MAX_PARAMETER_ATTEMPTS)
-                ui.fatal "Failed to receive allowed parameter! (Parameter: #{p_name})"
-                exit 1
+              if(result.nil? || (result.respond_to?(:empty?) && result.empty?))
+                if(attempts > MAX_PARAMETER_ATTEMPTS)
+                  ui.fatal "Failed to receive allowed parameter! (Parameter: #{p_name})"
+                  exit 1
+                end
               end
             end
+            result
           end
-          result
         end
 
         # @return [Array<SparkleFormation::SparklePack>]
@@ -253,7 +263,7 @@ module Sfn
           ui.debug "Initial compile parameters - #{compile_state}"
           compile_state.keys.each do |cs_key|
             unless(cs_key.to_s.start_with?("#{arguments.first}__"))
-              named_cs_key = "#{arguments.first}__#{cs_key}"
+              named_cs_key = [arguments.first, cs_key].compact.join('__')
               non_named = compile_state.delete(cs_key)
               if(non_named && !compile_state.key?(named_cs_key))
                 ui.debug "Setting non-named compile parameter `#{cs_key}` into `#{named_cs_key}`"

data/lib/sfn/monkey_patch/stack.rb

@@ -213,7 +213,7 @@ module Sfn
                 end
               end
               if(p_key)
-                parameters.merge!(p_key => output.value)
+                self.parameters = parameters.merge(p_key => output.value)
               end
             end
           end

data/lib/sfn/planner/aws.rb

@@ -169,7 +169,12 @@ module Sfn
         # @param value [Array<String,Array<String>>]
         # @return [String]
         def fn_join(value)
-          value.last.join(value.first)
+          unless(value.last.is_a?(Array))
+            val = value.last.to_s.split(',')
+          else
+            val = value.last
+          end
+          val.join(value.first)
         end
 
         # Lookup value in mappings

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('3.0.24')
+  VERSION = Gem::Version.new('3.0.26')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.26
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli