fixup: more feedbacl

Signed-off-by: Todd Baert <[email protected]>

Author: toddbaert

core/pkg/evaluator/json.go

@@ -310,11 +310,6 @@ func (je *Resolver) evaluateVariant(ctx context.Context, reqID string, flagKey s
 
 	var selector store.Selector
 	s := ctx.Value(store.SelectorContextKey{})
-	if s != nil {
-		selector = s.(store.Selector)
-	} else {
-		selector = store.NewSelector("")
-	}
 	if s != nil {
 		selector = s.(store.Selector)
 	}

core/pkg/notifications/notifications.go

@@ -12,7 +12,7 @@ const typeField = "type"
 type Notifications map[string]any
 
 // Generate notifications (deltas) from old and new flag sets for use in RPC mode PROVIDER_CONFIGURATION_CHANGE events.
-func NewFromFlags(oldFlags, newFlags map[string]model.Flag) map[string]interface{} {
+func NewFromFlags(oldFlags, newFlags map[string]model.Flag) Notifications {
 	notifications := map[string]interface{}{}
 
 	// flags removed

core/pkg/notifications/notifications_test.go

@@ -31,13 +31,13 @@ func TestNewFromFlags(t *testing.T) {
 		name     string
 		oldFlags map[string]model.Flag
 		newFlags map[string]model.Flag
-		want     map[string]interface{}
+		want     Notifications
 	}{
 		{
 			name:     "flag added",
 			oldFlags: map[string]model.Flag{},
 			newFlags: map[string]model.Flag{"flagA": flagA},
-			want: map[string]interface{}{
+			want: Notifications{
 				"flagA": map[string]interface{}{
 					"type": string(model.NotificationCreate),
 				},
@@ -47,7 +47,7 @@ func TestNewFromFlags(t *testing.T) {
 			name:     "flag deleted",
 			oldFlags: map[string]model.Flag{"flagA": flagA},
 			newFlags: map[string]model.Flag{},
-			want: map[string]interface{}{
+			want: Notifications{
 				"flagA": map[string]interface{}{
 					"type": string(model.NotificationDelete),
 				},
@@ -57,7 +57,7 @@ func TestNewFromFlags(t *testing.T) {
 			name:     "flag changed",
 			oldFlags: map[string]model.Flag{"flagA": flagA},
 			newFlags: map[string]model.Flag{"flagA": flagAUpdated},
-			want: map[string]interface{}{
+			want: Notifications{
 				"flagA": map[string]interface{}{
 					"type": string(model.NotificationUpdate),
 				},
@@ -67,7 +67,7 @@ func TestNewFromFlags(t *testing.T) {
 			name:     "flag unchanged",
 			oldFlags: map[string]model.Flag{"flagA": flagA},
 			newFlags: map[string]model.Flag{"flagA": flagA},
-			want:     map[string]interface{}{},
+			want:     Notifications{},
 		},
 		{
 			name: "mixed changes",
@@ -79,7 +79,7 @@ func TestNewFromFlags(t *testing.T) {
 				"flagA": flagAUpdated, // updated
 				"flagC": flagA,        // added
 			},
-			want: map[string]interface{}{
+			want: Notifications{
 				"flagA": map[string]interface{}{
 					"type": string(model.NotificationUpdate),
 				},

core/pkg/store/store.go

@@ -163,9 +163,12 @@ func (s *Store) Get(_ context.Context, key string, selector *Selector) (model.Fl
 		s.logger.Debug(fmt.Sprintf("getting flag with query: %s, %v", indexId, constraints))
 		raw, err := txn.First(flagsTable, indexId, constraints...)
 		flag, ok := raw.(model.Flag)
-		if (err != nil) || !ok {
+		if err != nil {
 			return model.Flag{}, queryMeta, fmt.Errorf("flag %s not found: %w", key, err)
 		}
+		if !ok {
+			return model.Flag{}, queryMeta, fmt.Errorf("flag %s is not a valid flag", key)
+		}
 		return flag, queryMeta, nil
 
 	}

flagd/pkg/service/flag-evaluation/connect_service_test.go

@@ -15,6 +15,7 @@ import (
 	mock "github.com/open-feature/flagd/core/pkg/evaluator/mock"
 	"github.com/open-feature/flagd/core/pkg/logger"
 	"github.com/open-feature/flagd/core/pkg/model"
+	"github.com/open-feature/flagd/core/pkg/notifications"
 	iservice "github.com/open-feature/flagd/core/pkg/service"
 	"github.com/open-feature/flagd/core/pkg/store"
 	"github.com/open-feature/flagd/core/pkg/telemetry"
@@ -253,7 +254,7 @@ func TestConnectServiceWatcher(t *testing.T) {
 	select {
 	case n := <-sChan:
 		require.Equal(t, ofType, n.Type, "expected notification type: %s, but received %s", ofType, n.Type)
-		notifications := n.Data["flags"].(map[string]interface{})
+		notifications := n.Data["flags"].(notifications.Notifications)
 		flag1, ok := notifications["flag1"].(map[string]interface{})
 		require.True(t, ok, "flag1 notification should be a map[string]interface{}")
 		require.Equal(t, flag1["type"], string(model.NotificationCreate), "expected notification type: %s, but received %s", model.NotificationCreate, flag1["type"])