cfn-nag 0.3.64 → 0.3.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960b1a143e3a08dafc5cfed366c18b2edb16b3e1a4b02b4f1c82a10e995e0f50
-  data.tar.gz: 2df5d5eac2ad2577e5e9aa951b79dd273e694a1aecc15872a318f952dbe13356
+  metadata.gz: 783d680607fef0a7471c74e353264ebbc7758a8cf7ffcf61392b41c06739d09b
+  data.tar.gz: 38505a5993a099e5140a0e5ad35122c5ecea8f8f14c04afbcf045ae180bf6c27
 SHA512:
-  metadata.gz: 6794ae9f495c2f0a67656911eb0801046a438eb5a63962badce7e4942dbb1d42f8162c05ef8e004f7ccbc6cfdb4e30242c9af052f32cc40ca4a15e10904fdc0e
-  data.tar.gz: 9c60301df79b8c7466319ea16d83862eec1da3a3418dfdee46f453a4a7d72b0a2c292bfa510087e421493d173a94e906f287f90108810760a5985ca0925d7ee8
+  metadata.gz: 00c6718490e3ade00a21a2f42e8fc4be2373a1dc60b68308f96563ce2eb356d44b9e697733a9cb37bbab9603f0e4bc84ef1e1306a3ce6bf83a6b476a35cfec54
+  data.tar.gz: c96b56fc4fbe93b9d04e51eb58da0442d8e41c2d143eb80a8a10704872db64d0d7b167ed212910e85cc4020bfa6cbf418480c6e6c0f982b2bfe3997547f3f062

data/lib/cfn-nag/cfn_nag.rb

@@ -64,6 +64,19 @@ class CfnNag
     aggregate_results
   end
 
+  def audit_result(violations)
+    {
+      failure_count: Violation.count_failures(violations),
+      violations: violations
+    }
+  end
+
+  def fatal_violation(message)
+    Violation.new(id: 'FATAL',
+                  type: Violation::FAILING_VIOLATION,
+                  message: message)
+  end
+
   ##
   # Given cloudformation json/yml, run all the rules against it
   #
@@ -74,26 +87,20 @@ class CfnNag
   #
   def audit(cloudformation_string:, parameter_values_string: nil)
     violations = []
-    cfn_model = CfnParser.new.parse cloudformation_string,
-                                    parameter_values_string
-    violations += @custom_rule_loader.execute_custom_rules(cfn_model)
-    violations = filter_violations_by_profile violations
-    { failure_count: Violation.count_failures(violations),
-      violations: violations }
-  rescue Psych::SyntaxError, ParserError => parser_error
-    violations << Violation.new(id: 'FATAL',
-                                type: Violation::FAILING_VIOLATION,
-                                message: parser_error.to_s)
-    { failure_count: Violation.count_failures(violations),
-      violations: violations }
-  rescue JSON::ParserError => json_parameters_error
-    violations << Violation.new(id: 'FATAL',
-                                type: Violation::FAILING_VIOLATION,
-                                message: "JSON Parameter values parse error: #{json_parameters_error.to_s}")
-    {
-      failure_count: Violation.count_failures(violations),
-      violations: violations
-    }
+
+    begin
+      cfn_model = CfnParser.new.parse cloudformation_string,
+                                      parameter_values_string
+      violations += @custom_rule_loader.execute_custom_rules(cfn_model)
+      violations = filter_violations_by_profile violations
+    rescue Psych::SyntaxError, ParserError => parser_error
+      violations << fatal_violation(parser_error.to_s)
+    rescue JSON::ParserError => json_parameters_error
+      error = "JSON Parameter values parse error: #{json_parameters_error.to_s}"
+      violations << fatal_violation(error)
+    end
+
+    audit_result(violations)
   end
 
   def self.configure_logging(opts)

data/lib/cfn-nag/custom_rule_loader.rb

@@ -97,9 +97,7 @@ class CustomRuleLoader
     end
   end
 
-  # XXX given mangled_metadatas is never used or returned,
-  # STDERR emit can be moved to unless block
-  def validate_cfn_nag_metadata(cfn_model)
+  def collect_mangled_metadata(cfn_model)
     mangled_metadatas = []
     cfn_model.resources.each do |logical_resource_id, resource|
       resource_rules_to_suppress = rules_to_suppress resource
@@ -111,6 +109,13 @@ class CustomRuleLoader
         mangled_metadatas << [logical_resource_id, mangled_rules]
       end
     end
+    mangled_metadatas
+  end
+
+  # XXX given mangled_metadatas is never used or returned,
+  # STDERR emit can be moved to unless block
+  def validate_cfn_nag_metadata(cfn_model)
+    mangled_metadatas = collect_mangled_metadata(cfn_model)
     mangled_metadatas.each do |mangled_metadata|
       logical_resource_id = mangled_metadata.first
       mangled_rules = mangled_metadata[1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.64
+  version: 0.3.65
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec