cfn-nag 0.4.65 → 0.4.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee08d1b2494d86cb88d3f0a55808a7d730d2e997fe8ae8b226378b7a40f23e3
-  data.tar.gz: a7cba7a91824dabe1c466dab679744f30ad845ce50c5c4268eebe0fc923a4dd8
+  metadata.gz: 2280d359a4b2a0f832e6498d88c965df78818c88e1b47d042cbeb7d7a3bea1bf
+  data.tar.gz: '058c1469988d6f58e01bc21f5b7bec200cb3ab17807e99317feb47f29d512e04'
 SHA512:
-  metadata.gz: bf98d72ffff808be03a9a7dda2f278f88ecb8f056b4c3c4ae1a37677d0267340c76e4b803f0a8ff455d83cb3b47a71036a58a0e9d14c5f2c78f5dc7e41b05687
-  data.tar.gz: c34097f5e6356a8b6616ab004b3bdd26dd3a6429cfa3c2c9c2cd286e397717a0e65c0ac76397ac5b2bbca7ba8b98314cc0486914840ba897cc4fe0be0348a7d7
+  metadata.gz: 44b69f5f053bdff5988d742f8cdeeef3c66ab7dc1cd083fadeba8dc29f385b8e07dab0a83a425fa20c4a223838684831f90918e3dbbf2cf53649fece0b6c6f10
+  data.tar.gz: c101be4f7f77573d86485b3015a95ce30f53b7d46981aae2713d461a8ea9461dda1d29ef1270790aa830c5e2e0af2ab24c2844436029c3b473dfba72baad7671

data/lib/cfn-nag/cfn_nag.rb

@@ -28,10 +28,12 @@ class CfnNag
   def audit_aggregate_across_files_and_render_results(input_path:,
                                                       output_format: 'txt',
                                                       parameter_values_path: nil,
+                                                      condition_values_path: nil,
                                                       template_pattern: DEFAULT_TEMPLATE_PATTERN)
 
     aggregate_results = audit_aggregate_across_files input_path: input_path,
                                                      parameter_values_path: parameter_values_path,
+                                                     condition_values_path: condition_values_path,
                                                      template_pattern: template_pattern
 
     render_results(aggregate_results: aggregate_results,
@@ -51,8 +53,11 @@ class CfnNag
   #
   def audit_aggregate_across_files(input_path:,
                                    parameter_values_path: nil,
+                                   condition_values_path: nil,
                                    template_pattern: DEFAULT_TEMPLATE_PATTERN)
     parameter_values_string = parameter_values_path.nil? ? nil : IO.read(parameter_values_path)
+    condition_values_string = condition_values_path.nil? ? nil : IO.read(condition_values_path)
+
     templates = TemplateDiscovery.new.discover_templates(input_json_path: input_path,
                                                          template_pattern: template_pattern)
     aggregate_results = []
@@ -60,7 +65,8 @@ class CfnNag
       aggregate_results << {
         filename: template,
         file_results: audit(cloudformation_string: IO.read(template),
-                            parameter_values_string: parameter_values_string)
+                            parameter_values_string: parameter_values_string,
+                            condition_values_string: condition_values_string)
       }
     end
     aggregate_results
@@ -74,13 +80,13 @@ class CfnNag
   #
   # Return a hash with failure count
   #
-  def audit(cloudformation_string:, parameter_values_string: nil)
+  def audit(cloudformation_string:, parameter_values_string: nil, condition_values_string: nil)
     violations = []
-
     begin
       cfn_model = CfnParser.new.parse cloudformation_string,
                                       parameter_values_string,
-                                      true
+                                      true,
+                                      condition_values_string
       violations += @config.custom_rule_loader.execute_custom_rules(cfn_model)
 
       violations = filter_violations_by_blacklist_and_profile(violations)

data/lib/cfn-nag/cfn_nag_executor.rb

@@ -9,6 +9,7 @@ class CfnNagExecutor
     @profile_definition = nil
     @blacklist_definition = nil
     @parameter_values_string = nil
+    @condition_values_string = nil
   end
 
   def scan(options_type:)
@@ -48,13 +49,15 @@ class CfnNagExecutor
       input_path: opts[:input_path],
       output_format: opts[:output_format],
       parameter_values_path: opts[:parameter_values_path],
+      condition_values_path: opts[:condition_values_path],
       template_pattern: opts[:template_pattern]
     )
   end
 
   def scan_file(cfn_nag, fail_on_warnings)
     audit_result = cfn_nag.audit(cloudformation_string: argf_read,
-                                 parameter_values_string: @parameter_values_string)
+                                 parameter_values_string: @parameter_values_string,
+                                 condition_values_string: @condition_values_string)
 
     @total_failure_count += if fail_on_warnings
                               audit_result[:violations].length
@@ -87,6 +90,10 @@ class CfnNagExecutor
     unless opts[:parameter_values_path].nil?
       @parameter_values_string = IO.read(opts[:parameter_values_path])
     end
+
+    unless opts[:condition_values_path].nil?
+      @condition_values_string = IO.read(opts[:condition_values_path])
+    end
   end
 
   def cfn_nag_config(opts)

data/lib/cfn-nag/cli_options.rb

@@ -68,6 +68,11 @@ class Options
           type: :string,
           required: false,
           default: nil
+      opt :condition_values_path,
+          'Path to a JSON file to pull Condition values from',
+          type: :string,
+          required: false,
+          default: nil
       opt :isolate_custom_rule_exceptions,
           custom_rule_exceptions_message,
           type: :boolean,
@@ -132,6 +137,11 @@ class Options
           type: :string,
           required: false,
           default: nil
+      opt :condition_values_path,
+          'Path to a JSON file to pull Condition values from',
+          type: :string,
+          required: false,
+          default: nil
       opt :allow_suppression,
           'Allow using Metadata to suppress violations',
           type: :boolean,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.4.65
+  version: 0.4.66
 platform: ruby
 authors:
 - Eric Kascic
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.12
+        version: 0.4.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.12
+        version: 0.4.14
 - !ruby/object:Gem::Dependency
   name: jmespath
   requirement: !ruby/object:Gem::Requirement