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

[FFM-5510]: Fixing the condition in evaluator to consider empty slice + expose Evaluate function #104

Merged
merged 2 commits into from
Nov 25, 2022
Merged

[FFM-5510]: Fixing the condition in evaluator to consider empty slice + expose Evaluate function #104

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d0964a
Fixing the condition in evaluator to consider empty slice
akiraqb Nov 24, 2022
c928ec5
Adding function comment for public evaluate
akiraqb Nov 24, 2022
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
11 changes: 9 additions & 2 deletions evaluation/evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ func (e Evaluator) isTargetIncludedOrExcludedInSegment(segmentList []string, tar

// Should Target be included via segment rules
rules := segment.Rules
if rules != nil && e.evaluateClauses(*rules, target) {
// if rules is nil pointer or points to the empty slice
if (rules != nil && len(*rules) > 0) && e.evaluateClauses(*rules, target) {
e.logger.Debugf(
"Target %s included in segment %s via rules", target.Name, segment.Name)
return true
Expand Down Expand Up @@ -311,6 +312,12 @@ func (e Evaluator) checkPreRequisite(fc *rest.FeatureConfig, target *Target) (bo
return true, nil
}

// public wrapper for the evaluate.
func (e Evaluator) Evaluate(identifier string, target *Target, kind string) (rest.Variation, error) {
davejohnston marked this conversation as resolved.
Show resolved Hide resolved

return e.evaluate(identifier, target, kind)
}

func (e Evaluator) evaluate(identifier string, target *Target, kind string) (rest.Variation, error) {

if e.query == nil {
Expand All @@ -326,7 +333,7 @@ func (e Evaluator) evaluate(identifier string, target *Target, kind string) (res
}

if flag.Prerequisites != nil {
prereq, err := e.checkPreRequisite(&flag, target)
prereq, err := e.checkPreRequisite(&flag, target) // equivalent of evaluateWithPreReqq
if err != nil || !prereq {
return findVariation(flag.Variations, flag.OffVariation)
}
Expand Down