cfn-nag 0.8.2 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0dd505f40c9fd504634b10223a8742375032a6fd225febe29460692dae4b5d2
-  data.tar.gz: 6e535f22dde6837b2384a94a95f1a115ca0ec89c30450793ae490b092d034622
+  metadata.gz: fd3880f6e404cb114d4befaf6a327fa08472e9c346153a8ca541f068627afb5f
+  data.tar.gz: d49ebbef234d353832b8ab7f0de52f947bd4c832c5c14be3b0643e04b4eec2ce
 SHA512:
-  metadata.gz: 0d75d174639ebf1056c2add11c6acca90f273d545dd825703a710b1e15c0483c90dee85a161d4c7d4b6261371ac7d3ec1b6df3f80facbec2f59cb0adf683b060
-  data.tar.gz: cd3d89960bf8662a99e2a6e180c46ad587413872e30085e77b7db625a46a1e9d0d8d7a742debe3cdd7b8f8f51bc07190696eb9271479cf0ce13ee8b707320e05
+  metadata.gz: 457d65d551017a8ab3e01599d20567a78d89902a5efecdf4d81667562d4bc9f0fff0ca92448174fcf44b2a42a7d3c3368c0803489881b87cad82b1d4c6153f61
+  data.tar.gz: 34bfc70a736de197459ca9e7aac37be0fd17ae7977c2e469ed605ecbae13eea143d8de81217bb37bb29cab9a680147c0630e0041c475a6ba15ff7662243437b4

data/lib/cfn-nag/cfn_nag.rb

@@ -95,7 +95,7 @@ class CfnNag
       )
 
       violations = filter_violations_by_deny_list_and_profile(violations)
-      violations = mark_line_numbers(violations, cfn_model)
+      violations = mark_line_numbers_and_element_types(violations, cfn_model)
     rescue RuleRepoException, Psych::SyntaxError, ParserError => fatal_error
       violations << Violation.fatal_violation(fatal_error.to_s)
     rescue JSON::ParserError => json_parameters_error
@@ -118,10 +118,11 @@ class CfnNag
 
   private
 
-  def mark_line_numbers(violations, cfn_model)
+  def mark_line_numbers_and_element_types(violations, cfn_model)
     violations.each do |violation|
       violation.logical_resource_ids.each do |logical_resource_id|
         violation.line_numbers << cfn_model.line_numbers[logical_resource_id]
+        violation.element_types << cfn_model.element_types[logical_resource_id]
       end
     end
 

data/lib/cfn-nag/custom_rules/base.rb

@@ -22,12 +22,13 @@ class BaseRule
     violation(logical_resource_ids)
   end
 
-  def violation(logical_resource_ids, line_numbers = [])
+  def violation(logical_resource_ids, line_numbers = [], element_types = [])
     Violation.new(id: rule_id,
                   name: self.class.name,
                   type: rule_type,
                   message: rule_text,
                   logical_resource_ids: logical_resource_ids,
-                  line_numbers: line_numbers)
+                  line_numbers: line_numbers,
+                  element_types: element_types)
   end
 end

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

@@ -10,7 +10,8 @@ class ColoredStdoutResults < StdoutResults
               color:,
               message:,
               logical_resource_ids: nil,
-              line_numbers: [])
+              line_numbers: [],
+              element_types: [])
 
     logical_resource_ids = nil if logical_resource_ids == []
 
@@ -18,7 +19,7 @@ class ColoredStdoutResults < StdoutResults
     puts
     puts colorize(color, "| #{message_type.upcase}")
     puts colorize(color, '|')
-    puts colorize(color, "| Resources: #{logical_resource_ids}") unless logical_resource_ids.nil?
+    puts colorize(color, "| #{element_type(element_types)}: #{logical_resource_ids}") unless logical_resource_ids.nil?
     puts colorize(color, "| Line Numbers: #{line_numbers}") unless line_numbers.empty?
     puts colorize(color, '|') unless line_numbers.empty? && logical_resource_ids.nil?
     puts colorize(color, "| #{message}")
@@ -38,4 +39,12 @@ class ColoredStdoutResults < StdoutResults
   def colorize(color_symbol, str)
     "\e[#{color_code(color_symbol)}m#{str}\e[0m"
   end
+
+  def element_type(element_types)
+    if element_types == [] || element_types.first.nil?
+      'Element'
+    elsif !element_types.first.nil?
+      element_types.first.capitalize
+    end
+  end
 end

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

@@ -11,7 +11,8 @@ class SimpleStdoutResults < StdoutResults
               message:,
               color:,
               logical_resource_ids: nil,
-              line_numbers: [])
+              line_numbers: [],
+              element_types: [])
 
     logical_resource_ids = nil if logical_resource_ids == []
 
@@ -19,10 +20,18 @@ class SimpleStdoutResults < StdoutResults
     puts
     puts "| #{message_type.upcase}"
     puts '|'
-    puts "| Resources: #{logical_resource_ids}" unless logical_resource_ids.nil?
+    puts "| #{element_type(element_types)}: #{logical_resource_ids}" unless logical_resource_ids.nil?
     puts "| Line Numbers: #{line_numbers}" unless line_numbers.empty?
     puts '|' unless line_numbers.empty? && logical_resource_ids.nil?
     puts "| #{message}"
   end
   # rubocop:enable Lint/UnusedMethodArgument
+
+  def element_type(element_types)
+    if element_types == [] || element_types.first.nil?
+      'Element'
+    elsif !element_types.first.nil?
+      element_types.first.capitalize
+    end
+  end
 end

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

@@ -12,7 +12,8 @@ class StdoutResults
               color: color,
               message: violation.message,
               logical_resource_ids: violation.logical_resource_ids,
-              line_numbers: violation.line_numbers
+              line_numbers: violation.line_numbers,
+              element_types: violation.element_types
     end
   end
 

data/lib/cfn-nag/version.rb

@@ -2,5 +2,5 @@
 
 module CfnNagVersion
   # This is managed at release time via scripts/publish.sh
-  VERSION = '0.8.2'
+  VERSION = '0.8.6'
 end

data/lib/cfn-nag/violation.rb

@@ -4,7 +4,7 @@ require_relative 'rule_definition'
 
 # Rule definition for violations
 class Violation < RuleDefinition
-  attr_reader :logical_resource_ids, :line_numbers
+  attr_reader :logical_resource_ids, :line_numbers, :element_types
 
   # rubocop:disable Metrics/ParameterLists
   def initialize(id:,
@@ -12,7 +12,8 @@ class Violation < RuleDefinition
                  type:,
                  message:,
                  logical_resource_ids: [],
-                 line_numbers: [])
+                 line_numbers: [],
+                 element_types: [])
     super id: id,
           name: name,
           type: type,
@@ -20,6 +21,7 @@ class Violation < RuleDefinition
 
     @logical_resource_ids = logical_resource_ids
     @line_numbers = line_numbers
+    @element_types = element_types
   end
   # rubocop:enable Metrics/ParameterLists
 
@@ -30,7 +32,8 @@ class Violation < RuleDefinition
   def to_h
     super.to_h.merge(
       logical_resource_ids: @logical_resource_ids,
-      line_numbers: @line_numbers
+      line_numbers: @line_numbers,
+      element_types: @element_types
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.6
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement