fixup: lint

Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
open-feature · Jan 29, 2025 · 5d085e8 · 5d085e8
1 parent 0db0f4e
commit 5d085e8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/core/pkg/evaluator/json.go b/core/pkg/evaluator/json.go
@@ -157,7 +157,9 @@ func NewResolver(store store.IStore, logger *logger.Logger, jsonEvalTracer trace
 	return Resolver{store: store, Logger: logger, tracer: jsonEvalTracer}
 }
 
-func (je *Resolver) ResolveAllValues(ctx context.Context, reqID string, context map[string]any) ([]AnyValue, model.Metadata, error) {
+func (je *Resolver) ResolveAllValues(ctx context.Context, reqID string, context map[string]any) ([]AnyValue,
+	model.Metadata, error,
+) {
 	_, span := je.tracer.Start(ctx, "resolveAll")
 	defer span.End()
 

diff --git a/core/pkg/evaluator/json_test.go b/core/pkg/evaluator/json_test.go
@@ -45,7 +45,7 @@ const ValidFlags = `{
 }`
 
 const (
-	FlagSetId                  = "testSetId"
+	FlagSetID                  = "testSetId"
 	Version                    = "v33"
 	MissingFlag                = "missingFlag"
 	StaticBoolFlag             = "staticBoolFlag"
@@ -264,7 +264,7 @@ var Flags = fmt.Sprintf(`{
     }
   }
 }`,
-	FlagSetId,
+	FlagSetID,
 	Version,
 	StaticBoolFlag,
 	StaticBoolValue,
@@ -400,8 +400,8 @@ func TestMetadataResolveType(t *testing.T) {
 		flagKey  string
 		metadata model.Metadata
 	}{
-		{StaticBoolFlag, model.Metadata{"flagSetId": FlagSetId, "version": Version}},
-		{MetadataFlag, model.Metadata{"flagSetId": FlagSetId, "version": VersionOverride}},
+		{StaticBoolFlag, model.Metadata{"flagSetId": FlagSetID, "version": Version}},
+		{MetadataFlag, model.Metadata{"flagSetId": FlagSetID, "version": VersionOverride}},
 	}
 	const reqID = "default"
 	evaluator := evaluator.NewJSON(logger.NewLogger(nil, false), store.NewFlags())
@@ -419,14 +419,14 @@ func TestMetadataResolveType(t *testing.T) {
 }
 
 func TestMetadataResolveAll(t *testing.T) {
-	var expectedFlagSetMetadata = model.Metadata{"flagSetId": FlagSetId, "version": Version}
+	expectedFlagSetMetadata := model.Metadata{"flagSetId": FlagSetID, "version": Version}
 
 	tests := []struct {
 		flagKey  string
 		metadata model.Metadata
 	}{
-		{StaticBoolFlag, model.Metadata{"flagSetId": FlagSetId, "version": Version}},
-		{MetadataFlag, model.Metadata{"flagSetId": FlagSetId, "version": VersionOverride}},
+		{StaticBoolFlag, model.Metadata{"flagSetId": FlagSetID, "version": Version}},
+		{MetadataFlag, model.Metadata{"flagSetId": FlagSetID, "version": VersionOverride}},
 	}
 	const reqID = "default"
 	evaluator := evaluator.NewJSON(logger.NewLogger(nil, false), store.NewFlags())
@@ -436,7 +436,6 @@ func TestMetadataResolveAll(t *testing.T) {
 	}
 
 	for _, test := range tests {
-
 		resolutions, flagSetMetadata, _ := evaluator.ResolveAllValues(context.TODO(), reqID, nil)
 
 		for _, resolved := range resolutions {

diff --git a/core/pkg/store/flags.go b/core/pkg/store/flags.go
@@ -208,7 +208,6 @@ func (f *State) DeleteFlags(logger *logger.Logger, source string, flags map[stri
 			logger.Error(fmt.Sprintf("error while retrieving flags from the store: %v", err))
 			return notifications
 		}
-
 		for key, flag := range allFlags {
 			if flag.Source != source {
 				continue
@@ -239,7 +238,6 @@ func (f *State) DeleteFlags(logger *logger.Logger, source string, flags map[stri
 				"type":   string(model.NotificationDelete),
 				"source": source,
 			}
-
 			f.Delete(k)
 		} else {
 			logger.Warn(
@@ -248,7 +246,6 @@ func (f *State) DeleteFlags(logger *logger.Logger, source string, flags map[stri
 					source))
 		}
 	}
-
 	return notifications
 }
 
@@ -326,9 +323,8 @@ func (f *State) getMetadataForSource(source string) model.Metadata {
 	perSource, ok := f.MetadataPerSource[source]
 	if ok && perSource != nil {
 		return maps.Clone(perSource)
-	} else {
-		return model.Metadata{}
 	}
+	return model.Metadata{}
 }
 
 func (f *State) getMetadata() model.Metadata {

diff --git a/flagd/pkg/service/flag-evaluation/flag_evaluator_v2.go b/flagd/pkg/service/flag-evaluation/flag_evaluator_v2.go
@@ -66,7 +66,8 @@ func (s *FlagEvaluationService) ResolveAll(
 		Flags: make(map[string]*evalV1.AnyFlag),
 	}
 
-	resolutions, flagSetMetadata, err := s.eval.ResolveAllValues(sCtx, reqID, mergeContexts(req.Msg.GetContext().AsMap(), s.contextValues))
+	resolutions, flagSetMetadata, err := s.eval.ResolveAllValues(sCtx, reqID, mergeContexts(req.Msg.GetContext().AsMap(),
+		s.contextValues))
 	if err != nil {
 		s.logger.WarnWithID(reqID, fmt.Sprintf("error resolving all flags: %v", err))
 		return nil, fmt.Errorf("error resolving flags. Tracking ID: %s", reqID)