sfn 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6547ff820746c65b4c40508197419dcae12faca99daebcfc94deead2aa26f840
-  data.tar.gz: 8c6b5e8fc5376a833a4795f03975c6e4f3413b769c0eefc30483df204925929d
+  metadata.gz: 970e23327f10a5779f02b8f39168b1345a17ece34b108facde5c046a9d68637d
+  data.tar.gz: f7ef6ddea26b4f3a60c499092b9aed690d6a1c73c569ff8e72638a4c1f7a7c77
 SHA512:
-  metadata.gz: dbcb90988b563a83958fb68fa000e9d400143733b80e4e505974539f397e8115c3b670f3d617896df6b79c13a32f89a31e821555bc72a65413b786d821eaa423
-  data.tar.gz: 5449abde150d5fc85c419671f12792ee6e1640cac4340df67f01dd60c2da765011024e51e94b1786171ecae05f1f6cd37c3e93f3d22edabc0a4f3a3fb0280196
+  metadata.gz: 944b96fbf6832a33295feca36cc603cb9b581493b015627284c62c19e0b89f5bf2450a3219258897ed42d58f54b3e2ee06c17e498751d28fdafce394c8d1002a
+  data.tar.gz: 764508bb435d2da04dd49384e3c049061828bd64dc00a8b082119de8f41da3f650662d00019828cd660ad9772659e91ac4ed213a07078976cd920f3ba6517159

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v3.1.6
+* [enhancement] Add `all` and `group` validate options (#299)
+* [enhancement] Add timing information to template tracing (#296)
+* [fix] Provide useful error when `nesting_bucket` option is unset
+
 # v3.1.4
 * [fix] Fix apply mapping implementation (#295)
 

data/lib/sfn/command/trace.rb

@@ -35,9 +35,17 @@ module Sfn
               else
                 origin << ui.color(record.caller.path, :yellow)
               end
+              duration = "#{indent} |  duration: "
+              if record.compile_duration
+                duration << Kernel.sprintf("%0.4f", record.compile_duration)
+                duration << "s"
+              else
+                duration < "N/A"
+              end
               ui.info header
               ui.info source
               ui.info origin
+              ui.info duration
               if record.audit_log.count > 0
                 writer.call(record.audit_log, indent + " |")
               end

data/lib/sfn/command/validate.rb

@@ -10,25 +10,42 @@ module Sfn
       include Sfn::CommandModule::Stack
 
       def execute!
-        print_only_original = config[:print_only]
-        config[:print_only] = true
-        file = load_template_file
-        ui.info "#{ui.color("Template Validation (#{provider.connection.provider}): ", :bold)} #{config[:file].sub(Dir.pwd, "").sub(%r{^/}, "")}"
-        config[:print_only] = print_only_original
+        if config[:all]
+          validate_templates = sparkle_collection.templates[sparkle_collection.provider].keys
+        elsif config[:group]
+          validate_templates = sparkle_collection.templates[sparkle_collection.provider].keys.select do |template|
+            template.split("__").first == config[:group]
+          end
+        else
+          validate_templates = [config[:file]]
+        end
 
-        raw_template = _format_json(parameter_scrub!(template_content(file)))
+        if validate_templates.empty?
+          load_template_file
+          validate_templates.push(config[:file])
+        end
 
-        if config[:print_only]
-          ui.puts raw_template
-        else
-          validate_stack(
-            file.respond_to?(:dump) ? file.dump : file,
-            if config[:processing]
-              sparkle_collection.get(:template, config[:file])[:name]
-            else
-              config[:file]
-            end
-          )
+        validate_templates.each do |template|
+          config[:file] = template
+          print_only_original = config[:print_only]
+          config[:print_only] = true
+          ui.info "#{ui.color("Template Validation (#{provider.connection.provider}): ", :bold)} #{config[:file].sub(Dir.pwd, "").sub(%r{^/}, "")}"
+          file = load_template_file
+          config[:print_only] = print_only_original
+          raw_template = _format_json(parameter_scrub!(template_content(file)))
+
+          if config[:print_only]
+            ui.puts raw_template
+          else
+            validate_stack(
+              file.respond_to?(:dump) ? file.dump : file,
+              if config[:processing]
+                sparkle_collection.get(:template, config[:file])[:name]
+              else
+                config[:file]
+              end
+            )
+          end
         end
       end
 
@@ -71,6 +88,8 @@ module Sfn
           ui.fatal e.message
           raise e
         end
+        # Clear Compile Time Parameters from Config
+        config[:compile_parameters] = {}
       end
     end
   end

data/lib/sfn/command_module/template.rb

@@ -387,6 +387,9 @@ module Sfn
         # @return [Hash]
         def store_template(full_stack_name, template, result)
           stack_definition = template.is_a?(SparkleFormation) ? dump_stack_for_storage(template) : template
+          if config[:nesting_bucket].to_s.empty?
+            raise "Missing required value for option `nesting_bucket`."
+          end
           bucket = provider.connection.api_for(:storage).buckets.get(
             config[:nesting_bucket]
           )

data/lib/sfn/config/validate.rb

@@ -113,6 +113,14 @@ module Sfn
         :upload_root_template, [TrueClass, FalseClass],
         :description => "Upload root template to storage bucket",
       )
+      attribute(
+        :all, [TrueClass, FalseClass],
+        :description => "Validate all templates",
+      )
+      attribute(
+        :group, String,
+        :description => "Validate templates with the specified group prefix",
+      )
     end
   end
 end

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new("3.1.4")
+  VERSION = Gem::Version.new("3.1.6")
 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.35", "< 4"
+  s.add_runtime_dependency "sparkle_formation", ">= 3.0.39", "< 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.4
+  version: 3.1.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-08-04 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.35
+        version: 3.0.39
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.35
+        version: 3.0.39
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'