Cache more

Also make backwards compatibility with compliance_markup configurable.

Author: silug

lib/puppet/functions/compliance_engine/enforcement.rb

@@ -15,6 +15,8 @@
   def enforcement(key, options, context)
     ComplianceEngine.log.level = Logger::DEBUG
 
+    @compat = options['compliance_markup_compatibility']
+
     case key
     when 'lookup_options'
       return context.not_found
@@ -27,18 +29,28 @@ def enforcement(key, options, context)
     # If we have no profiles to work with, we can't do anything.
     return context.not_found if profiles.empty?
 
-    data = ComplianceEngine::Data.new
-    data.facts = closure_scope.lookupvar('facts')
-    data.enforcement_tolerance = enforcement_tolerance || options['enforcement_tolerance']
-    data.open(ComplianceEngine::EnvironmentLoader.new(*closure_scope.environment.full_modulepath.select { |path| File.directory?(path) }))
-
-    unless compliance_map.empty?
-      data.open(ComplianceEngine::DataLoader.new(compliance_map))
+    if context.cache_has_key(:compliance_engine)
+      ComplianceEngine.log.debug('Using cached ComplianceEngine::Data object')
+      data = context.cached_value(:compliance_engine)
+    else
+      data = ComplianceEngine::Data.new
+      data.facts = closure_scope.lookupvar('facts')
+      data.enforcement_tolerance = enforcement_tolerance || options['enforcement_tolerance']
+      data.open(ComplianceEngine::EnvironmentLoader.new(*closure_scope.environment.full_modulepath.select { |path| File.directory?(path) }))
+
+      unless compliance_map.empty?
+        data.open(ComplianceEngine::DataLoader.new(compliance_map))
+      end
+      context.cache(:compliance_engine, data)
     end
 
     context.cache_all(data.hiera(profiles))
 
     return context.interpolate(context.cached_value(key)) if context.cache_has_key(key)
+    # if data.hiera(profiles).key?(key)
+    #   context.cache(key, data.hiera(profiles)[key])
+    #   return context.interpolate(data.hiera(profiles)[key])
+    # end
 
     context.not_found
   rescue StandardError => e
@@ -52,7 +64,9 @@ def profiles
     profile_list = call_function('lookup', 'compliance_engine::enforcement', { 'default_value' => [] })
 
     # For backwards compatibility with compliance_markup.
-    profile_list += call_function('lookup', 'compliance_markup::enforcement', { 'default_value' => [] })
+    if @compat
+      profile_list += call_function('lookup', 'compliance_markup::enforcement', { 'default_value' => [] })
+    end
 
     profile_list.uniq
   end
@@ -61,14 +75,20 @@ def compliance_map
     hiera_compliance_map = call_function('lookup', 'compliance_engine::compliance_map', { 'default_value' => {} })
 
     # For backwards compatibility with compliance_markup.
-    DeepMerge.deep_merge!(call_function('lookup', 'compliance_markup::compliance_map', { 'default_value' => {} }), hiera_compliance_map)
+    if @compat
+      hiera_compliance_map = DeepMerge.deep_merge!(call_function('lookup', 'compliance_markup::compliance_map', { 'default_value' => {} }), hiera_compliance_map)
+    end
+
+    hiera_compliance_map
   end
 
   def enforcement_tolerance
     tolerance = call_function('lookup', 'compliance_engine::enforcement_tolerance', { 'default_value' => nil })
 
     # For backwards compatibility with compliance_markup.
-    tolerance = call_function('lookup', 'compliance_markup::enforcement_tolerance_level', { 'default_value' => nil }) if tolerance.nil?
+    if @compat
+      tolerance = call_function('lookup', 'compliance_markup::enforcement_tolerance_level', { 'default_value' => nil }) if tolerance.nil?
+    end
 
     tolerance
   end