cfn-nag 0.3.52 → 0.3.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe97b8bdff1c7ee84e33f5fbcd87412fe418d9b5299c4222065c35f8c85f2ba
-  data.tar.gz: 53465649bd54c9890a6ff35210e8b482f7c24c126d885d81865397367bede71a
+  metadata.gz: 8eb6e2e2d4e1d36f7d8195e2bc7040bc431f8c0c6ebd8733aad45ada0b9e69d5
+  data.tar.gz: db0a2a5764a82493fdf37742c97f48d56e86751b376dfb31cda96a440f5a5ad6
 SHA512:
-  metadata.gz: 9c7bf0417eae3f341f99c1e497c96a59334cca32199220c0450f75a6f081f986db2c46683cab46f8b1c15a175c6f86766de92042bc0aac620cdea96cf06a265f
-  data.tar.gz: 110ca000377113199a0af17598a3bf8bfb891833f4e8658d27f872b5ae963de35fca8ab9c59a3d437a4d3220258dabf957db6e767c311fdc7c05bf90a0a206ab
+  metadata.gz: 0ac0f7fc98a5d972e1ae03996a2d721f095e6fac495c7c7228f7951e7674303c89ebdcb7f069ddf472a441a81c5c69288e67518a45bde1fe0e7a41d21045aa63
+  data.tar.gz: 4de40b96402bb854da7ce40a4423c3285903c552404611dac8a02f4f51da598c064cc4034d3f4486ff259a5c7a94b4b3e19685b697a5540881c7e66178abcd2f

data/bin/cfn_nag_scan

@@ -9,7 +9,7 @@ opts = Trollop.options do
   version Gem::Specification.find_by_name('cfn-nag').version
 
   opt :input_path,
-      'CloudFormation template to nag on or directory of templates - all *.json, *.yaml, *.yml and *.template recursively',
+      'CloudFormation template to nag on or directory of templates.  Default is all *.json, *.yaml, *.yml and *.template recursively, but can be constrained by --template-pattern',
       type: :io,
       required: true
   opt :output_format,
@@ -51,6 +51,11 @@ opts = Trollop.options do
       type: :boolean,
       required: false,
       default: false
+  opt :template_pattern,
+      'Within the --input-path, match files to scan against this regular expression',
+      type: :string,
+      required: false,
+      default: '..*\.json|..*\.yaml|..*\.yml|..*\.template'
 end
 
 unless %w[txt json].include?(opts[:output_format])
@@ -69,10 +74,10 @@ 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])
 
 exit cfn_nag.audit_aggregate_across_files_and_render_results(
   input_path: opts[:input_path], output_format: opts[:output_format],
-  parameter_values_path: opts[:parameter_values_path]
+  parameter_values_path: opts[:parameter_values_path],
+  template_pattern: opts[:template_pattern]
 )

data/lib/cfn-nag/cfn_nag.rb

@@ -28,11 +28,13 @@ class CfnNag
   #
   # Return an aggregate failure count (for exit code usage)
   #
-  def audit_aggregate_across_files_and_render_results(
-    input_path:, output_format: 'txt', parameter_values_path: nil
-  )
+  def audit_aggregate_across_files_and_render_results(input_path:,
+                                                      output_format: 'txt',
+                                                      parameter_values_path: nil,
+                                                      template_pattern:  '..*\.json|..*\.yaml|..*\.yml|..*\.template')
     aggregate_results = audit_aggregate_across_files input_path: input_path,
-                                                     parameter_values_path: parameter_values_path
+                                                     parameter_values_path: parameter_values_path,
+                                                     template_pattern:  template_pattern
 
     render_results(aggregate_results: aggregate_results,
                    output_format: output_format)
@@ -47,9 +49,12 @@ class CfnNag
   ##
   # Given a file or directory path, return aggregate results
   #
-  def audit_aggregate_across_files(input_path:, parameter_values_path: nil)
+  def audit_aggregate_across_files(input_path:,
+                                   parameter_values_path: nil,
+                                   template_pattern:  '..*\.json|..*\.yaml|..*\.yml|..*\.template')
     parameter_values_string = parameter_values_path.nil? ? nil : IO.read(parameter_values_path)
-    templates = TemplateDiscovery.new.discover_templates(input_path)
+    templates = TemplateDiscovery.new.discover_templates(input_json_path: input_path,
+                                                         template_pattern: template_pattern)
     aggregate_results = []
     templates.each do |template|
       aggregate_results << {

data/lib/cfn-nag/template_discovery.rb

@@ -1,9 +1,11 @@
 # Container for discovering templates
 class TemplateDiscovery
   # input_json_path can be a directory, filename, or File
-  def discover_templates(input_json_path)
+  def discover_templates(input_json_path:,
+                         template_pattern: '..*\.json|..*\.yaml|..*\.yml|..*\.template')
     if ::File.directory? input_json_path
-      return find_templates_in_directory(directory: input_json_path)
+      return find_templates_in_directory(directory: input_json_path,
+                                         template_pattern: template_pattern)
     end
     return [render_path(input_json_path)] if ::File.file? input_json_path
     raise "#{input_json_path} is not a proper path"
@@ -17,11 +19,13 @@ class TemplateDiscovery
   end
 
   def find_templates_in_directory(directory:,
-                                  cfn_extensions: %w[json yaml yml template])
+                                  template_pattern:)
 
     templates = []
-    cfn_extensions.each do |cfn_extension|
-      templates += Dir[File.join(directory, "**/*.#{cfn_extension}")]
+    Dir[File.join(directory, '**/**')].each do |file_name|
+      if file_name.match(template_pattern)
+        templates << file_name
+      end
     end
     templates
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.52
+  version: 0.3.53
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec