Fix: PACK redis is now also Valkey

Enh: EVALUATOR now manage and / or in unlimited way

Author: naparuba

data/global-configuration/packs/redis/detectors/redis.yml

@@ -1,5 +1,6 @@
 detector:
     add_groups:
         - redis
-    apply_if: "file_exists('/etc/redis/redis.conf') or file_exists('/etc/redis.conf')"
+    # redis == valkey
+    apply_if: "file_exists('/etc/redis/redis.conf') or file_exists('/etc/redis.conf') or file_exists('/etc/valkey/valkey.conf')"
     interval: "10s"

opsbro/evaluater.py

@@ -201,20 +201,16 @@ def eval_(self, node):
         elif isinstance(node, ast.BinOp):  # <left> <operator> <right>
             return operators[type(node.op)](self.eval_(node.left), self.eval_(node.right))
         elif isinstance(node, _ast.BoolOp):  # <elt1> OP <elt2>   TOD: manage more than 2 params
-            if len(node.values) != 2:
-                raise Exception('Cannot manage and/or operators woth more than 2 parts currently.')
-            # Special case: _ast.And   if the first element is False, then we should NOT eval the right part
-            # and directly returns False
-            left_part_eval = self.eval_(node.values[0])
-            if not left_part_eval and isinstance(node.op, _ast.And):
-                return False
-            # Special case: _ast.Or   if the first element is True, then we should NOT eval the right part
-            # and directly returns True
-            left_part_eval = self.eval_(node.values[0])
-            if left_part_eval and isinstance(node.op, _ast.Or):
+            if isinstance(node.op, _ast.And):
+                for value in node.values:
+                    if not self.eval_(value):
+                        return False
                 return True
-            # else, give the whole result
-            return operators[type(node.op)](left_part_eval, self.eval_(node.values[1]))
+            elif isinstance(node.op, _ast.Or):
+                for value in node.values:
+                    if self.eval_(value):
+                        return True
+                return False
         elif isinstance(node, ast.Compare):  # <left> <operator> <right>
             left = self.eval_(node.left)
             right = self.eval_(node.comparators[0])

test/opsbro_test.py

@@ -2,7 +2,7 @@
 
 import sys
 import time
-import imp
+import importlib.util
 import datetime
 import os
 import string
@@ -63,10 +63,17 @@ def setUp(self):
         core_functions_dir = os.path.join(my_dir, '..', 'data', 'core-configuration', 'packs', 'core-functions', 'module')
         print("** From directory", core_functions_dir)
         sys.path.insert(0, core_functions_dir)
-        m = imp.load_source('module___titi___toto___tata', os.path.join(core_functions_dir, 'module.py'))
+        
+        spec = importlib.util.spec_from_file_location('module___titi___toto___tata', os.path.join(core_functions_dir, 'module.py'))
+        m = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(m)
+        
         print("** Core functionns module is loaded:", m)
         self.assert_(m.CoreFunctionsModule is not None)
 
+    # for backport
+    def assert_(self, expr):
+        self.assertTrue(expr)
 
 if __name__ == '__main__':
     unittest.main()

test/test_evaluator.py

@@ -69,6 +69,10 @@ def test_evaluator(self):
             {'rule': 'False and missing_function()', 'expected': False},
             # Do not execute functions at right in Or if the first part is True
             {'rule': 'True or missing_function()', 'expected': True},
+            
+            # Multi operators
+            {'rule': 'True and False and True', 'expected': False},
+            {'rule': 'True or False or True', 'expected': True},
 
         ]
         for r in rules:
@@ -83,7 +87,7 @@ def test_evaluator(self):
             print("Expected: %s" % str(expected))
             print("Result: %s" % str(r))
             print("Is The same?: %s" % (r == expected))
-            self.assert_(r == expected)
+            self.assertEqual(expected, r)
 
 
 if __name__ == '__main__':