sfn 3.0.20 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7f6574c00a8cf09a14557610e3a00ea89e22d0
-  data.tar.gz: e606f5fd3a2b9a9ba7b6ddad048a138d52259ea3
+  metadata.gz: 279982d00c24881c257eff78a3d14ed604952146
+  data.tar.gz: 9a093919f17154f3fc20920b933691f0438c0583
 SHA512:
-  metadata.gz: 29704f3a0467a4e32a597b3565598852f5f38e15e6964d5f869930d46db46fbf0a9affea9605cbc8dac0f61267f1b63d2cb3c307b81e77d132d90f27932eda69
-  data.tar.gz: 8985b3018da481d53f3214aa9302b58d5800730c94e16d42baa9b94ba9976b214ec7f759b80d4337ac9d51f19d45672e52acfdbe1ced3abefaa7ea3c48dffe1f
+  metadata.gz: 01741b34e7ef10214fa4f8902d2d35d1f175752d822f632e8f21e20ffdf5721e0a667fdf2f5ed1d5d56c87e87d3c8afb24319622bcbd62af70aa8e4c509b1a45
+  data.tar.gz: 57220d7bc625e74aa0b7f9f5ecbbc4fc22e77f56d11a3fda68bd1d5583ef4b84bb0084322496f7188b16d061212c51eeaf839c731290bc12e85ec523733a61ec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v3.0.22
+* [fix] Properly match compile time parameters (#235)
+* [fix] Remove AWS policy statements for undefined resources (#240)
+* [enhancement] Support conditions when possible within planner (#230)
+* [feature] Add alpha support for Terraform (#236)
+
 # v3.0.20
 * [fix] Only dump templates when dumpable (#220, #223)
 * [enhancement] Support NoEcho template parameters (#226)

data/README.md

@@ -13,6 +13,7 @@ with orchestration APIs.
 * Heat
 * OpenStack
 * Rackspace
+* Terraform
 
 ## Documentation
 

data/lib/sfn/api_provider.rb

@@ -4,6 +4,7 @@ module Sfn
   module ApiProvider
 
     autoload :Google, 'sfn/api_provider/google'
+    autoload :Terraform, 'sfn/api_provider/terraform'
 
   end
 end

data/lib/sfn/api_provider/terraform.rb

@@ -0,0 +1,71 @@
+require 'sfn'
+
+module Sfn
+  module ApiProvider
+
+    module Terraform
+
+      # Disable remote template storage
+      def store_template(*_)
+      end
+
+      # No formatting required on stack results
+      def format_nested_stack_results(*_)
+        {}
+      end
+
+      # Extract current parameters from parent template
+      #
+      # @param stack [SparkleFormation]
+      # @param stack_name [String]
+      # @param c_stack [Miasma::Models::Orchestration::Stack]
+      # @return [Hash]
+      def extract_current_nested_template_parameters(stack, stack_name, c_stack)
+        if(c_stack && c_stack.data[:parent_stack])
+          c_stack.data[:parent_stack].sparkleish_template(:remove_wrapper).fetch(
+            :resources, stack_name, :properties, :parameters, Smash.new
+          )
+        elsif(stack.parent)
+          val = stack.parent.compile.resources.set!(stack_name).properties
+          val.nil? ? Smash.new : val._dump
+        else
+          Smash.new
+        end
+      end
+
+      # Disable parameter validate as we can't adjust them without template modifications
+      def validate_stack_parameter(*_)
+        true
+      end
+
+      # Determine if parameter was set via intrinsic function
+      #
+      # @param val [Object]
+      # @return [TrueClass, FalseClass]
+      def function_set_parameter?(val)
+        if(val)
+          val.start_with?('${')
+        end
+      end
+
+      # Override requirement of nesting bucket
+      def validate_nesting_bucket!
+        true
+      end
+
+      # Override template content extraction to disable scrub behavior
+      #
+      # @param thing [SparkleFormation, Hash]
+      # @return [Hash]
+      def template_content(thing, *_)
+        if(thing.is_a?(SparkleFormation))
+          config[:sparkle_dump] ? thing.sparkle_dump : thing.dump
+        else
+          thing
+        end
+      end
+
+    end
+
+  end
+end

data/lib/sfn/callback/stack_policy.rb

@@ -74,19 +74,28 @@ module Sfn
       # @param p_stack [Miasma::Models::Orchestration::Stack]
       # @return [NilClass]
       def save_stack_policy(p_stack)
+        valid_logical_ids = p_stack.resources.reload.all.map(&:logical_id)
+        stack_policy = @policies.fetch(p_stack.id,
+          @policies.fetch(p_stack.data[:logical_id]),
+          @policies[p_stack.name]
+        ).to_smash
+        if(stack_policy)
+          stack_policy[:statement].delete_if do |policy_item|
+            policy_match = policy_item[:resource].to_s.match(
+              %r{LogicalResourceId/(?<logical_id>.+)$}
+            )
+            if(policy_match)
+              !valid_logical_ids.include?(policy_match["logical_id"])
+            end
+          end
+        end
         result = p_stack.api.request(
           :path => '/',
           :method => :post,
           :form => Smash.new(
             'Action' => 'SetStackPolicy',
             'StackName' => p_stack.id,
-            'StackPolicyBody' => MultiJson.dump(
-              @policies.fetch(p_stack.id,
-                @policies.fetch(p_stack.data[:logical_id],
-                  @policies[p_stack.name]
-                )
-              )
-            )
+            'StackPolicyBody' => MultiJson.dump(stack_policy)
           )
         )
       end

data/lib/sfn/command/conf.rb

@@ -83,7 +83,7 @@ Configuration.new do
   # nesting_prefix 'nested-templates'
   #   Remote provider credentials
   credentials do
-    #  Remote provider name (:aws, :azure, :google, :open_stack, :rackspace)
+    #  Remote provider name (:aws, :azure, :google, :open_stack, :rackspace, :terraform)
     provider :aws
     #  AWS credentials information
     aws_access_key_id ENV['AWS_ACCESS_KEY_ID']
@@ -123,6 +123,14 @@ Configuration.new do
     google_service_account_email ENV['GOOGLE_SERVICE_ACCOUNT_EMAIL']
     google_service_account_private_key ENV['GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY']
     google_project ENV['GOOGLE_PROJECT']
+    #  Terraform credentials information
+    #  Valid driver names: :tfe, :boule, :local
+    terraform_driver :local
+    terraform_tfe_endpoint ENV['TFE_URL']
+    terraform_tfe_token ENV['TFE_TOKEN']
+    terraform_boule_endpoint ENV['BOULE_URL']
+    terraform_local_directory './terraform-stacks'
+    terraform_local_scrub_destroyed false
   end
 end
 EOF

data/lib/sfn/command/destroy.rb

@@ -30,8 +30,14 @@ module Sfn
           stack = provider.connection.stacks.get(stack_name)
           if(stack)
             nested_stack_cleanup!(stack)
-            api_action!(:api_stack => stack) do
-              stack.destroy
+            begin
+              api_action!(:api_stack => stack) do
+                stack.destroy
+              end
+            rescue Miasma::Error::ApiError::RequestError => error
+              raise unless error.response.code == 404
+              # if stack is already gone, disable polling
+              config[:poll] = false
             end
             ui.info "Destroy request complete for stack: #{ui.color(stack_name, :red)}"
           else

data/lib/sfn/command/graph.rb

@@ -21,9 +21,7 @@ module Sfn
         config[:print_only] = true
         validate_graph_style!
         file = load_template_file
-        file = parameter_scrub!(file.sparkle_dump)
         @outputs = Smash.new
-        file = file.to_smash
         ui.info "Template resource graph generation - Style: #{ui.color(config[:graph_style], :bold)}"
         if(config[:file])
           ui.puts "  -> path: #{config[:file]}"
@@ -38,14 +36,14 @@ module Sfn
         end
         graph = nil
         run_action 'Generating resource graph' do
-          graph = generate_graph(file.to_smash)
+          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 |file|
-              file.puts graph.to_s
+            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]
@@ -74,10 +72,11 @@ module Sfn
       end
 
       def output_discovery(template, outputs, resource_name, parent_template, name='')
-        if(template['Resources'])
-          template['Resources'].each_pair do |r_name, r_info|
-            if(r_info['Type'] == 'AWS::CloudFormation::Stack')
-              output_discovery(r_info['Properties']['Stack'], outputs, r_name, template, r_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)
             end
           end
         end

data/lib/sfn/command/update.rb

@@ -69,7 +69,6 @@ module Sfn
           end
         end
         ui.info "  -> #{stack_info}"
-
         if(file)
           if(config[:print_only])
             ui.puts format_json(parameter_scrub!(template_content(file)))

data/lib/sfn/command_module/stack.rb

@@ -16,6 +16,8 @@ module Sfn
         TEMPLATE_PARAMETER_DEFAULTS = ['Default', 'defaultValue', 'default']
         # Template parameter no echo locations
         TEMPLATE_PARAMETER_NOECHO = ['NoEcho']
+        # Template parameter no echo custom
+        TEMPLATE_PARAMETER_SFN_NOECHO = ['Quiet', 'quiet']
 
         # Apply any defined remote stacks
         #
@@ -143,16 +145,19 @@ module Sfn
         # @param parameter_prefix [Array<String>] nesting prefix names
         # @param parameter_name [String] parameter name
         # @return [Array<String>] [expected_template_key, configuration_used_key]
-        def locate_config_parameter_key(parameter_prefix, parameter_name)
+        def locate_config_parameter_key(parameter_prefix, parameter_name, root_name)
           check_name = parameter_name.downcase.tr('-_', '')
           check_prefix = parameter_prefix.map{|i| i.downcase.tr('-_', '') }
           key_match = config[:parameters].keys.detect do |cp_key|
             cp_key = cp_key.to_s.downcase.split('__').map{|i| i.tr('-_', '') }.join('__')
-            cp_key.start_with?(check_prefix.join('__')) &&
-              cp_key.split('__').last == check_name
+            non_root_matcher = (check_prefix + [check_name]).join('__')
+            root_matcher = ([root_name] + check_prefix + [check_name]).join('__')
+            cp_key == non_root_matcher ||
+              cp_key == root_matcher
           end
           actual_key = (parameter_prefix + [parameter_name]).compact.join('__')
           if(key_match)
+            ui.debug "Remapping configuration runtime parameter `#{key_match}` -> `#{actual_key}`"
             config[:parameters][actual_key] = config[:parameters].delete(key_match)
           end
           actual_key
@@ -186,12 +191,19 @@ module Sfn
               )
             )
             if(config[:interactive_parameters])
+              no_echo = !!TEMPLATE_PARAMETER_NOECHO.detect{|loc_key|
+                param_value[loc_key].to_s.downcase == 'true'
+              }
+              sfn_no_echo = TEMPLATE_PARAMETER_SFN_NOECHO.map do |loc_key|
+                res = param_value.delete(loc_key).to_s.downcase
+                res if !res.empty? && res != 'false'
+              end.compact.first
+              no_echo = sfn_no_echo if sfn_no_echo
               answer = ui.ask_question(
                 "#{param_name.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}",
                 :default => default,
-                :no_echo => !!TEMPLATE_PARAMETER_NOECHO.detect{|loc_key|
-                  param_value[loc_key].to_s.downcase == 'true'
-                }
+                :hide_default => sfn_no_echo == 'all',
+                :no_echo => !!no_echo
               )
             else
               answer = default
@@ -221,21 +233,25 @@ module Sfn
         # @option opts [Miasma::Models::Orchestration::Stack] :stack existing stack
         # @return [Hash]
         def populate_parameters!(sparkle, opts={})
-          current_parameters = opts.fetch(:current_parameters, {})
+          current_parameters = opts[:current_parameters] || {}
           current_stack = opts[:stack]
           parameter_prefix, stack_parameters = prefix_parameters_setup(sparkle)
           unless(stack_parameters.empty?)
             format_config_parameters!
             param_banner = false
             stack_parameters.each do |param_name, param_value|
-              ns_key = locate_config_parameter_key(parameter_prefix, param_name)
+              ns_key = locate_config_parameter_key(parameter_prefix, param_name, sparkle.root.name)
               # When parameter is a hash type, it is being set via
               # intrinsic function and we don't modify
               if(function_set_parameter?(current_parameters[param_name]))
-                if(current_stack)
-                  enable_set = validate_stack_parameter(current_stack, param_name, ns_key, current_parameters[param_name])
+                if(!config[:parameters][ns_key].nil?)
+                  ui.warn "Overriding mapped parameter value with explicit assignment `#{ns_key}`!"
                 else
-                  enable_set = true
+                  if(current_stack)
+                    enable_set = validate_stack_parameter(current_stack, param_name, ns_key, current_parameters[param_name])
+                  else
+                    enable_set = true
+                  end
                 end
                 if(enable_set)
                   # NOTE: direct set dumps the stack (nfi). Smash will

data/lib/sfn/command_module/template.rb

@@ -180,13 +180,30 @@ module Sfn
                 else
                   current_state = compile_state.fetch(f_name, Smash.new)
                 end
+
+                # NOTE: Prevent nesting stack compile state within stack compile state
+                current_state.delete("#{f_name}__#{f_name}")
+
                 if(formation.compile_state)
                   current_state = current_state.merge(formation.compile_state)
                 end
                 unless(formation.parameters.empty?)
                   ui.info "#{ui.color('Compile time parameters:', :bold)} - template: #{ui.color(pathed_name, :green, :bold)}" unless config[:print_only]
                   formation.parameters.each do |k,v|
-                    current_state[k] = request_compile_parameter(k, v, current_state[k], !!formation.parent)
+                    valid_keys = [
+                      "#{f_name}__#{k}",
+                      Bogo::Utility.camel("#{f_name}__#{k}").downcase,
+                      k,
+                      Bogo::Utility.camel(k).downcase
+                    ]
+                    current_value = valid_keys.map do |key|
+                      current_state[key]
+                    end.compact.first
+                    primary_key, secondary_key = ["#{f_name}__#{k}", k]
+                    current_state[k] = request_compile_parameter(k, v,
+                      current_value,
+                      !!formation.parent
+                    )
                   end
                   formation.compile_state = current_state
                 end
@@ -231,19 +248,19 @@ module Sfn
         # core parameter set
         def merge_compile_time_parameters
           compile_state = config.fetch(:compile_parameters, Smash.new)
+          ui.debug "Initial compile parameters - #{compile_state}"
           compile_state.keys.each do |cs_key|
-            if(cs_key.to_s.start_with?("#{arguments.first}__"))
-              cli_provided = compile_state.delete(cs_key.to_s.sub("#{arguments.first.to_s}__", ''))
-              if(cli_provided)
-                compile_state[cs_key].deep_merge!(cli_provided)
+            unless(cs_key.to_s.start_with?("#{arguments.first}__"))
+              named_cs_key = "#{arguments.first}__#{cs_key}"
+              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}`"
+                compile_state[named_cs_key] = non_named
+              else
+                ui.debug "Discarding non-named compile parameter due to set named - `#{cs_key}` </> `#{named_cs_key}`"
               end
             end
           end
-          compile_state.keys.each do |cs_key|
-            unless(cs_key.start_with?("#{arguments.first}__"))
-              compile_state["#{arguments.first}__#{cs_key}"] = compile_state.delete(cs_key)
-            end
-          end
           ui.debug "Merged compile parameters - #{compile_state}"
           compile_state
         end

data/lib/sfn/config/validate.rb

@@ -82,13 +82,22 @@ module Sfn
             result = Smash.new
             v.split(',').each do |item_pair|
               key, value = item_pair.split(/[=:]/, 2)
-              key = key.split('__')
-              key = [key.pop, key.join('__')].reverse
-              result.set(*key, value)
+              result[key] = value
             end
             result
           when Hash
-            v.to_smash
+            result = Smash.new
+            extractor = lambda do |data, prefix|
+              data.each_pair do |key, value|
+                local_key = "#{prefix}__#{key}"
+                if(value.is_a?(Hash))
+                  extractor.call(value, local_key)
+                else
+                  result[local_key] = data
+                end
+              end
+            end
+            result
           else
             v
           end

data/lib/sfn/planner/aws.rb

@@ -14,6 +14,8 @@ module Sfn
         REF_MAPPING = {}
         FN_MAPPING = {}
 
+        UNKNOWN_RUNTIME_RESULT = '__UNKNOWN_RUNTIME_RESULT__'
+
         # @return [Array<String>] flagged items for value replacement
         attr_reader :flagged
 
@@ -23,6 +25,11 @@ module Sfn
           @flagged = []
         end
 
+        # @return [Hash] defined conditions
+        def conditions
+          @original.fetch('Conditions', {})
+        end
+
         # Flag a reference as modified
         #
         # @param ref_name [String]
@@ -48,30 +55,25 @@ module Sfn
         # @note also allows 'Ref' within funcs to provide mapping
         #   replacements using the REF_MAPPING constant
         def apply_function(hash, funcs=[])
-          k,v = hash.first
-          if(hash.size == 1 && (k.start_with?('Fn') || k == 'Ref') && (funcs.empty? || funcs.include?(k)))
-            case k
-            when 'Fn::Join'
-              v.last.join(v.first)
-            when 'Fn::FindInMap'
-              map_holder = mappings[v[0]]
-              if(map_holder)
-                map_item = map_holder[dereference(v[1])]
-                if(map_item)
-                  map_item[v[2]]
+          if(hash.is_a?(Hash))
+            k,v = hash.first
+            if(hash.size == 1 && (k.start_with?('Fn') || k == 'Ref') && (funcs.include?(:all) || funcs.empty? || funcs.include?(k) || funcs == ['DEREF']))
+              method_name = Bogo::Utility.snake(k.gsub('::', ''))
+              if((funcs.include?(k) || funcs.include?(:all)) && respond_to?(method_name))
+                apply_function(send(method_name, v), funcs)
+              else
+                case k
+                when 'Fn::GetAtt'
+                  funcs.include?('DEREF') ? dereference(hash) : hash
+                when 'Ref'
+                  if(funcs.include?('DEREF'))
+                    dereference(hash)
+                  else
+                    {'Ref' => self.class.const_get(:REF_MAPPING).fetch(v, v)}
+                  end
                 else
-                  raise "Failed to find mapping item! (#{v[0]} -> #{v[1]})"
+                  hash
                 end
-              else
-                raise "Failed to find mapping! (#{v[0]})"
-              end
-            when 'Fn::GetAtt'
-              func.include?('DEREF') ? dereference(hash) : hash
-            when 'Ref'
-              if(funcs.include?('DEREF'))
-                dereference(hash)
-              else
-                {'Ref' => self.class.const_get(:REF_MAPPING).fetch(v, v)}
               end
             else
               hash
@@ -81,6 +83,113 @@ module Sfn
           end
         end
 
+        # Evaluate given condition
+        #
+        # @param name [String] condition name
+        # @return [TrueClass, FalseClass]
+        def apply_condition(name)
+          condition = conditions[name]
+          if(condition)
+            apply_function(condition, [:all, 'DEREF'])
+          else
+            raise "Failed to locate condition with name `#{name}`!"
+          end
+        end
+
+        # Evaluate `if` conditional
+        #
+        # @param value [Array] {0: condition name, 1: true value, 2: false value}
+        # @return [Object] true or false value
+        def fn_if(value)
+          result = apply_condition(value[0])
+          if(result != UNKNOWN_RUNTIME_RESULT)
+            result ? value[1] : value[2]
+          else
+            UNKNOWN_RUNTIME_RESULT
+            result
+          end
+        end
+
+        # Determine if all conditions are true
+        #
+        # @param value [Array<String>] condition names
+        # @return [TrueClass, FalseClass]
+        def fn_and(value)
+          result = value.map do |val|
+            apply_condition(val)
+          end
+          if(result.to_s.include?(RUNTIME_MODIFIED))
+            UNKNOWN_RUNTIME_RESULT
+          else
+            result.all?
+          end
+        end
+
+        # Determine if any values are true
+        #
+        # @param value [Array<String>] condition names
+        # @return [TrueClass, FalseClass]
+        def fn_or(value)
+          result = value.map do |val|
+            apply_condition(val)
+          end
+          if(result.to_s.include?(RUNTIME_MODIFIED))
+            UNKNOWN_RUNTIME_RESULT
+          else
+            result.any?
+          end
+        end
+
+        # Negate given value
+        #
+        # @param value [Array<Hash>]
+        # @return [TrueClass, FalseClass]
+        def fn_not(value)
+          result = apply_function(value)
+          result == RUNTIME_MODIFIED ? UNKNOWN_RUNTIME_RESULT : !result
+        end
+
+        # Determine if values are equal
+        #
+        # @param value [Array] values
+        # @return [TrueClass, FalseClass]
+        def fn_equals(value)
+          value = value.map do |val|
+            apply_function(val)
+          end
+          if(value.to_s.include?(RUNTIME_MODIFIED))
+            UNKNOWN_RUNTIME_RESULT
+          else
+            value.first == value.last
+          end
+        end
+
+        # Join values with given delimiter
+        #
+        # @param value [Array<String,Array<String>>]
+        # @return [String]
+        def fn_join(value)
+          value.last.join(value.first)
+        end
+
+        # Lookup value in mappings
+        #
+        # @param value [Array]
+        # @return [String, Fixnum]
+        def fn_find_in_map(value)
+          map_holder = mappings[value[0]]
+          if(map_holder)
+            map_item = map_holder[dereference(value[1])]
+            if(map_item)
+              map_item[value[2]]
+            else
+              raise "Failed to find mapping item! (#{value[0]} -> #{value[1]})"
+            end
+          else
+            raise "Failed to find mapping! (#{value[0]})"
+          end
+        end
+
         # Override the parent dereference behavior to return junk
         # value on flagged resource match
         #
@@ -416,15 +525,19 @@ module Sfn
                 ]
               )
               begin
