Fixes #14829 Simple condition (without and/or) does not work in event rule #14870
Conversation
…ical operator. Added some tests.
|
This PR has been automatically marked as stale because it has not had recent activity. It will be closed automatically if no further action is taken. |
github-actions
bot
added
the
pending closure
jeremystretch
removed
the
pending closure
|
@Julio-Oliveira-Encora would you mind tackling the merge conflicts here? It should just be changes from enabling translation of the error messages. |
Done! |
|
@arthanson you're free to review this & merge as you see fit. |
| ConditionSet(rule) if is_ruleset(rule) else Condition(**rule) | ||
| for rule in ruleset[self.logic] | ||
| ] | ||
| if len(ruleset) == 1: |
There was a problem hiding this comment.
Is this the correct order below - it seems like they are reversed, the and-or processing is being done if the len(ruleset) == 1 which seems like it should be in the else clause?
There was a problem hiding this comment.
It's in the correct order because of the ruleset below, for example, has length = 1 and this case is deal inside the if. All other conditions must be deal in the else. Does it make sense?
{
"or": [
{
"and": [
{
"attr": "status.value",
"value": "active"
},
{
"attr": "primary_ip4",
"negate": true,
"value": null
}
]
},
{
"attr": "tags.slug",
"op": "contains",
"value": "exempt"
}
]
}
…s_not_work_in_event_rule
| self.logic = (list(ruleset.keys())[0]).lower() | ||
| if self.logic not in (AND, OR): | ||
| raise ValueError(_( | ||
| f"Invalid logic type: {self.logic} (must be 'AND' or 'OR'). Please check documentation.")) |
There was a problem hiding this comment.
remove the f-string here, f strings can't be internationalized
Fixes: #14829
This change allows the addition of simple conditions in the Event Rule. Currently, it only allows to add conditions with logical operators.