Skip to content

Commit

Permalink
fix: don't change the "FeatureEnabled" state of the fallback variant
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasheartman committed Dec 19, 2023
1 parent d4a5c32 commit 251d167
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
7 changes: 1 addition & 6 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,8 @@ func (uc *Client) getVariantWithoutMetrics(feature string, options ...VariantOpt

getFallbackVariant := func(featureEnabled bool) *api.Variant {
if opts.variantFallbackFunc != nil {
variant := opts.variantFallbackFunc(feature, ctx)
if variant != nil {
variant.FeatureEnabled = featureEnabled
}
return variant
return opts.variantFallbackFunc(feature, ctx)
} else if opts.variantFallback != nil {
opts.variantFallback.FeatureEnabled = featureEnabled
return opts.variantFallback
}

Expand Down
5 changes: 1 addition & 4 deletions client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,6 @@ func TestGetVariantWithFallbackVariantWhenFeatureDisabled(t *testing.T) {

fallbackVariant := api.Variant{
Name: "fallback-variant",
FeatureEnabled: true,
}

variant := client.GetVariant(feature, WithVariantFallback(&fallbackVariant))
Expand Down Expand Up @@ -1261,14 +1260,13 @@ func TestGetVariantWithFallbackVariantWhenFeatureEnabledButNoVariants(t *testing

fallbackVariant := api.Variant{
Name: "fallback-variant",
FeatureEnabled: false,
}

variant := client.GetVariant(feature, WithVariantFallback(&fallbackVariant))

assert.False(variant.Enabled)

assert.True(variant.FeatureEnabled)
assert.False(variant.FeatureEnabled)

assert.Equal(fallbackVariant, *variant)

Expand Down Expand Up @@ -1318,7 +1316,6 @@ func TestGetVariantWithFallbackVariantWhenFeatureDoesntExist(t *testing.T) {

fallbackVariant := api.Variant{
Name: "fallback-variant",
FeatureEnabled: true,
}

variant := client.GetVariant(feature, WithVariantFallback(&fallbackVariant))
Expand Down

0 comments on commit 251d167

Please sign in to comment.