Update cfn-model to handle line numbers in SAM (Fixes #574) (#575)

Author: Kevin Formsma

Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     cfn-nag (0.0.0)
       aws-sdk-s3 (~> 1.76)
-      cfn-model (= 0.6.3)
+      cfn-model (= 0.6.4)
       lightly (~> 0.3.2)
       logging (~> 2.2.2)
       netaddr (~> 2.0.4)
@@ -14,23 +14,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.487.0)
-    aws-sdk-core (3.119.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.516.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.49.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.98.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    cfn-model (0.6.3)
+    cfn-model (0.6.4)
       kwalify (= 0.7.2)
       psych (~> 3)
     diff-lcs (1.4.4)
@@ -43,7 +43,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     multi_json (1.15.0)
-    netaddr (2.0.4)
+    netaddr (2.0.5)
     optimist (3.0.1)
     parallel (1.21.0)
     parser (3.0.2.0)

cfn-nag.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   # versus what we used to run tests in cfn-nag before publishing cfn-nag
   # they are coupled and we are doing a good bit of experimenting in cfn-model
   # i might consider collapsing them again....
-  s.add_runtime_dependency('cfn-model', '0.6.3')
+  s.add_runtime_dependency('cfn-model', '0.6.4')
   s.add_runtime_dependency('logging', '~> 2.2.2')
   s.add_runtime_dependency('netaddr', '~> 2.0.4')
   s.add_runtime_dependency('optimist', '~> 3.0.0')

spec/cfn_nag_integration/cfn_nag_serverless_transform_spec.rb

@@ -25,19 +25,19 @@
                 id: 'W58', type: Violation::WARNING,
                 message: LambdaFunctionCloudWatchLogsRule.new.rule_text,
                 logical_resource_ids: %w[SomeFunction2],
-                line_numbers: [-1]
+                line_numbers: [34]
               ),
               Violation.new(
                 id: 'W89', type: Violation::WARNING,
                 message: LambdaFunctionInsideVPCRule.new.rule_text,
                 logical_resource_ids: ["SomeFunction", "SomeFunction2"],
-                line_numbers: [-1,-1]
+                line_numbers: [20, 34]
               ),
               Violation.new(
                 id: 'W92', type: Violation::WARNING,
                 message: LambdaFunctionReservedConcurrentExecutionsRule.new.rule_text,
                 logical_resource_ids: ["SomeFunction","SomeFunction2"],
-                line_numbers: [-1,-1]
+                line_numbers: [20, 34]
               )
             ]
           }