(FFM-7235) Update feature configs endpoints (#136)

Author: conormurray95

docs/sample_curl_requests.md

@@ -20,7 +20,7 @@ Fetches an authentication token that can be used for future requests:
 
 If sending this request to a Relay Proxy instance running on localhost:7000 this would be:
 
-`curl -v 'http://localost:7000/client/auth'  -H 'content-type: application/json'  --data-raw '{"apiKey":"${API_KEY}"}'`
+`curl -v 'http://localhost:7000/client/auth'  -H 'content-type: application/json'  --data-raw '{"apiKey":"${API_KEY}"}'`
 
 This should return a 200 code and a body that includes an auth token that we’ll use for future requests e.g.
 

domain/domain.go

@@ -25,7 +25,6 @@ type FeatureFlag rest.FeatureConfig
 // we return from /GET client/env/<env>/feature-configs
 type FeatureConfig struct {
 	FeatureFlag
-	Segments map[string]Segment `json:"segments"`
 }
 
 // MarshalBinary marshals a FeatureFlag to bytes. Currently it just uses json

proxy-service/service.go

@@ -68,12 +68,6 @@ var (
 	ErrUnauthorised = errors.New("unauthorised")
 )
 
-// evaluator is a type that can perform evaluations
-type evaluator interface {
-	// Evaluate evaluates featureConfig(s) against a target and returns an evaluation
-	Evaluate(target domain.Target, featureConfigs ...domain.FeatureConfig) ([]clientgen.Evaluation, error)
-}
-
 // authTokenFn is a function that can generate an auth token
 type authTokenFn func(key string) (domain.Token, error)
 
@@ -197,7 +191,6 @@ func (s Service) FeatureConfig(ctx context.Context, req domain.FeatureConfigRequ
 
 	configs := []domain.FeatureConfig{}
 	flagKey := domain.NewFeatureConfigKey(req.EnvironmentID)
-	segmentKey := domain.NewSegmentKey(req.EnvironmentID)
 
 	// fetch flags
 	flags, err := s.featureRepo.Get(ctx, flagKey)
@@ -210,21 +203,10 @@ func (s Service) FeatureConfig(ctx context.Context, req domain.FeatureConfigRequ
 		s.logger.Debug(ctx, "flags not found in cache: ", "err", err.Error())
 	}
 
-	// fetch segments
-	segments, err := s.segmentRepo.GetAsMap(ctx, segmentKey)
-	if err != nil {
-		if !errors.Is(err, domain.ErrCacheNotFound) {
-			return []domain.FeatureConfig{}, fmt.Errorf("%w: %s", ErrInternal, err)
-		}
-		// segments aren't required so just log and continue here
-		s.logger.Debug(ctx, "target segments not found in cache: ", "err", err.Error())
-	}
-
 	// build FeatureConfig
 	for _, flag := range flags {
 		configs = append(configs, domain.FeatureConfig{
 			FeatureFlag: flag,
-			Segments:    segments,
 		})
 	}
 
@@ -236,7 +218,6 @@ func (s Service) FeatureConfigByIdentifier(ctx context.Context, req domain.Featu
 	s.logger = s.logger.With("method", "FeatureConfigByIdentifier")
 
 	flagKey := domain.NewFeatureConfigKey(req.EnvironmentID)
-	segmentKey := domain.NewSegmentKey(req.EnvironmentID)
 
 	// fetch flag
 	flag, err := s.featureRepo.GetByIdentifier(ctx, flagKey, req.Identifier)
@@ -247,20 +228,9 @@ func (s Service) FeatureConfigByIdentifier(ctx context.Context, req domain.Featu
 		return domain.FeatureConfig{}, fmt.Errorf("%w: %s", ErrInternal, err)
 	}
 
-	// fetch segments
-	segments, err := s.segmentRepo.GetAsMap(ctx, segmentKey)
-	if err != nil {
-		if !errors.Is(err, domain.ErrCacheNotFound) {
-			return domain.FeatureConfig{}, fmt.Errorf("%w: %s", ErrInternal, err)
-		}
-		// segments aren't required so just log and continue here
-		s.logger.Debug(ctx, "target segments not found in cache: ", "err", err.Error())
-	}
-
 	// build FeatureConfig
 	return domain.FeatureConfig{
 		FeatureFlag: flag,
-		Segments:    segments,
 	}, nil
 }
 

transport/http_server_test.go

@@ -249,8 +249,8 @@ func setupHTTPServer(t *testing.T, bypassAuth bool, opts ...setupOpts) *HTTPServ
 }
 
 // variationToTargetMap:null is intentional here - refer to FFM-3246 before removing
-// featureConfigWithSegments is the expected response body for a FeatureConfigs request - the newline at the end is intentional
-var featureConfigWithSegments = []byte(`[{"defaultServe":{"variation":"true"},"environment":"featureflagsqa","feature":"harnessappdemodarkmode","kind":"boolean","offVariation":"false","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[{"clauses":[{"attribute":"age","id":"79f5bca0-17ca-42c2-8934-5cee840fe2e0","negate":false,"op":"equal","values":["55"]}],"priority":1,"ruleId":"8756c207-abf8-4202-83fd-dedf5d27e2c2","serve":{"variation":"false"}}],"state":"on","variationToTargetMap":[{"targetSegments":["flagsTeam"],"targets":[{"identifier":"davej","name":"Dave Johnston"}],"variation":"false"}],"variations":[{"identifier":"true","name":"True","value":"true"},{"identifier":"false","name":"False","value":"false"}],"version":568,"segments":{"flagsTeam":{"createdAt":123,"environment":"featureflagsqa","excluded":[],"identifier":"flagsTeam","included":[],"modifiedAt":456,"name":"flagsTeam","rules":[{"attribute":"ip","id":"31c18ee7-8051-44cc-8507-b44580467ee5","negate":false,"op":"equal","values":["2a00:23c5:b672:2401:158:f2a6:67a0:6a79"]}],"version":1}}},{"defaultServe":{"variation":"1"},"environment":"featureflagsqa","feature":"yet_another_flag","kind":"string","offVariation":"2","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[],"state":"on","variations":[{"identifier":"1","name":"1","value":"1"},{"identifier":"2","name":"2","value":"2"}],"variationToTargetMap":[],"version":6,"segments":{"flagsTeam":{"createdAt":123,"environment":"featureflagsqa","excluded":[],"identifier":"flagsTeam","included":[],"modifiedAt":456,"name":"flagsTeam","rules":[{"attribute":"ip","id":"31c18ee7-8051-44cc-8507-b44580467ee5","negate":false,"op":"equal","values":["2a00:23c5:b672:2401:158:f2a6:67a0:6a79"]}],"version":1}}}]
+// featureConfig is the expected response body for a FeatureConfigs request - the newline at the end is intentional
+var featureConfig = []byte(`[{"defaultServe":{"variation":"true"},"environment":"featureflagsqa","feature":"harnessappdemodarkmode","kind":"boolean","offVariation":"false","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[{"clauses":[{"attribute":"age","id":"79f5bca0-17ca-42c2-8934-5cee840fe2e0","negate":false,"op":"equal","values":["55"]}],"priority":1,"ruleId":"8756c207-abf8-4202-83fd-dedf5d27e2c2","serve":{"variation":"false"}}],"state":"on","variationToTargetMap":[{"targetSegments":["flagsTeam"],"targets":[{"identifier":"davej","name":"Dave Johnston"}],"variation":"false"}],"variations":[{"identifier":"true","name":"True","value":"true"},{"identifier":"false","name":"False","value":"false"}],"version":568},{"defaultServe":{"variation":"1"},"environment":"featureflagsqa","feature":"yet_another_flag","kind":"string","offVariation":"2","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[],"state":"on","variationToTargetMap":[],"variations":[{"identifier":"1","name":"1","value":"1"},{"identifier":"2","name":"2","value":"2"}],"version":6}]
 `)
 
 var emptyFeatureConfig = []byte(`[]
@@ -288,7 +288,7 @@ func TestHTTPServer_GetFeatureConfig(t *testing.T) {
 			method:               http.MethodGet,
 			url:                  fmt.Sprintf("%s/client/env/1234/feature-configs", testServer.URL),
 			expectedStatusCode:   http.StatusOK,
-			expectedResponseBody: featureConfigWithSegments,
+			expectedResponseBody: featureConfig,
 		},
 	}
 	for desc, tc := range testCases {
@@ -333,7 +333,7 @@ func TestHTTPServer_GetFeatureConfig(t *testing.T) {
 }
 
 // harnessAppDemoDarkMode is the expected response body for a FeatureConfigsByIdentifier request where identifier='harnessappdemodarkmode' - the newline at the end is intentional
-var harnessAppDemoDarkMode = []byte(`{"defaultServe":{"variation":"true"},"environment":"featureflagsqa","feature":"harnessappdemodarkmode","kind":"boolean","offVariation":"false","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[{"clauses":[{"attribute":"age","id":"79f5bca0-17ca-42c2-8934-5cee840fe2e0","negate":false,"op":"equal","values":["55"]}],"priority":1,"ruleId":"8756c207-abf8-4202-83fd-dedf5d27e2c2","serve":{"variation":"false"}}],"state":"on","variationToTargetMap":[{"targetSegments":["flagsTeam"],"targets":[{"identifier":"davej","name":"Dave Johnston"}],"variation":"false"}],"variations":[{"identifier":"true","name":"True","value":"true"},{"identifier":"false","name":"False","value":"false"}],"version":568,"segments":{"flagsTeam":{"createdAt":123,"environment":"featureflagsqa","excluded":[],"identifier":"flagsTeam","included":[],"modifiedAt":456,"name":"flagsTeam","rules":[{"attribute":"ip","id":"31c18ee7-8051-44cc-8507-b44580467ee5","negate":false,"op":"equal","values":["2a00:23c5:b672:2401:158:f2a6:67a0:6a79"]}],"version":1}}}
+var harnessAppDemoDarkMode = []byte(`{"defaultServe":{"variation":"true"},"environment":"featureflagsqa","feature":"harnessappdemodarkmode","kind":"boolean","offVariation":"false","prerequisites":[],"project":"FeatureFlagsQADemo","rules":[{"clauses":[{"attribute":"age","id":"79f5bca0-17ca-42c2-8934-5cee840fe2e0","negate":false,"op":"equal","values":["55"]}],"priority":1,"ruleId":"8756c207-abf8-4202-83fd-dedf5d27e2c2","serve":{"variation":"false"}}],"state":"on","variationToTargetMap":[{"targetSegments":["flagsTeam"],"targets":[{"identifier":"davej","name":"Dave Johnston"}],"variation":"false"}],"variations":[{"identifier":"true","name":"True","value":"true"},{"identifier":"false","name":"False","value":"false"}],"version":568}
 `)
 
 // TestHTTPServer_GetFeatureConfigByIdentifier sets up a service with repositories