cfn-nag 0.3.30 → 0.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59441006b3494befe307a988a3150c7a06703f0e
-  data.tar.gz: 18e6b6b11833b57d0df2dd39e0d775bc75e4aaae
+  metadata.gz: bf68cbb1d8b4e0711fb0ef50f053223f65e14b24
+  data.tar.gz: d4b56316b952e80a7098932fd05b2397e80a7a72
 SHA512:
-  metadata.gz: 8b35ab8943567fb61efbf17d343d94a5be75c09872f617427d18f47a3e88b1b8bb412ece9decf5e846d8cd9d9477f043670221d2dfec7c8e820b6c9a4509ad8e
-  data.tar.gz: 8e96a3dd3f4a9ecbde34fc26375e3b1606be038b97bc46711e26e3f305404e51df1c408713aa2a59e5086f7815d1913ff5a784e370fdea99163ee9b91e2edeac
+  metadata.gz: 2d484bb7b0ee1fce0a49ffc3fb05184dfb8cf2756e8d63f6f65c3b5b9379645638767273c51fb26699a314a9005e7def27fd190caf3df2b0d87cd9dea8a8366a
+  data.tar.gz: 6df463d3d3f978703ac68cb2ea5930f163ee9ace24241920ecc22787a8fde571caf7f622530a54d0319a6bf8c1226c2c1ddace9ef5da6a2159484188724c819b

data/lib/cfn-nag/result_view/rules_view.rb

@@ -1,26 +1,35 @@
+# View rules warnings/failings
 class RulesView
   def emit(rule_registry, profile)
     puts 'WARNING VIOLATIONS:'
-    rule_registry.warnings.sort { |left, right| sort_id(left, right) }.each do |warning|
+    emit_warnings rule_registry.warnings, profile
+    puts
+    puts 'FAILING VIOLATIONS:'
+    emit_failings rule_registry.failings, profile
+  end
+
+  private
+
+  def emit_warnings(warnings, profile)
+    warnings.sort { |left, right| sort_id(left, right) }.each do |warning|
       if profile.nil?
         puts "#{warning.id} #{warning.message}"
-      else
-        puts "#{warning.id} #{warning.message}" if profile.execute_rule?(warning.id)
+      elsif profile.execute_rule?(warning.id)
+        puts "#{warning.id} #{warning.message}"
       end
     end
-    puts
-    puts 'FAILING VIOLATIONS:'
-    rule_registry.failings.sort { |left, right| sort_id(left, right) }.each do |failing|
+  end
+
+  def emit_failings(failings, profile)
+    failings.sort { |left, right| sort_id(left, right) }.each do |failing|
       if profile.nil?
         puts "#{failing.id} #{failing.message}"
-      else
-        puts "#{failing.id} #{failing.message}" if profile.execute_rule?(failing.id)
+      elsif profile.execute_rule?(failing.id)
+        puts "#{failing.id} #{failing.message}"
       end
     end
   end
 
-  private
-
   def sort_id(left, right)
     if left.id.match(/[FW][0-9]+/) && right.id.match(/[FW][0-9]+/)
       left.id[1..-1].to_i <=> right.id[1..-1].to_i

data/lib/cfn-nag/result_view/simple_stdout_results.rb

@@ -1,19 +1,34 @@
 require 'cfn-nag/violation'
 
+# Print results to STDOUT
 class SimpleStdoutResults
+  def message_violations(violations)
+    violations.each do |violation|
+      message message_type: "#{violation.type} #{violation.id}",
+              message: violation.message,
+              logical_resource_ids: violation.logical_resource_ids
+    end
+  end
+
+  def print_failures(violations)
+    puts "\nFailures count: #{Violation.count_failures(violations)}"
+  end
+
+  def print_warnings(violations)
+    puts "Warnings count: #{Violation.count_warnings(violations)}"
+  end
+
   def render(results)
     results.each do |result|
       60.times { print '-' }
       puts "\n" + result[:filename]
       60.times { print '-' }
 
-      result[:file_results][:violations].each do |violation|
-        message message_type: "#{violation.type} #{violation.id}",
-                message: violation.message,
-                logical_resource_ids: violation.logical_resource_ids
-      end
-      puts "\nFailures count: #{Violation.count_failures(result[:file_results][:violations])}"
-      puts "Warnings count: #{Violation.count_warnings(result[:file_results][:violations])}"
+      violations = result[:file_results][:violations]
+
+      message_violations violations
+      print_failures violations
+      print_warnings violations
     end
   end
 

data/lib/cfn-nag/template_discovery.rb

@@ -1,21 +1,21 @@
+# Container for discovering templates
 class TemplateDiscovery
+  # input_json_path can be a directory, filename, or File
   def discover_templates(input_json_path)
     if ::File.directory? input_json_path
-      templates = find_templates_in_directory(directory: input_json_path)
-    elsif ::File.file? input_json_path
-      templates = if input_json_path.is_a? File
-                    [input_json_path.path]
-                  else
-                    [input_json_path]
-                  end
-    else
-      raise "#{input_json_path} is not a proper path"
+      return find_templates_in_directory(directory: input_json_path)
     end
-    templates
+    return [render_path(input_json_path)] if ::File.file? input_json_path
+    raise "#{input_json_path} is not a proper path"
   end
 
   private
 
+  def render_path(path)
+    return path.path if path.is_a? File
+    path
+  end
+
   def find_templates_in_directory(directory:,
                                   cfn_extensions: %w[json yaml yml template])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.31
 platform: ruby
 authors:
 - Eric Kascic