Fixes #21011: report_if_condition method does not support expressions…

… in its input
Normation · Apr 21, 2022 · 1150260 · 1150260
1 parent d68f2e8
commit 1150260
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/tree/30_generic_methods/condition_from_expression.cf b/tree/30_generic_methods/condition_from_expression.cf
@@ -87,4 +87,9 @@ bundle agent condition_from_expression(condition, expression)
       "success" usebundle => _classes_success("${class_prefix}");
 
       "report"  usebundle => _log_v3("Create the condition ${condition}_{true,false} with ${expression}", "${condition}", "${old_class_prefix}", "${class_prefix}", @{args});
+  reports:
+    "Condition ${condition}_true defined"
+      if => "${condition}_true";
+    "Condition ${condition}_false defined"
+      if => "${condition}_false";
 }
diff --git a/tree/30_generic_methods/report_if_condition.cf b/tree/30_generic_methods/report_if_condition.cf
@@ -46,24 +46,35 @@ bundle agent report_if_condition(report_message, condition)
       "full_class_prefix" string => canonify("report_if_condition_${report_param}");
       "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+    pass1::
       "extended_message"  string => "${report_message} was correct",
-                              if => "${condition}";
+                              if => "local_expression";
       "extended_message"  string => "${report_message} was incorrect",
-                              if => not("${condition}");
+                              if => not("local_expression");
+  classes:
+      "pass2" expression => "pass1";
+      "pass1" expression => "any";
+      "local_expression"  expression => "${condition}";
 
   methods:
+   pass2::
       "success old class class" usebundle => _classes_success("${old_class_prefix}"),
-                                       if => "${condition}";
+                                       if => "local_expression";
       "success class prefix"    usebundle => _classes_success("${class_prefix}"),
-                                       if => "${condition}";
+                                       if => "local_expression";
 
       "error old class class"   usebundle => _classes_failure("${old_class_prefix}"),
-                                       if => not("${condition}");
+                                       if => not("local_expression");
       "error class prefix"      usebundle => _classes_failure("${class_prefix}"),
-                                       if => not("${condition}");
+                                       if => not("local_expression");
 
       "report"                  usebundle => _log_v3("${extended_message}", "${report_message}", "${old_class_prefix}", "${class_prefix}", @{args}),
                                        if => "${old_class_prefix}_reached|${class_prefix}_reached";
+  reports:
+   pass2.local_expression::
+      "Condition ${condition} evaluates to true";
+   pass2.!local_expression::
+      "Condition ${condition} evaluates to false";
 
 }