Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #21011: report_if_condition method does not support expressions in its input #1350

Merged
merged 1 commit into from
Apr 21, 2022
Merged

Fixes #21011: report_if_condition method does not support expressions in its input #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions tree/30_generic_methods/condition_from_expression.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
23 changes: 17 additions & 6 deletions tree/30_generic_methods/report_if_condition.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to change all if below from "condition" to "local_expression"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what i read in documentation this should be ok ...


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";

}