-                r_info = SparkleFormation::Resources::Aws.resource_lookup(type)
-                r_property = r_info.property(property_name)
-                if(r_property)
-                  effect = r_property.update_causes(
-                    templates.get(:update, 'Resources', resource_name),
-                    templates.get(:origin, 'Resources', resource_name)
-                  )
+                if(templates.get(:update, 'Resources', resource_name, 'Properties', property_name) == Translator::UNKNOWN_RUNTIME_RESULT)
+                  effect = :unknown
                 else
-                  raise KeyError.new 'Unknown property'
+                  r_info = SparkleFormation::Resources::Aws.resource_lookup(type)
+                  r_property = r_info.property(property_name)
+                  if(r_property)
+                    effect = r_property.update_causes(
+                      templates.get(:update, 'Resources', resource_name),
+                      templates.get(:origin, 'Resources', resource_name)
+                    )
+                  else
+                    raise KeyError.new 'Unknown property'
+                  end
                 end
                 case effect.to_sym
                 when :replacement
@@ -507,19 +620,30 @@ module Sfn
         template.keys.each do |t_key|
           next if ['Outputs', 'Resources'].include?(t_key)
           template[t_key] = translator.dereference_processor(
-            template[t_key], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
+            template[t_key], ['DEREF']
           )
         end
         translator.original.replace(template)
