Fixes #19114: Overridden directives in the same rule are missing (not even "skipped") #3570
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… even \"skipped\")
fanf
commented
Apr 1, 2021
| */ | ||
| def buildRuleStatusReport(ruleId: RuleId, nodeReports: Map[NodeId, NodeStatusReport]): RuleStatusReport = { | ||
| val toKeep = nodeReports.values.flatMap( _.reports ).filter(_.ruleId == ruleId).toList | ||
| // we don't keep overrides for a directive which is already in "toKeep" or that don't target that rule | ||
| val toKeepDir = toKeep.map(_.directives.keySet).toSet.flatten | ||
| val overrides = nodeReports.values.flatMap( _.overrides.filterNot(r => r.policy.ruleId != ruleId || toKeepDir.contains(r.policy.directiveId))).toList.distinct | ||
| RuleStatusReport(ruleId, toKeep, overrides) | ||
| // and we must make overrides unique - ie, we don't keep overridden that are overridden by directive themselve in the overridden list |
There was a problem hiding this comment.
yep, wasn't able to make it clearer :)
|
OK, merging this PR |
fanf
deleted the
bug_19114/overridden_directives_in_the_same_rule_are_missing_not_even_skipped
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/19114
So, the problem was that we were filtering the overriden directive globally, and not by rule, so we had only one overridden for all overrides.
So now, we filter rule by rule (in a smarter way, and at a place where we can do test, even better) and don't filter with the big axe when building the list of directive lines.