Skip to content

fix: respect rule type for sub-rules in segment evaluation #211

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

Merged
Zaimwa9 merged 1 commit into from
May 15, 2026
+27 −5
Merged

fix: respect rule type for sub-rules in segment evaluation #211

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "flagengine/engine-test-data"]
path = flagengine/engine-test-data
url = git@github.com:Flagsmith/engine-test-data.git
tag = v3.5.0
tag = v3.7.0
2 changes: 1 addition & 1 deletion flagengine/engine-test-data
Open in desktop
Submodule engine-test-data updated 4 files
+89 −0 test_cases/test_any_rule_with_nested_all_groups__no_group_matches__should_not_match.jsonc
+93 −0 test_cases/test_any_rule_with_nested_all_groups__one_group_matches__should_match.jsonc
+46 −0 test_cases/test_in_condition_bracketed_invalid_json__falls_back_to_csv__should_match.jsonc
+75 −0 test_cases/test_none_rule_with_nested_all_groups__match__should_exclude.jsonc
28 changes: 25 additions & 3 deletions flagengine/engine_eval/evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,34 @@ func contextMatchesSegmentRule(ec *EngineEvaluationContext, segmentRule *Segment
}
}

for i := range segmentRule.Rules {
if !contextMatchesSegmentRule(ec, &segmentRule.Rules[i], segmentKey) {
return matchesSubRulesByRuleType(ec, segmentRule.Rules, segmentRule.Type, segmentKey)
}

// matchesSubRulesByRuleType evaluates sub-rules using the parent rule's type (ALL/ANY/NONE).
func matchesSubRulesByRuleType(ec *EngineEvaluationContext, subRules []SegmentRule, ruleType Type, segmentKey string) bool {
if len(subRules) == 0 {
return true
}
for i := range subRules {
subRuleMatches := contextMatchesSegmentRule(ec, &subRules[i], segmentKey)
switch ruleType {
case All:
if !subRuleMatches {
return false
}
case None:
if subRuleMatches {
return false
}
case Any:
if subRuleMatches {
return true
}
default:
return false
}
}
return true
return ruleType != Any
}

func matchPercentageSplit(ec *EngineEvaluationContext, segmentCondition *Condition, segmentKey string, contextValue ContextValue) bool {
Expand Down
Loading