cfn-nag 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d85a44eca7647f151c4cdc8824e7ce8664eeafda1739cbdabeae094ba1a0831
-  data.tar.gz: 92375694b6b968bdc588229e7c4d50ae6feba4aeb05b4e7d450d1060444aa938
+  metadata.gz: f0a90e09ae75e36f29393f58e8ebf4bb760412a12c69a11003d78ea66ab21492
+  data.tar.gz: 65a8f4267aa774711a9187fa4b5b0d1381daaf2115cbc01045a389122c1f3801
 SHA512:
-  metadata.gz: a95e5fb81745dc369c348acbc0cf2a605e9638bf74a8586c20da8fbc0a1ad24a8d9734226f5cbc805a02edb2bf2b701453649cadad267047ada5ba935407eec4
-  data.tar.gz: 121fc4bdc07e51b00cf8fb7b33598a47af5b58b14f5f0f7056b122005b4ebd851feb5831750de0f29ac01187239e395d6cdf0d4460bd7fc7f636bedc351b96f1
+  metadata.gz: 883b3336ebc81586edad1b2b766133dbaed59d8c8241bc82420c02afd66eb3142b1c593ccdc989a46715831f13cc56b7e6d5f8020522f3bc70da16e3dc96cac3
+  data.tar.gz: 984513bf48cf99a90b9bc79e8cc83132f1bf32ae08d95270843fe7e21eeaf01aa6fe3c35a40edebf5f4ac2bb7e62661d070a80a19b7e34271637e092caa28c8f

data/lib/cfn-nag/cfn_nag.rb

@@ -25,6 +25,7 @@ class CfnNag
                                                       output_format: 'txt',
                                                       parameter_values_path: nil,
                                                       template_pattern: '..*\.json|..*\.yaml|..*\.yml|..*\.template')
+
     aggregate_results = audit_aggregate_across_files input_path: input_path,
                                                      parameter_values_path: parameter_values_path,
                                                      template_pattern: template_pattern
@@ -90,6 +91,11 @@ class CfnNag
     audit_result(violations)
   end
 
+  def render_results(aggregate_results:,
+                     output_format:)
+    results_renderer(output_format).new.render(aggregate_results)
+  end
+
   private
 
   def mark_line_numbers(violations, cfn_model)
@@ -134,11 +140,6 @@ class CfnNag
                   message: message)
   end
 
-  def render_results(aggregate_results:,
-                     output_format:)
-    results_renderer(output_format).new.render(aggregate_results)
-  end
-
   def results_renderer(output_format)
     registry = {
       'txt' => SimpleStdoutResults,

data/lib/cfn-nag/cfn_nag_executor.rb

@@ -12,6 +12,8 @@ class CfnNagExecutor
   end
 
   def scan(options_type:)
+    @total_failure_count = 0
+
     options = Options.for(options_type)
     validate_options(options)
     execute_io_options(options)
@@ -28,22 +30,17 @@ class CfnNagExecutor
   private
 
   def execute_file_or_piped_scan(cfn_nag, opts)
-    total_failure_count = 0
+    aggregate_results = []
+
     until argf_finished?
-      results = cfn_nag.audit(cloudformation_string: argf_read,
-                              parameter_values_string: @parameter_values_string)
+      aggregate_results << scan_file(cfn_nag, opts[:fail_on_warnings])
       argf_close
+    end
 
-      total_failure_count += if opts[:fail_on_warnings]
-                               results[:violations].length
-                             else
-                               results[:failure_count]
-                             end
+    cfn_nag.render_results(aggregate_results: aggregate_results,
+                           output_format: opts[:output_format])
 
-      results[:violations] = results[:violations].map(&:to_h)
-      puts JSON.pretty_generate(results)
-    end
-    total_failure_count
+    @total_failure_count
   end
 
   def execute_aggregate_scan(cfn_nag, opts)
@@ -55,6 +52,22 @@ class CfnNagExecutor
     )
   end
 
+  def scan_file(cfn_nag, fail_on_warnings)
+    audit_result = cfn_nag.audit(cloudformation_string: argf_read,
+                                 parameter_values_string: @parameter_values_string)
+
+    @total_failure_count += if fail_on_warnings
+                              audit_result[:violations].length
+                            else
+                              audit_result[:failure_count]
+                            end
+
+    {
+      filename: argf_filename,
+      file_results: audit_result
+    }
+  end
+
   def validate_options(opts)
     unless opts[:output_format].nil? || %w[txt json].include?(opts[:output_format])
       Trollop.die(:output_format,
@@ -99,4 +112,8 @@ class CfnNagExecutor
   def argf_read
     ARGF.file.read
   end
+
+  def argf_filename
+    ARGF.filename
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec