Skip to content

[AI-FSSDK] [FSSDK-12368] Remove legacy flag-level holdout fields #446

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
Mat001 merged 1 commit into from
Apr 23, 2026
+34 −182
Merged

[AI-FSSDK] [FSSDK-12368] Remove legacy flag-level holdout fields #446

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: 0 additions & 2 deletions pkg/config/datafileprojectconfig/entities/entities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ type Holdout struct {
AudienceConditions interface{} `json:"audienceConditions"`
Variations []Variation `json:"variations"`
TrafficAllocation []TrafficAllocation `json:"trafficAllocation"`
IncludedFlags []string `json:"includedFlags,omitempty"`
ExcludedFlags []string `json:"excludedFlags,omitempty"`
}

// Integration represents a integration from the Optimizely datafile
Expand Down
44 changes: 6 additions & 38 deletions pkg/config/datafileprojectconfig/mappers/holdout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

// MapHoldouts maps the raw datafile holdout entities to SDK Holdout entities
// and organizes them by flag relationships
// All running holdouts apply to all flags
func MapHoldouts(holdouts []datafileEntities.Holdout, featureMap map[string]entities.Feature) (
holdoutList []entities.Holdout,
holdoutIDMap map[string]entities.Holdout,
Expand All @@ -33,9 +33,7 @@ func MapHoldouts(holdouts []datafileEntities.Holdout, featureMap map[string]enti
holdoutIDMap = make(map[string]entities.Holdout)
flagHoldoutsMap = make(map[string][]entities.Holdout)

globalHoldouts := []entities.Holdout{}
includedHoldouts := make(map[string][]entities.Holdout)
excludedHoldouts := make(map[string][]entities.Holdout)
runningHoldouts := []entities.Holdout{}

for _, holdout := range holdouts {
// Only process running holdouts
Expand All @@ -46,43 +44,13 @@ func MapHoldouts(holdouts []datafileEntities.Holdout, featureMap map[string]enti
mappedHoldout := mapHoldout(holdout)
holdoutList = append(holdoutList, mappedHoldout)
holdoutIDMap[holdout.ID] = mappedHoldout

// Classify holdout by flag relationships
if len(holdout.IncludedFlags) == 0 {
// Global holdout - applies to all flags except excluded
globalHoldouts = append(globalHoldouts, mappedHoldout)

// Track exclusions
for _, flagID := range holdout.ExcludedFlags {
excludedHoldouts[flagID] = append(excludedHoldouts[flagID], mappedHoldout)
}
} else {
// Specific holdout - applies only to included flags
for _, flagID := range holdout.IncludedFlags {
includedHoldouts[flagID] = append(includedHoldouts[flagID], mappedHoldout)
}
}
runningHoldouts = append(runningHoldouts, mappedHoldout)
}

// Build flagHoldoutsMap by combining global and specific holdouts
// Global holdouts take precedence (evaluated first), then specific holdouts
// All running holdouts apply to all flags
for _, feature := range featureMap {
flagKey := feature.Key
flagID := feature.ID
applicableHoldouts := []entities.Holdout{}

// Add global holdouts first (if not excluded) - they take precedence
if _, exists := excludedHoldouts[flagID]; !exists {
applicableHoldouts = append(applicableHoldouts, globalHoldouts...)
}

// Add specifically included holdouts second
if included, exists := includedHoldouts[flagID]; exists {
applicableHoldouts = append(applicableHoldouts, included...)
}

if len(applicableHoldouts) > 0 {
flagHoldoutsMap[flagKey] = applicableHoldouts
if len(runningHoldouts) > 0 {
flagHoldoutsMap[feature.Key] = runningHoldouts
}
}

Expand Down
170 changes: 28 additions & 142 deletions pkg/config/datafileprojectconfig/mappers/holdout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ func TestMapHoldoutsEmpty(t *testing.T) {
assert.Empty(t, flagHoldoutsMap)
}

func TestMapHoldoutsGlobalHoldout(t *testing.T) {
// Global holdout: no includedFlags, applies to all flags except excluded
func TestMapHoldoutsAppliestoAllFlags(t *testing.T) {
// Running holdouts apply to all flags
rawHoldouts := []datafileEntities.Holdout{
{
ID: "holdout_1",
Key: "global_holdout",
Status: "Running",
ExcludedFlags: []string{"feature_2"},
ID: "holdout_1",
Key: "running_holdout",
Status: "Running",
Variations: []datafileEntities.Variation{
{ID: "var_1", Key: "variation_1"},
},
Expand All @@ -64,54 +63,18 @@ func TestMapHoldoutsGlobalHoldout(t *testing.T) {
assert.Len(t, holdoutList, 1)
assert.Len(t, holdoutIDMap, 1)
assert.Equal(t, "holdout_1", holdoutList[0].ID)
assert.Equal(t, "global_holdout", holdoutList[0].Key)
assert.Equal(t, "running_holdout", holdoutList[0].Key)

// Global holdout should apply to feature_1 and feature_3, but NOT feature_2 (excluded)
// Running holdout should apply to all flags
assert.Contains(t, flagHoldoutsMap, "feature_1")
assert.NotContains(t, flagHoldoutsMap, "feature_2")
assert.Contains(t, flagHoldoutsMap, "feature_2")
assert.Contains(t, flagHoldoutsMap, "feature_3")

assert.Len(t, flagHoldoutsMap["feature_1"], 1)
assert.Len(t, flagHoldoutsMap["feature_2"], 1)
assert.Len(t, flagHoldoutsMap["feature_3"], 1)
}

func TestMapHoldoutsSpecificHoldout(t *testing.T) {
// Specific holdout: has includedFlags, only applies to those flags
rawHoldouts := []datafileEntities.Holdout{
{
ID: "holdout_1",
Key: "specific_holdout",
Status: "Running",
IncludedFlags: []string{"feature_1", "feature_2"},
Variations: []datafileEntities.Variation{
{ID: "var_1", Key: "variation_1"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_1", EndOfRange: 10000},
},
},
}

featureMap := map[string]entities.Feature{
"feature_1": {ID: "feature_1", Key: "feature_1"},
"feature_2": {ID: "feature_2", Key: "feature_2"},
"feature_3": {ID: "feature_3", Key: "feature_3"},
}

holdoutList, holdoutIDMap, flagHoldoutsMap := MapHoldouts(rawHoldouts, featureMap)

// Verify holdout list and ID map
assert.Len(t, holdoutList, 1)
assert.Len(t, holdoutIDMap, 1)

// Specific holdout should only apply to feature_1 and feature_2
assert.Contains(t, flagHoldoutsMap, "feature_1")
assert.Contains(t, flagHoldoutsMap, "feature_2")
assert.NotContains(t, flagHoldoutsMap, "feature_3")

assert.Len(t, flagHoldoutsMap["feature_1"], 1)
assert.Len(t, flagHoldoutsMap["feature_2"], 1)
}

func TestMapHoldoutsNotRunning(t *testing.T) {
// Holdout with non-Running status should be filtered out
Expand All @@ -138,31 +101,29 @@ func TestMapHoldoutsNotRunning(t *testing.T) {
assert.Empty(t, flagHoldoutsMap)
}

func TestMapHoldoutsMixed(t *testing.T) {
// Mix of global and specific holdouts
func TestMapHoldoutsMultipleHoldouts(t *testing.T) {
// Multiple running holdouts all apply to all flags
rawHoldouts := []datafileEntities.Holdout{
{
ID: "holdout_global",
Key: "global_holdout",
Status: "Running",
ExcludedFlags: []string{"feature_2"},
ID: "holdout_1",
Key: "holdout_1",
Status: "Running",
Variations: []datafileEntities.Variation{
{ID: "var_global", Key: "variation_global"},
{ID: "var_1", Key: "variation_1"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_global", EndOfRange: 5000},
{EntityID: "var_1", EndOfRange: 5000},
},
},
{
ID: "holdout_specific",
Key: "specific_holdout",
Status: "Running",
IncludedFlags: []string{"feature_2"},
ID: "holdout_2",
Key: "holdout_2",
Status: "Running",
Variations: []datafileEntities.Variation{
{ID: "var_specific", Key: "variation_specific"},
{ID: "var_2", Key: "variation_2"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_specific", EndOfRange: 10000},
{EntityID: "var_2", EndOfRange: 10000},
},
},
}
Expand All @@ -178,94 +139,19 @@ func TestMapHoldoutsMixed(t *testing.T) {
assert.Len(t, holdoutList, 2)
assert.Len(t, holdoutIDMap, 2)

// feature_1: should get global holdout only (not excluded, not specifically included)
assert.Contains(t, flagHoldoutsMap, "feature_1")
assert.Len(t, flagHoldoutsMap["feature_1"], 1)
assert.Equal(t, "global_holdout", flagHoldoutsMap["feature_1"][0].Key)

// feature_2: should get specific holdout only (excluded from global)
assert.Contains(t, flagHoldoutsMap, "feature_2")
assert.Len(t, flagHoldoutsMap["feature_2"], 1)
assert.Equal(t, "specific_holdout", flagHoldoutsMap["feature_2"][0].Key)
}

func TestMapHoldoutsPrecedence(t *testing.T) {
// Test that global holdouts take precedence over specific holdouts
// When both apply to the same flag, global should come first in the slice
rawHoldouts := []datafileEntities.Holdout{
{
ID: "holdout_global",
Key: "global_holdout",
Status: "Running",
// No includedFlags = global, applies to all
Variations: []datafileEntities.Variation{
{ID: "var_global", Key: "variation_global"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_global", EndOfRange: 5000},
},
},
{
ID: "holdout_specific",
Key: "specific_holdout",
Status: "Running",
IncludedFlags: []string{"feature_1"}, // Specific to feature_1
Variations: []datafileEntities.Variation{
{ID: "var_specific", Key: "variation_specific"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_specific", EndOfRange: 10000},
},
},
}

featureMap := map[string]entities.Feature{
"feature_1": {ID: "feature_1", Key: "feature_1"},
}

_, _, flagHoldoutsMap := MapHoldouts(rawHoldouts, featureMap)

// feature_1 should have BOTH holdouts, with global FIRST (precedence)
// Both features should get both holdouts
assert.Contains(t, flagHoldoutsMap, "feature_1")
assert.Len(t, flagHoldoutsMap["feature_1"], 2)
assert.Equal(t, "holdout_1", flagHoldoutsMap["feature_1"][0].Key)
assert.Equal(t, "holdout_2", flagHoldoutsMap["feature_1"][1].Key)

// Global holdout should be first (takes precedence)
assert.Equal(t, "global_holdout", flagHoldoutsMap["feature_1"][0].Key, "Global holdout should take precedence (be first)")
// Specific holdout should be second
assert.Equal(t, "specific_holdout", flagHoldoutsMap["feature_1"][1].Key, "Specific holdout should be second")
assert.Contains(t, flagHoldoutsMap, "feature_2")
assert.Len(t, flagHoldoutsMap["feature_2"], 2)
assert.Equal(t, "holdout_1", flagHoldoutsMap["feature_2"][0].Key)
assert.Equal(t, "holdout_2", flagHoldoutsMap["feature_2"][1].Key)
}

func TestMapHoldoutsExcludedFlagsNotInMap(t *testing.T) {
// Test that excluded flags do not get global holdouts
rawHoldouts := []datafileEntities.Holdout{
{
ID: "holdout_global",
Key: "global_holdout",
Status: "Running",
ExcludedFlags: []string{"feature_excluded"},
Variations: []datafileEntities.Variation{
{ID: "var_1", Key: "variation_1"},
},
TrafficAllocation: []datafileEntities.TrafficAllocation{
{EntityID: "var_1", EndOfRange: 10000},
},
},
}

featureMap := map[string]entities.Feature{
"feature_included": {ID: "feature_included", Key: "feature_included"},
"feature_excluded": {ID: "feature_excluded", Key: "feature_excluded"},
}

_, _, flagHoldoutsMap := MapHoldouts(rawHoldouts, featureMap)

// feature_included should have the global holdout
assert.Contains(t, flagHoldoutsMap, "feature_included")
assert.Len(t, flagHoldoutsMap["feature_included"], 1)

// feature_excluded should NOT be in the map (no holdouts apply)
assert.NotContains(t, flagHoldoutsMap, "feature_excluded")
}

func TestMapHoldoutsWithAudienceConditions(t *testing.T) {
rawHoldouts := []datafileEntities.Holdout{
Expand Down
Loading