Skip to content

Commit

Permalink
update to provide custom seed and target key in single argument
Browse files Browse the repository at this point in the history
Signed-off-by: Cole Bailey <[email protected]>
  • Loading branch information
colebaileygit committed Apr 3, 2024
1 parent b97d0f8 commit ae8cbfe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 65 deletions.
9 changes: 1 addition & 8 deletions core/pkg/evaluator/fractional.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,12 @@ func parseFractionalEvaluationData(values, data any) (string, []fractionalEvalua
bucketBy = fmt.Sprintf("%s%s", properties.FlagKey, targetingKey)
}

seed, ok := valuesArray[0].(string)
if ok {
valuesArray = valuesArray[1:]
} else {
seed = properties.FlagKey
}

feDistributions, err := parseFractionalEvaluationDistributions(valuesArray)
if err != nil {
return "", nil, err
}

return fmt.Sprintf("%s%s", seed, bucketBy), feDistributions, nil
return bucketBy, feDistributions, nil
}

func parseFractionalEvaluationDistributions(values []any) ([]fractionalEvaluationDistribution, error) {
Expand Down
59 changes: 2 additions & 57 deletions core/pkg/evaluator/fractional_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ func TestFractionalEvaluation(t *testing.T) {
},
{
"fractional": [
{"var": "email"},
{"var": "$flagd.flagKey"},
{"cat": [{"var": "$flagd.flagKey"}, {"var": "email"}]},
[
"red",
25
Expand Down Expand Up @@ -70,8 +69,7 @@ func TestFractionalEvaluation(t *testing.T) {
},
{
"fractional": [
{"var": "email"},
"my-seed",
{"cat": ["my-seed", {"var": "email"}]},
["red",25],
["blue",25],
["green",25],
Expand Down Expand Up @@ -226,59 +224,6 @@ func TestFractionalEvaluation(t *testing.T) {
expectedValue: "#FF0000",
expectedReason: model.TargetingMatchReason,
},
"[email protected] with default seed": {
flags: Flags{
Flags: map[string]model.Flag{
"headerColor": {
State: "ENABLED",
DefaultVariant: "red",
Variants: map[string]any{
"red": "#FF0000",
"blue": "#0000FF",
"green": "#00FF00",
"yellow": "#FFFF00",
},
Targeting: []byte(`{
"if": [
{
"in": ["@faas.com", {
"var": ["email"]
}]
},
{
"fractional": [
{"var": "email"},
[
"red",
25
],
[
"blue",
25
],
[
"green",
25
],
[
"yellow",
25
]
]
}, null
]
}`),
},
},
},
flagKey: "headerColor",
context: map[string]any{
"email": "[email protected]",
},
expectedVariant: "green",
expectedValue: "#00FF00",
expectedReason: model.TargetingMatchReason,
},
"non even split": {
flags: Flags{
Flags: map[string]model.Flag{
Expand Down

0 comments on commit ae8cbfe

Please sign in to comment.