cfn-nag 0.3.25 → 0.3.25.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d93b1b33ab0928e594958f2c88a56ad57f19f1
-  data.tar.gz: bb108247f91355c8923ae85e8f22622e3dea6e8f
+  metadata.gz: bf5726f04d07c111c0541fb8f56726be61f11f2d
+  data.tar.gz: b3c98358b4bc53fd75d3cdaf29ff79e7afa70a0a
 SHA512:
-  metadata.gz: cc97796f7418d2e50132a7b707b55d7950eddafc394c81c4b98e9d37eba58ecb2abdff99eae75bdb581b5d805a2562dfc4a131a04c5ffe23a53affe449a4b777
-  data.tar.gz: 70d78bb9f9277246a3e0d5eb6e0936a3f67db919f5fd54659a731f6e674973f2dbfd8207743b888f5c9678b3c6f02bac923f1aaa299bfdedfe4f31f8e1ee8dc2
+  metadata.gz: 39d6ae274d8d13dcc7332010956a463ce514e781067e59357a3678dde9af9ab1624b0c8bfea258a974fe1da29d647981020996c86b7dadfbf41463315595b7d0
+  data.tar.gz: b2ad25ba0a8c8f0c6082ce191c1d1146ab7cdfe7995378a53ba94cb0b2a4bc783c0d9bbb3000efdfbd73e1ebd5dafc607fec5c95fa97616936e75c01e9a9856a

data/bin/cfn_nag

@@ -5,20 +5,36 @@ require 'logging'
 require 'json'
 require 'rubygems/specification'
 
-opts = Trollop::options do
-  usage '[options] <cloudformation template path ...>|<cloudformation template in STDIN>'
+opts = Trollop.options do
+  usage '[options] <cloudformation template path ...>|' \
+        '<cloudformation template in STDIN>'
   version Gem::Specification.find_by_name('cfn-nag').version
 
-  opt :debug, 'Enable debug output', type: :boolean, required: false, default: false
-  opt :allow_suppression, 'Allow using Metadata to suppress violations', type: :boolean, required: false, default: true
-  opt :print_suppression, 'Emit suppressions to stderr', type: :boolean, required: false, default: false
-  opt :rule_directory, 'Extra rule directory', type: :io, required: false, default: nil
-  opt :profile_path, 'Path to a profile file', type: :io, required: false, default: nil
-  opt :parameter_values_path, 'Path to a JSON file to pull Parameter values from', type: :io, required: false, default: nil
-  opt :isolate_custom_rule_exceptions, 'Isolate custom rule exceptions - just emit the exception without stack trace and keep chugging', type: :boolean, required: false, default: false
+  opt :debug, 'Enable debug output', type: :boolean, required: false,
+                                     default: false
+  opt :allow_suppression,
+      'Allow using Metadata to suppress violations',
+      type: :boolean, required: false, default: true
+  opt :print_suppression, 'Emit suppressions to stderr', type: :boolean,
+                                                         required: false,
+                                                         default: false
+  opt :rule_directory, 'Extra rule directory', type: :io,
+                                               required: false,
+                                               default: nil
+  opt :profile_path, 'Path to a profile file', type: :io,
+                                               required: false,
+                                               default: nil
+  opt :parameter_values_path,
+      'Path to a JSON file to pull Parameter values from', type: :io,
+                                                           required: false,
+                                                           default: nil
+  opt :isolate_custom_rule_exceptions,
+      'Isolate custom rule exceptions - just emit the exception ' \
+      'without stack trace and keep chugging',
+      type: :boolean, required: false, default: false
 end
 
-CfnNag::configure_logging(opts)
+CfnNag.configure_logging(opts)
 
 profile_definition = nil
 unless opts[:profile_path].nil?
@@ -34,25 +50,18 @@ cfn_nag = CfnNag.new(profile_definition: profile_definition,
                      rule_directory: opts[:rule_directory],
                      allow_suppression: opts[:allow_suppression],
                      print_suppression: opts[:print_suppression],
-                     isolate_custom_rule_exceptions: opts[:isolate_custom_rule_exceptions])
+                     isolate_custom_rule_exceptions:
+                     opts[:isolate_custom_rule_exceptions])
 
-# trollop appears to pop args off of ARGV
-# ARGF concatenates which we don't want
-if ARGV.size == 0
-  results = cfn_nag.audit(cloudformation_string: STDIN.read, parameter_values_string: parameter_values_string)
+total_failure_count = 0
+until ARGF.closed?
+  results = cfn_nag.audit(cloudformation_string: ARGF.file.read,
+                          parameter_values_string: parameter_values_string)
+  ARGF.close
 
-  results[:violations] = results[:violations].map { |violation| violation.to_h }
+  total_failure_count += results[:failure_count]
+  results[:violations] = results[:violations].map(&:to_h)
   puts JSON.pretty_generate(results)
-  exit results[:failure_count]
-else
-  total_failure_count = 0
-  ARGV.each do |file_name|
-    results = cfn_nag.audit(cloudformation_string: IO.read(file_name), parameter_values_string: parameter_values_string)
-
-    total_failure_count += results[:failure_count]
-    results[:violations] = results[:violations].map { |violation| violation.to_h }
-    puts JSON.pretty_generate(results)
-  end
-  exit total_failure_count
 end
 
+exit total_failure_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.25.26
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging