Skip to content

Commit 21ec13f

Browse files
committed
revert to pointer EnvironmentModel
1 parent 1e79009 commit 21ec13f

File tree

5 files changed

+12
-26
lines changed

5 files changed

+12
-26
lines changed

Makefile

Lines changed: 0 additions & 14 deletions
This file was deleted.

flagengine/engine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
// GetEnvironmentFeatureStates returns a list of feature states for a given environment.
12-
func GetEnvironmentFeatureStates(environment environments.EnvironmentModel) []*features.FeatureStateModel {
12+
func GetEnvironmentFeatureStates(environment *environments.EnvironmentModel) []*features.FeatureStateModel {
1313
if environment.Project.HideDisabledFlags {
1414
var featureStates []*features.FeatureStateModel
1515
for _, fs := range environment.FeatureStates {
@@ -23,7 +23,7 @@ func GetEnvironmentFeatureStates(environment environments.EnvironmentModel) []*f
2323
}
2424

2525
// GetEnvironmentFeatureState returns a specific feature state for a given featureName in a given environment, or nil feature state is not found.
26-
func GetEnvironmentFeatureState(environment environments.EnvironmentModel, featureName string) *features.FeatureStateModel {
26+
func GetEnvironmentFeatureState(environment *environments.EnvironmentModel, featureName string) *features.FeatureStateModel {
2727
for _, fs := range environment.FeatureStates {
2828
if fs.Feature.Name == featureName {
2929
return fs

flagengine/engine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func TestEnvironmentGetFeatureStateFeatureNotFound(t *testing.T) {
153153
assert.Nil(t, fs)
154154
}
155155

156-
func getEnvironmentFeatureStateForFeature(env environments.EnvironmentModel, feature *features.FeatureModel) *features.FeatureStateModel {
156+
func getEnvironmentFeatureStateForFeature(env *environments.EnvironmentModel, feature *features.FeatureModel) *features.FeatureStateModel {
157157
for _, fs := range env.FeatureStates {
158158
if fs.Feature == feature {
159159
return fs

flagengine/flagengine_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestEngine(t *testing.T) {
4343
t.Run(strconv.Itoa(i)+":"+c.Identity.CompositeKey(), func(t *testing.T) {
4444
assert := assert.New(t)
4545
require := require.New(t)
46-
actual := flagengine.GetIdentityFeatureStates(testData.Environment, &c.Identity)
46+
actual := flagengine.GetIdentityFeatureStates(&testData.Environment, &c.Identity)
4747
expected := c.Response.Flags
4848

4949
sort.Slice(actual, func(i, j int) bool {

flagengine/utils/fixtures/fixtures.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func Feature2() *features.FeatureModel {
7777
}
7878
}
7979

80-
func Environment(feature1, feature2 *features.FeatureModel, project *projects.ProjectModel) environments.EnvironmentModel {
81-
return environments.EnvironmentModel{
80+
func Environment(feature1, feature2 *features.FeatureModel, project *projects.ProjectModel) *environments.EnvironmentModel {
81+
return &environments.EnvironmentModel{
8282
ID: 1,
8383
APIKey: "api-key",
8484
Project: project,
@@ -89,7 +89,7 @@ func Environment(feature1, feature2 *features.FeatureModel, project *projects.Pr
8989
}
9090
}
9191

92-
func Identity(env environments.EnvironmentModel) *identities.IdentityModel {
92+
func Identity(env *environments.EnvironmentModel) *identities.IdentityModel {
9393
return &identities.IdentityModel{
9494
Identifier: "identity_1",
9595
EnvironmentAPIKey: env.APIKey,
@@ -104,15 +104,15 @@ func TraitMatchingSegment(segCond *segments.SegmentConditionModel) *traits.Trait
104104
}
105105
}
106106

107-
func IdentityInSegment(trait *traits.TraitModel, env environments.EnvironmentModel) *identities.IdentityModel {
107+
func IdentityInSegment(trait *traits.TraitModel, env *environments.EnvironmentModel) *identities.IdentityModel {
108108
return &identities.IdentityModel{
109109
Identifier: "identity_2",
110110
EnvironmentAPIKey: env.APIKey,
111111
IdentityTraits: []*traits.TraitModel{trait},
112112
}
113113
}
114114

115-
func SegmentOverrideFs(segment *segments.SegmentModel, feature *features.FeatureModel) *features.FeatureStateModel {
115+
func SegmentOverrideFs(_ *segments.SegmentModel, feature *features.FeatureModel) *features.FeatureStateModel {
116116
return &features.FeatureStateModel{
117117
DjangoID: 4,
118118
Feature: feature,
@@ -134,16 +134,16 @@ func MVFeatureStateValue() *features.MultivariateFeatureStateValueModel {
134134
}
135135

136136
func EnvironmentWithSegmentOverride(
137-
env environments.EnvironmentModel,
137+
env *environments.EnvironmentModel,
138138
featureState *features.FeatureStateModel,
139139
segment *segments.SegmentModel,
140-
) environments.EnvironmentModel {
140+
) *environments.EnvironmentModel {
141141
segment.FeatureStates = append(segment.FeatureStates, featureState)
142142
env.Project.Segments = append(env.Project.Segments, segment)
143143
return env
144144
}
145145

146-
func GetFixtures() (*features.FeatureModel, *features.FeatureModel, *segments.SegmentModel, environments.EnvironmentModel, *identities.IdentityModel) {
146+
func GetFixtures() (*features.FeatureModel, *features.FeatureModel, *segments.SegmentModel, *environments.EnvironmentModel, *identities.IdentityModel) {
147147
feature1 := Feature1()
148148
feature2 := Feature2()
149149
org := Organisation()

0 commit comments

Comments
 (0)