Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
85 changes: 50 additions & 35 deletions pkg/config/datafileprojectconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ type DatafileProjectConfig struct {
environmentKey string
region string

flagVariationsMap map[string][]entities.Variation
holdouts []entities.Holdout
holdoutIDMap map[string]entities.Holdout
flagHoldoutsMap map[string][]entities.Holdout
flagVariationsMap map[string][]entities.Variation
holdouts []entities.Holdout
holdoutIDMap map[string]entities.Holdout
flagHoldoutsMap map[string][]entities.Holdout
experimentHoldoutsMap map[string][]entities.Holdout
}

// GetDatafile returns a string representation of the environment's datafile
Expand Down Expand Up @@ -292,6 +293,19 @@ func (c DatafileProjectConfig) GetHoldoutsForFlag(featureKey string) []entities.
return []entities.Holdout{}
}

// GetHoldoutsForExperiment returns the holdouts that apply to a specific experiment
func (c DatafileProjectConfig) GetHoldoutsForExperiment(experimentID string) []entities.Holdout {
if holdouts, exists := c.experimentHoldoutsMap[experimentID]; exists {
return holdouts
}
return []entities.Holdout{}
}

// GetHoldoutList returns all holdouts
func (c DatafileProjectConfig) GetHoldoutList() []entities.Holdout {
return c.holdouts
}

// NewDatafileProjectConfig initializes a new datafile from a json byte array using the default JSON datafile parser
func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogProducer) (*DatafileProjectConfig, error) {
datafile, err := Parse(jsonDatafile)
Expand Down Expand Up @@ -334,7 +348,7 @@ func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogP
featureMap := mappers.MapFeatures(datafile.FeatureFlags, rolloutMap, experimentIDMap)
audienceMap, audienceSegmentList := mappers.MapAudiences(append(datafile.TypedAudiences, datafile.Audiences...))
flagVariationsMap := mappers.MapFlagVariations(featureMap)
holdouts, holdoutIDMap, flagHoldoutsMap := mappers.MapHoldouts(datafile.Holdouts, featureMap)
holdouts, holdoutIDMap, flagHoldoutsMap, experimentHoldoutsMap := mappers.MapHoldouts(datafile.Holdouts, featureMap)

attributeKeyMap := make(map[string]entities.Attribute)
attributeIDToKeyMap := make(map[string]string)
Expand All @@ -350,36 +364,37 @@ func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogP
}

config := &DatafileProjectConfig{
hostForODP: hostForODP,
publicKeyForODP: publicKeyForODP,
datafile: string(jsonDatafile),
accountID: datafile.AccountID,
anonymizeIP: datafile.AnonymizeIP,
attributeKeyToIDMap: attributeKeyToIDMap,
audienceMap: audienceMap,
attributeMap: attributeMap,
botFiltering: datafile.BotFiltering,
sdkKey: datafile.SDKKey,
environmentKey: datafile.EnvironmentKey,
experimentKeyToIDMap: experimentKeyMap,
experimentMap: experimentIDMap,
groupMap: groupMap,
eventMap: eventMap,
featureMap: featureMap,
projectID: datafile.ProjectID,
revision: datafile.Revision,
rollouts: rollouts,
integrations: integrations,
segments: audienceSegmentList,
rolloutMap: rolloutMap,
sendFlagDecisions: datafile.SendFlagDecisions,
flagVariationsMap: flagVariationsMap,
attributeKeyMap: attributeKeyMap,
attributeIDToKeyMap: attributeIDToKeyMap,
region: region,
holdouts: holdouts,
holdoutIDMap: holdoutIDMap,
flagHoldoutsMap: flagHoldoutsMap,
hostForODP: hostForODP,
publicKeyForODP: publicKeyForODP,
datafile: string(jsonDatafile),
accountID: datafile.AccountID,
anonymizeIP: datafile.AnonymizeIP,
attributeKeyToIDMap: attributeKeyToIDMap,
audienceMap: audienceMap,
attributeMap: attributeMap,
botFiltering: datafile.BotFiltering,
sdkKey: datafile.SDKKey,
environmentKey: datafile.EnvironmentKey,
experimentKeyToIDMap: experimentKeyMap,
experimentMap: experimentIDMap,
groupMap: groupMap,
eventMap: eventMap,
featureMap: featureMap,
projectID: datafile.ProjectID,
revision: datafile.Revision,
rollouts: rollouts,
integrations: integrations,
segments: audienceSegmentList,
rolloutMap: rolloutMap,
sendFlagDecisions: datafile.SendFlagDecisions,
flagVariationsMap: flagVariationsMap,
attributeKeyMap: attributeKeyMap,
attributeIDToKeyMap: attributeIDToKeyMap,
region: region,
holdouts: holdouts,
holdoutIDMap: holdoutIDMap,
flagHoldoutsMap: flagHoldoutsMap,
experimentHoldoutsMap: experimentHoldoutsMap,
}

logger.Info("Datafile is valid.")
Expand Down
Loading