Fix tolerance defaults to be nil if not specified (#154)

* Set tolerance setting to nil unless specified, ignore any disabled/remediation if nil * Change logic to account for zero case * Add rescue * Add changelog and version bump * Dates are hard --------- Co-authored-by: Garrett Adams <[email protected]>
simp · Mar 14, 2023 · 1ed5a7e · 1ed5a7e
1 parent c9d57d7
commit 1ed5a7e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+* Tue Mar 14 2023 Garrett Adams <[email protected]> - 3.3.1
+- Change enforcement tolerance to be nil if not specified, by default.
+  nil will ignore any remediation/disabled checks.
+
 * Thu Feb 16 2023 Garrett Adams <[email protected]> - 3.3.0
 - Add tolerance as hiera lookup. Confine checks that can be enforced
   based on the tolerance setting.

diff --git a/lib/puppetx/simp/compliance_mapper.rb b/lib/puppetx/simp/compliance_mapper.rb
@@ -47,7 +47,12 @@ def enforcement(key, context=self, options={"mode" => "value"}, &block)
 
     begin
       profile_list = Array(call_function('lookup', 'compliance_markup::enforcement', { 'default_value' => [] }))
-      options[:tolerance_setting] = Integer(call_function('lookup', 'compliance_markup::enforcement_tolerance_level', { 'default_value' => 40 }).to_i)
+      begin
+        tolerance_setting = call_function('lookup', 'compliance_markup::enforcement_tolerance_level')
+      rescue
+        tolerance_setting = nil
+      end
+      options[:tolerance_setting] = tolerance_setting.to_i unless tolerance_setting.nil?      
 
       unless profile_list == []
         debug("debug: compliance_markup::enforcement set to #{profile_list}, attempting to enforce")

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-compliance_markup",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "author": "SIMP Team",
   "summary": "Compliance-mapping annotation for Puppet code",
   "license": "Apache-2.0",