sfn 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e1f8b5f3368c544eb62deddf53125068fb58da22d78e0314149017fc525876
-  data.tar.gz: 30f8e10f6b1fe2364ce1eab3ba6a5b8fabd37386f0dcda8ae10bf4b81ff80789
+  metadata.gz: 2a0d3ba5a54ddc491d9a7dc4acc98baf4cd3e9533fe9e6dfb74e4154603566a2
+  data.tar.gz: bb96f40718dac5aaf5ea8e3b3de04afac2bcf893a5f3108c44d6023435d86234
 SHA512:
-  metadata.gz: 2a723ade4a10648cef17999848c8b41e3b6867c29611bd0b0c4530e30d447b939590153cdc1946a113cc43625b10ac8f42ddfb3d11f200d4ccccfd447ed59cfc
-  data.tar.gz: '013810809d502b67e8d7257cda9cf37b438bd1d3a5e3ced5fd5fb49e1d4917533024bf46031ae54187b0d1e150ed827ab0e363b888ebbda7f0512f5f4479b449'
+  metadata.gz: 01657ee293977a4f07e745d53b426ebc723f056892b4df6cd6f850e2361435521df969bd6cf081cbb9f0ca45ca5fe6764f5763369e59aab3c611794a34dea2ff
+  data.tar.gz: 90648c378bae5ac67ee578e41dcba9fa6ac1cd529fa34362dc8a758ce33336df74611adf27b1ec2bf16dc0a86f624f03ae4159a11952a4888f5b5fac1ded1224

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v3.1.2
+* [feature] Add `trace` command for template composition inspection (#289)
+* [fix] Return non-zero exit code when polling stack destroy fails (#292)
+* [fix] Update planner to handle value re-order (#290)
+
 # v3.1.0
 * [enhancement] Split `plan` command into `plan` and `realize` (#285)
 * [deprecation] Remove sfn command mapping knife integration (#286)

data/lib/sfn/command.rb

@@ -22,6 +22,7 @@ module Sfn
     autoload :Print, "sfn/command/print"
     autoload :Promote, "sfn/command/promote"
     autoload :Realize, "sfn/command/realize"
+    autoload :Trace, "sfn/command/trace"
     autoload :Update, "sfn/command/update"
     autoload :Validate, "sfn/command/validate"
 

data/lib/sfn/command/destroy.rb

@@ -45,12 +45,17 @@ module Sfn
         end
         if config[:poll]
           if stacks.size == 1
+            pstack = stacks.first
             begin
-              poll_stack(stacks.first)
-            rescue Miasma::Error::ApiError::RequestError => error
-              unless error.response.code == 404
-                raise error
+              poll_stack(pstack)
+              stack = provider.connection.stacks.get(pstack)
+              stack.reload
+              if stack.state.to_s.end_with?("failed")
+                ui.error("Stack #{ui.color(pstack, :bold)} still exists after polling complete.")
+                raise "Failed to successfully destroy stack!"
               end
+            rescue Miasma::Error::ApiError::RequestError => error
+              # Ignore if stack cannot be reloaded
             end
           else
             ui.error "Stack polling is not available when multiple stack deletion is requested!"

data/lib/sfn/command/trace.rb

@@ -0,0 +1,52 @@
+require "sparkle_formation"
+require "sfn"
+
+module Sfn
+  class Command
+    # Trace command
+    class Trace < Command
+      include Sfn::CommandModule::Base
+      include Sfn::CommandModule::Template
+      include Sfn::CommandModule::Stack
+
+      # Print the requested template
+      def execute!
+        config[:sparkle_dump] = true
+        config[:print_only] = true
+        file = load_template_file
+
+        if !file.is_a?(SparkleFormation)
+          raise "Cannot trace non-SparkleFormation template"
+        else
+          writer = proc do |audit_log, indent = ""|
+            audit_log.each do |record|
+              header = "#{indent}-> "
+              header << ui.color(record.type.to_s.capitalize, :bold)
+              header << " - #{record.name}"
+              source = "#{indent} |  source: "
+              if record.location.line > 0
+                source << "#{record.location.path} @ #{record.location.line}"
+              else
+                source << ui.color(record.location.path, :yellow)
+              end
+              origin = "#{indent} |  caller: "
+              if record.caller.line > 0
+                origin << "#{record.caller.path} @ #{record.caller.line}"
+              else
+                origin << ui.color(record.caller.path, :yellow)
+              end
+              ui.info header
+              ui.info source
+              ui.info origin
+              if record.audit_log.count > 0
+                writer.call(record.audit_log, indent + " |")
+              end
+            end
+          end
+          ui.info ui.color("Trace information:", :bold)
+          writer.call(file.audit_log)
+        end
+      end
+    end
+  end
+end

data/lib/sfn/command_module/template.rb

@@ -48,6 +48,7 @@ module Sfn
         def request_compile_parameter(p_name, p_config, cur_val, nested = false)
           result = nil
           attempts = 0
+          ui.debug "Fetching compile time param named #{p_name}"
           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."
@@ -178,11 +179,11 @@ module Sfn
             config[:template]
           elsif config[:file]
             if config[:processing]
-              compile_state = merge_compile_time_parameters
               sf = SparkleFormation.compile(config[:file], :sparkle)
               if name_args.first
                 sf.name = name_args.first
               end
+              compile_state = merge_compile_time_parameters(sf.root?)
               sf.compile_time_parameter_setter do |formation|
                 f_name = formation.root_path.map(&:name).map(&:to_s)
                 pathed_name = f_name.join(" > ")
@@ -257,13 +258,17 @@ module Sfn
 
         # Merge parameters provided directly via configuration into
         # core parameter set
-        def merge_compile_time_parameters
+        def merge_compile_time_parameters(root_template = false)
           compile_state = config.fetch(:compile_parameters, Smash.new)
           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].compact.join("__")
-              non_named = compile_state.delete(cs_key)
+              if root_template
+                non_named = compile_state[cs_key]
+              else
+                non_named = compile_state.delete(cs_key)
+              end
               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
@@ -295,12 +300,12 @@ module Sfn
         def process_nested_stack_shallow(sf, c_stack = nil)
           sf.apply_nesting(:shallow) do |stack_name, stack, resource|
             run_callbacks_for(:template, :stack_name => stack_name, :sparkle_stack => stack)
-            bucket = provider.connection.api_for(:storage).buckets.get(
-              config[:nesting_bucket]
-            )
             if config[:print_only]
               template_url = "http://example.com/bucket/#{name_args.first}_#{stack_name}.json"
             else
+              bucket = provider.connection.api_for(:storage).buckets.get(
+                config[:nesting_bucket]
+              )
               stack_definition = dump_stack_for_storage(stack)
               unless bucket
                 raise "Failed to locate configured bucket for stack template storage (#{bucket})!"

data/lib/sfn/config.rb

@@ -60,6 +60,7 @@ module Sfn
     autoload :Print, "sfn/config/print"
     autoload :Promote, "sfn/config/promote"
     autoload :Realize, "sfn/config/realize"
+    autoload :Trace, "sfn/config/trace"
     autoload :Update, "sfn/config/update"
     autoload :Validate, "sfn/config/validate"
 

data/lib/sfn/config/print.rb

@@ -2,7 +2,7 @@ require "sfn"
 
 module Sfn
   class Config
-    # Print command configurationUpdate command configuration
+    # Print command configuration
     class Print < Validate
       attribute(
         :write_to_file, String,

data/lib/sfn/config/trace.rb

@@ -0,0 +1,9 @@
+require "sfn"
+
+module Sfn
+  class Config
+    # Print command configurationUpdate command configuration
+    class Trace < Validate
+    end
+  end
+end

data/lib/sfn/planner/aws.rb

@@ -512,10 +512,10 @@ module Sfn
       def diff_init(diff, path)
         Smash.new.tap do |di|
           if diff.size > 1
-            updated = diff.detect { |x| x.first == "+" }
-            original = diff.detect { |x| x.first == "-" }
-            di[:original] = original.last.to_s
-            di[:updated] = updated.last.to_s
+            updated = diff.find_all { |x| x.first == "+" }
+            original = diff.find_all { |x| x.first == "-" }
+            di[:original] = Array(original).map(&:last).join(", ")
+            di[:updated] = Array(updated).map(&:last).join(", ")
           else
             diff_data = diff.first
             di[:path] = path

data/lib/sfn/provider.rb

@@ -101,7 +101,15 @@ module Sfn
         fetch_stacks(stack_id) if recache
       end
       value = cache[:stacks].value
-      value ? MultiJson.dump(MultiJson.load(value).values) : "[]"
+      if value
+        value = MultiJson.load(value)
+        if value.respond_to?(:values)
+          value = value.values
+        end
+        MultiJson.dump(value)
+      else
+        "[]"
+      end
     end
 
     # @return [Miasma::Orchestration::Stack, NilClass]

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new("3.1.0")
+  VERSION = Gem::Version.new("3.1.2")
 end

data/sfn.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   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.11", "< 4"
+  s.add_runtime_dependency "sparkle_formation", ">= 3.0.35", "< 4"
   s.add_runtime_dependency "hashdiff", "~> 0.2.2"
   s.add_runtime_dependency "graph", "~> 2.8.1"
   s.add_development_dependency "rake", "~> 10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -224,7 +224,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.11
+        version: 3.0.35
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.11
+        version: 3.0.35
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -420,6 +420,7 @@ files:
 - lib/sfn/command/print.rb
 - lib/sfn/command/promote.rb
 - lib/sfn/command/realize.rb
+- lib/sfn/command/trace.rb
 - lib/sfn/command/update.rb
 - lib/sfn/command/validate.rb
 - lib/sfn/command_module.rb
@@ -446,6 +447,7 @@ files:
 - lib/sfn/config/print.rb
 - lib/sfn/config/promote.rb
 - lib/sfn/config/realize.rb
+- lib/sfn/config/trace.rb
 - lib/sfn/config/update.rb
 - lib/sfn/config/validate.rb
 - lib/sfn/error.rb
@@ -491,8 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: SparkleFormation CLI