cfn-nag 0.3.98 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce9b47f9cfbd30f6d07242c5a836d257d30b900982c0224982e380c67bad8558
-  data.tar.gz: e4f33fbdadebf6634765f4d9ca7dfa4aaa5baff97f58df31a7023b8a9e5fa9af
+  metadata.gz: 4c22e9a701323d4590b6540a493979c119236e2731581b155ebf60d5d64444a1
+  data.tar.gz: 0d193a6821cb0376b2a6924dd19d002943ee844310d9f9aad18905f3037dac02
 SHA512:
-  metadata.gz: b1046789006216c086bffe24d86b937e19c3761190d0729df177dba4af89a9602f57362e22b51ab7818bdb0278ffe9ca01707917f5ec8d0f1bacbb69cc65b1a1
-  data.tar.gz: 9f4c6174d81f8920b341ec34816bc06f98825d852376bb1c05145611368b82363b81e75daac5e88d43a991dd02453397cc5965fcbe8b2abcab19432feb1837d5
+  metadata.gz: 4813009aaeaee81ba6d1cc78a65ee903f52034cbf07eb19326e4ede15ab2a372ef5b885e15304475cb4e080cadde235fa21a244b4dc0092388b332d41e743306
+  data.tar.gz: 9b007f901ead4856020d534f2b5a47420670923249e194a0608ae3f0939f848f31706d517dabd6c4e4783f1810e701ec8f0622ea84f3780e53dd7902d6487121

data/lib/cfn-nag/cfn_nag.rb

@@ -85,10 +85,12 @@ class CfnNag
 
     begin
       cfn_model = CfnParser.new.parse cloudformation_string,
-                                      parameter_values_string
+                                      parameter_values_string,
+                                      true
       violations += @custom_rule_loader.execute_custom_rules(cfn_model)
 
       violations = filter_violations_by_blacklist_and_profile(violations)
+      violations = mark_line_numbers(violations, cfn_model)
     rescue Psych::SyntaxError, ParserError => parser_error
       violations << fatal_violation(parser_error.to_s)
     rescue JSON::ParserError => json_parameters_error
@@ -101,6 +103,16 @@ class CfnNag
 
   private
 
+  def mark_line_numbers(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]
+      end
+    end
+
+    violations
+  end
+
   def filter_violations_by_blacklist_and_profile(violations)
     violations = filter_violations_by_profile(
       profile_definition: @profile_definition,

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

@@ -8,7 +8,8 @@ class SimpleStdoutResults
     violations.each do |violation|
       message message_type: "#{violation.type} #{violation.id}",
               message: violation.message,
-              logical_resource_ids: violation.logical_resource_ids
+              logical_resource_ids: violation.logical_resource_ids,
+              line_numbers: violation.line_numbers
     end
   end
 
@@ -38,7 +39,8 @@ class SimpleStdoutResults
 
   def message(message_type:,
               message:,
-              logical_resource_ids: nil)
+              logical_resource_ids: nil,
+              line_numbers: [])
 
     logical_resource_ids = nil if logical_resource_ids == []
 
@@ -47,7 +49,8 @@ class SimpleStdoutResults
     puts "| #{message_type.upcase}"
     puts '|'
     puts "| Resources: #{logical_resource_ids}" unless logical_resource_ids.nil?
-    puts '|' 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
 

data/lib/cfn-nag/violation.rb

@@ -4,17 +4,19 @@ require_relative 'rule_definition'
 
 # Rule definition for violations
 class Violation < RuleDefinition
-  attr_reader :logical_resource_ids
+  attr_reader :logical_resource_ids, :line_numbers
 
   def initialize(id:,
                  type:,
                  message:,
-                 logical_resource_ids: nil)
+                 logical_resource_ids: nil,
+                 line_numbers: [])
     super id: id,
           type: type,
           message: message
 
     @logical_resource_ids = logical_resource_ids
+    @line_numbers = line_numbers
   end
 
   def to_s
@@ -23,7 +25,8 @@ class Violation < RuleDefinition
 
   def to_h
     super.to_h.merge(
-      logical_resource_ids: @logical_resource_ids
+      logical_resource_ids: @logical_resource_ids,
+      line_numbers: @line_numbers
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.98
+  version: 0.4.1
 platform: ruby
 authors:
 - Eric Kascic
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: jmespath
   requirement: !ruby/object:Gem::Requirement