-        if(template['Resources'])
-          template['Resources'] = translator.dereference_processor(
-            template['Resources'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
-          )
+        ['Outputs', 'Resources'].each do |t_key|
+          if(template[t_key])
+            template[t_key] = translator.dereference_processor(
+              template[t_key], ['DEREF', :all]
+            )
+          end
         end
-        if(template['Outputs'])
-          template['Outputs'] = translator.dereference_processor(
-            template['Outputs'], ['Ref', 'Fn', 'DEREF', 'Fn::FindInMap']
-          )
+        if(template['Resources'])
+          valid_resources = template['Resources'].map do |resource_name, resource_value|
+            if(resource_value['OnCondition'])
+              if(translator.apply_condition(resource_value['OnCondition']))
+                resource_name
+              end
+            else
+              resource_name
+            end
+          end.compact
+          (template['Resources'].keys - valid_resources).each do |resource_to_remove|
+            template['Resources'].delete(resource_to_remove)
+          end
         end
         translator.original.replace({})
         template

data/lib/sfn/provider.rb

@@ -78,7 +78,7 @@ module Sfn
       )
       @cache = args.fetch(:cache, Cache.new(:local))
       @async = args.fetch(:async, true)
-      @miamsa_args = args[:miasma].dup
+      @miasma_args = args[:miasma].dup
       cache.init(:stacks_lock, :lock, :timeout => 0.1)
       cache.init(:stacks, :stamped)
       cache.init(:stack_expansion_lock, :lock, :timeout => 0.1)

data/lib/sfn/version.rb

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

data/sfn.gemspec

@@ -11,20 +11,23 @@ Gem::Specification.new do |s|
   s.license = 'Apache-2.0'
   s.require_path = 'lib'
   s.add_runtime_dependency 'bogo-cli', '>= 0.2.5', '< 0.4'
-  s.add_runtime_dependency 'bogo-ui', '>= 0.1.20', '< 0.4'
+  s.add_runtime_dependency 'bogo-ui', '>= 0.1.22', '< 0.4'
   s.add_runtime_dependency 'miasma', '>= 0.3.0', '< 0.4'
   s.add_runtime_dependency 'miasma-aws', '>= 0.3.6', '< 0.4'
   s.add_runtime_dependency 'miasma-azure', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-open-stack', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-rackspace', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-google', '>= 0.1.0', '< 0.3'
+  s.add_runtime_dependency 'miasma-terraform', '>= 0.1.0', '< 0.2.0'
   s.add_runtime_dependency 'jmespath'
   s.add_runtime_dependency 'net-ssh'
-  s.add_runtime_dependency 'sparkle_formation', '>= 3.0.3', '< 4'
+  s.add_runtime_dependency 'sparkle_formation', '>= 3.0.11', '< 4'
   s.add_runtime_dependency 'hashdiff', '~> 0.2.2'
   s.add_runtime_dependency 'graph', '~> 2.8.1'
   s.add_development_dependency 'rake', '~> 10'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rspec', '~> 3.5'
+  s.add_development_dependency 'rubocop', '0.38.0'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'yard'
   s.executables << 'sfn'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -170,6 +170,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: miasma-terraform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: jmespath
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +224,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -214,7 +234,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -274,6 +294,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +394,7 @@ files:
 - lib/sfn.rb
 - lib/sfn/api_provider.rb
 - lib/sfn/api_provider/google.rb
+- lib/sfn/api_provider/terraform.rb
 - lib/sfn/cache.rb
 - lib/sfn/callback.rb
 - lib/sfn/callback/aws_assume_role.rb
@@ -435,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: SparkleFormation CLI