abide-data-processor 0.0.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf0d51193e415d28a53c2a7df576732981eb3f1c29525c0a44877f2e93e72c9
-  data.tar.gz: cd92db097e219d4c11fa72ee7d170d31e3b19681aba9344d8fb2ef0ba18add43
+  metadata.gz: b04940d641ff075df44bad1d44db0c5cfb4498c0aacd69c79baf5af9234d5533
+  data.tar.gz: 4ccc87ba94466281cb4ed8656b3734f07063ada8c113abc2c50e6c9b61d5bed7
 SHA512:
-  metadata.gz: 42c937bf2d75784db736ab8a13e9e0bc5295efa897c33a6bf9c9a4e0c89504860864b4f12db8632017e6cdce9e8ba339885df01e4271eacacc6244c68cb6858f
-  data.tar.gz: 2fe1ef9eeaeaa77ff578e3d53f41a46c73f181d81db0b4e133823c961ec8d1cd2c04f12ebbfb048d53d7caa0f67c6cabd2ce80270a0ac4875b4f97e0f7e3f919
+  metadata.gz: 2cc5c8a4f39c318f635b84e2413435b0e5e39ce2dfa6c9acee8e1d912b7f4936dbfb131281f571c1de44b7a41d37b6f3650e45eb0ebdd3e6eec75245bad1aac0
+  data.tar.gz: dc18ff5f2a6c0bb41d5213969643d71261df6b36d9e31af10bd4e1d40bd532633b8bc988e33142af693983cdc1f0deda7f363096fb9e2e5b154f1f2bcaca20d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abide-data-processor (0.0.0)
+    abide-data-processor (0.3.0)
       puppet (>= 6.23)
 
 GEM
@@ -107,7 +107,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    puppet (7.12.0)
+    puppet (7.12.1)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
       facter (> 2.0.1, < 5)

data/lib/abide-data-processor/processor.rb

@@ -2,7 +2,6 @@
 
 require 'deep_merge'
 require 'set'
-require 'pry'
 
 module AbideDataProcessor
   module Processor
@@ -12,8 +11,7 @@ module AbideDataProcessor
       # @param control_maps: The control mappings to valid IDs
       # @param module_name: The name of the module
       # @param logger: The logger that we will use to log information for the user
-      def initialize(control_maps, module_name, logger)
-        @module_name = module_name
+      def initialize(control_maps, logger)
         @control_maps = control_maps
         @logger = logger
       end
@@ -21,8 +19,8 @@ module AbideDataProcessor
       # control_key_maps
       # Gets all control key maps from Hiera for indexed control ID permutation searches
       # @return An array of four control ID maps, each indexed by one of the four different valid permutations of a control ID
-      def control_key_maps
-        key_prefix = "#{@module_name}::mappings::cis"
+      def self.control_key_maps(module_name)
+        key_prefix = "#{module_name}::mappings::cis"
         %w[hiera_title hiera_title_num number title].each_with_object([]) do |key, ary|
           ary << [key_prefix, key].join('::')
         end
@@ -39,7 +37,8 @@ module AbideDataProcessor
       # @param control_configs: the custom control configurations pulled from cis.pp
       # Return a hash to be convert to Puppet code.
       def create_resources(resources_hash, only, ignore, control_configs)
-        resources = real_resources(resources_hash, only.to_set, ignore.to_set, control_configs)
+        unfreezed_resources = Marshal.load(Marshal.dump(resources_hash))
+        resources = real_resources(unfreezed_resources, only.to_set, ignore.to_set, control_configs)
         ordered_resources = order_resources(resources)
 
         mutate_ordering_params!(ordered_resources[1])
@@ -90,8 +89,9 @@ module AbideDataProcessor
         control_params = {}
         control_data.each do |name, params|
           name_map = map_for_control_name(name, @control_maps)
-
+          next if name_map.nil?
           # Only and ignore list check
+          # The name_map that got passed in here is a hash
           next unless only_and_ignore_check(name, name_map, only, ignore)
 
           # Control dependent check
@@ -100,12 +100,12 @@ module AbideDataProcessor
               # Below is just a sure fire way to make sure that we will never use the resource
               only.delete(name) # Remove from the only list
               ignore.add(name) # Add the name of the current control to the ignore list if we're not gonna enforce it
-              @logger.inform("Control #{name} will not be enforced because the controls that it depends on is invalid.")
+              @logger.debug("Control #{name} will not be enforced because the controls that it depends on is invalid.")
               next
             end
           end
           # Find if there are any custom control configs from the cis.pp based on the control's name and its permutation
-          customized = find_control_customization(name, name_map[name], control_configs)
+          customized = find_control_customization(name, name_map[name], control_configs) # Check for failuer here
           params.deep_merge!(customized, merge_hash_arrays: true)
           control_params.deep_merge!(params, merge_hash_arrays: true)
         end
@@ -159,11 +159,11 @@ module AbideDataProcessor
       # filter_function
       # A general function to see if a control name is in a supply list of control name
       # @param name: The name of the control that we have
-      # @param name_map: All valid control ID permutation of the param name
+      # @param name_map: Hash that contains all valid control ID permutation of the param name
       # @set_of_control: Either the ignore or the only list to go through
       # return true if control ID is found in set_of_control
       def filter_function(name, name_map, set_of_control)
-        name_list = name_map[name]
+        name_list = name_map[name] # Grab the array that contain all valid permutation of the ID
         return true if set_of_control.include?(name)
 
         name_list.each do |n|
@@ -175,19 +175,19 @@ module AbideDataProcessor
 
       # only_and_ignore_check
       # @param name: name of the control to check if it's in either only or ignore list
-      # @param name_map: the name map of valid ID permutation for the `name` param
+      # @param name_map: a hash of the name map of valid ID permutation for the `name` param
       # @param only: the list of controls that will get enforced only
       # @param ignore: the list of controls that will be ignored
       # @return false when control is either not in the only list or is in the ignore list.
       # else return true
       def only_and_ignore_check(name, name_map, only, ignore)
         if !only.empty? && !filter_function(name, name_map, only)
-          @logger.inform("Control #{name} will be skipped because it is not in the only list.")
+          @logger.debug("Control #{name} will be skipped because it is not in the only list.")
           return false
         end
 
         if !ignore.empty? && filter_function(name, name_map, ignore)
-          @logger.inform("Control #{name} will be skipped because it is in the ignore list.")
+          @logger.debug("Control #{name} will be skipped because it is in the ignore list.")
           return false
         end
         true

data/lib/abide-data-processor/version.rb

@@ -1,3 +1,3 @@
 module AbideDataProcessor
-  VERSION = "0.0.0"
-end
+  VERSION = "0.3.0"
+end

data/lib/abide-data-processor.rb

@@ -1,4 +1,6 @@
 require 'abide-data-processor/version'
 require 'abide-data-processor/processor'
+require 'abide-data-processor/logger'
+
 # Root namespace for all modules / classes
 module AbideDataProcessor; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abide-data-processor
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.3.0
 platform: ruby
 authors:
 - abide-team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet