feat: (sqlite) eval storage namespace support

internal/ext/exporter.go

@@ -16,7 +16,7 @@ const defaultBatchSize = 25
 type lister interface {
 	ListFlags(ctx context.Context, namespaceKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Flag], error)
 	ListSegments(ctx context.Context, namespaceKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Segment], error)
-	ListRules(ctx context.Context, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error)
+	ListRules(ctx context.Context, namespaceKey, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error)
 }
 
 type Exporter struct {
@@ -88,8 +88,10 @@ func (e *Exporter) Export(ctx context.Context, w io.Writer) error {
 				variantKeys[v.Id] = v.Key
 			}
 
+			// TODO: support all namespaces
+
 			// export rules for flag
-			resp, err := e.store.ListRules(ctx, flag.Key)
+			resp, err := e.store.ListRules(ctx, storage.DefaultNamespace, flag.Key)
 			if err != nil {
 				return fmt.Errorf("getting rules for flag %q: %w", flag.Key, err)
 			}

internal/ext/exporter_test.go

@@ -34,7 +34,7 @@ func (m mockLister) ListSegments(ctx context.Context, namespaceKey string, opts
 	}, m.segmentErr
 }
 
-func (m mockLister) ListRules(ctx context.Context, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error) {
+func (m mockLister) ListRules(ctx context.Context, namespaceKey string, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error) {
 	return storage.ResultSet[*flipt.Rule]{
 		Results: m.rules,
 	}, m.ruleErr

internal/server/evaluator.go

@@ -22,6 +22,11 @@ import (
 // Evaluate evaluates a request for a given flag and entity
 func (s *Server) Evaluate(ctx context.Context, r *flipt.EvaluationRequest) (*flipt.EvaluationResponse, error) {
 	s.logger.Debug("evaluate", zap.Stringer("request", r))
+
+	if r.NamespaceKey == "" {
+		r.NamespaceKey = storage.DefaultNamespace
+	}
+
 	resp, err := s.evaluate(ctx, r)
 	if err != nil {
 		return resp, err
@@ -53,6 +58,11 @@ func (s *Server) Evaluate(ctx context.Context, r *flipt.EvaluationRequest) (*fli
 // BatchEvaluate evaluates a request for multiple flags and entities
 func (s *Server) BatchEvaluate(ctx context.Context, r *flipt.BatchEvaluationRequest) (*flipt.BatchEvaluationResponse, error) {
 	s.logger.Debug("batch-evaluate", zap.Stringer("request", r))
+
+	if r.NamespaceKey == "" {
+		r.NamespaceKey = storage.DefaultNamespace
+	}
+
 	resp, err := s.batchEvaluate(ctx, r)
 	if err != nil {
 		return nil, err
@@ -68,9 +78,16 @@ func (s *Server) batchEvaluate(ctx context.Context, r *flipt.BatchEvaluationRequ
 
 	// TODO: we should change this to a native batch query instead of looping through
 	// each request individually
-	for _, flag := range r.GetRequests() {
+	for _, req := range r.GetRequests() {
+		// ensure all requests have the same namespace
+		if req.NamespaceKey == "" {
+			req.NamespaceKey = r.NamespaceKey
+		} else if req.NamespaceKey != r.NamespaceKey {
+			return &res, errs.InvalidFieldError("namespace_key", "must be the same for all requests if specified")
+		}
+
 		// TODO: we also need to validate each request, we should likely do this in the validation middleware
-		f, err := s.evaluate(ctx, flag)
+		f, err := s.evaluate(ctx, req)
 		if err != nil {
 			var errnf errs.ErrNotFound
 			if r.GetExcludeNotFound() && errors.As(err, &errnf) {
@@ -90,7 +107,9 @@ func (s *Server) evaluate(ctx context.Context, r *flipt.EvaluationRequest) (resp
 		startTime = time.Now().UTC()
 		flagAttr  = metrics.AttributeFlag.String(r.FlagKey)
 	)
+
 	metrics.EvaluationsTotal.Add(ctx, 1, flagAttr)
+
 	defer func() {
 		if err == nil {
 			metrics.EvaluationResultsTotal.Add(ctx, 1,
@@ -136,7 +155,7 @@ func (s *Server) evaluate(ctx context.Context, r *flipt.EvaluationRequest) (resp
 		return resp, nil
 	}
 
-	rules, err := s.store.GetEvaluationRules(ctx, r.FlagKey)
+	rules, err := s.store.GetEvaluationRules(ctx, r.NamespaceKey, r.FlagKey)
 	if err != nil {
 		resp.Reason = flipt.EvaluationReason_ERROR_EVALUATION_REASON
 		return resp, err

internal/server/evaluator_test.go

@@ -43,7 +43,7 @@ func TestBatchEvaluate(t *testing.T) {
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 	store.On("GetFlag", mock.Anything, mock.Anything, "bar").Return(disabled, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
 	resp, err := s.BatchEvaluate(context.TODO(), &flipt.BatchEvaluationRequest{
 		RequestId: "12345",
@@ -68,6 +68,35 @@ func TestBatchEvaluate(t *testing.T) {
 	assert.False(t, resp.Responses[0].Match)
 }
 
+func TestBatchEvaluate_NamespaceMismatch(t *testing.T) {
+	var (
+		store  = &storeMock{}
+		logger = zaptest.NewLogger(t)
+		s      = &Server{
+			logger: logger,
+			store:  store,
+		}
+	)
+
+	_, err := s.BatchEvaluate(context.TODO(), &flipt.BatchEvaluationRequest{
+		NamespaceKey:    "foo",
+		RequestId:       "12345",
+		ExcludeNotFound: true,
+		Requests: []*flipt.EvaluationRequest{
+			{
+				NamespaceKey: "bar",
+				EntityId:     "1",
+				FlagKey:      "foo",
+				Context: map[string]string{
+					"bar": "boz",
+				},
+			},
+		},
+	})
+
+	assert.EqualError(t, err, "invalid field namespace_key: must be the same for all requests if specified")
+}
+
 func TestBatchEvaluate_FlagNotFoundExcluded(t *testing.T) {
 	var (
 		store  = &storeMock{}
@@ -86,7 +115,7 @@ func TestBatchEvaluate_FlagNotFoundExcluded(t *testing.T) {
 	store.On("GetFlag", mock.Anything, mock.Anything, "bar").Return(disabled, nil)
 	store.On("GetFlag", mock.Anything, mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errs.ErrNotFoundf("flag %q", "NotFoundFlag"))
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
 	resp, err := s.BatchEvaluate(context.TODO(), &flipt.BatchEvaluationRequest{
 		RequestId:       "12345",
@@ -134,7 +163,7 @@ func TestBatchEvaluate_FlagNotFound(t *testing.T) {
 	store.On("GetFlag", mock.Anything, mock.Anything, "bar").Return(disabled, nil)
 	store.On("GetFlag", mock.Anything, mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errs.ErrNotFoundf("flag %q", "NotFoundFlag"))
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
 	_, err := s.BatchEvaluate(context.TODO(), &flipt.BatchEvaluationRequest{
 		RequestId:       "12345",
@@ -225,7 +254,7 @@ func TestEvaluate_FlagNoRules(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
 	resp, err := s.Evaluate(context.TODO(), &flipt.EvaluationRequest{
 		EntityId: "1",
@@ -252,7 +281,7 @@ func TestEvaluate_ErrorGettingRules(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, errors.New("error getting rules!"))
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return([]*storage.EvaluationRule{}, errors.New("error getting rules!"))
 
 	resp, err := s.Evaluate(context.TODO(), &flipt.EvaluationRequest{
 		EntityId: "1",
@@ -279,7 +308,7 @@ func TestEvaluate_RulesOutOfOrder(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -341,7 +370,7 @@ func TestEvaluate_ErrorGettingDistributions(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -389,7 +418,7 @@ func TestEvaluate_MatchAll_NoVariants_NoDistributions(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -478,7 +507,7 @@ func TestEvaluate_MatchAll_SingleVariantDistribution(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -608,7 +637,7 @@ func TestEvaluate_MatchAll_RolloutDistribution(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -729,7 +758,7 @@ func TestEvaluate_MatchAll_RolloutDistribution_MultiRule(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -804,7 +833,7 @@ func TestEvaluate_MatchAll_NoConstraints(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -915,7 +944,7 @@ func TestEvaluate_MatchAny_NoVariants_NoDistributions(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1004,7 +1033,7 @@ func TestEvaluate_MatchAny_SingleVariantDistribution(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1166,7 +1195,7 @@ func TestEvaluate_MatchAny_RolloutDistribution(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1287,7 +1316,7 @@ func TestEvaluate_MatchAny_RolloutDistribution_MultiRule(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1362,7 +1391,7 @@ func TestEvaluate_MatchAny_NoConstraints(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1473,7 +1502,7 @@ func TestEvaluate_FirstRolloutRuleIsZero(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",
@@ -1573,7 +1602,7 @@ func TestEvaluate_MultipleZeroRolloutDistributions(t *testing.T) {
 
 	store.On("GetFlag", mock.Anything, mock.Anything, "foo").Return(enabledFlag, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",

internal/server/middleware/grpc/middleware_test.go

@@ -560,7 +560,7 @@ func TestCacheUnaryInterceptor_Evaluate(t *testing.T) {
 		Enabled: true,
 	}, nil)
 
-	store.On("GetEvaluationRules", mock.Anything, "foo").Return(
+	store.On("GetEvaluationRules", mock.Anything, mock.Anything, "foo").Return(
 		[]*storage.EvaluationRule{
 			{
 				ID:               "1",

internal/server/middleware/grpc/support_test.go

@@ -109,18 +109,18 @@ func (m *storeMock) DeleteConstraint(ctx context.Context, r *flipt.DeleteConstra
 	return args.Error(0)
 }
 
-func (m *storeMock) GetRule(ctx context.Context, id string) (*flipt.Rule, error) {
-	args := m.Called(ctx, id)
+func (m *storeMock) GetRule(ctx context.Context, namespaceKey string, id string) (*flipt.Rule, error) {
+	args := m.Called(ctx, namespaceKey, id)
 	return args.Get(0).(*flipt.Rule), args.Error(1)
 }
 
-func (m *storeMock) ListRules(ctx context.Context, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error) {
-	args := m.Called(ctx, flagKey, opts)
+func (m *storeMock) ListRules(ctx context.Context, namespaceKey string, flagKey string, opts ...storage.QueryOption) (storage.ResultSet[*flipt.Rule], error) {
+	args := m.Called(ctx, namespaceKey, flagKey, opts)
 	return args.Get(0).(storage.ResultSet[*flipt.Rule]), args.Error(1)
 }
 
-func (m *storeMock) CountRules(ctx context.Context) (uint64, error) {
-	args := m.Called(ctx)
+func (m *storeMock) CountRules(ctx context.Context, namespaceKey string) (uint64, error) {
+	args := m.Called(ctx, namespaceKey)
 	return args.Get(0).(uint64), args.Error(1)
 }
 
@@ -159,8 +159,8 @@ func (m *storeMock) DeleteDistribution(ctx context.Context, r *flipt.DeleteDistr
 	return args.Error(0)
 }
 
-func (m *storeMock) GetEvaluationRules(ctx context.Context, flagKey string) ([]*storage.EvaluationRule, error) {
-	args := m.Called(ctx, flagKey)
+func (m *storeMock) GetEvaluationRules(ctx context.Context, namespaceKey string, flagKey string) ([]*storage.EvaluationRule, error) {
+	args := m.Called(ctx, namespaceKey, flagKey)
 	return args.Get(0).([]*storage.EvaluationRule), args.Error(1)
 }
 

internal/server/rule.go

@@ -14,7 +14,7 @@ import (
 // GetRule gets a rule
 func (s *Server) GetRule(ctx context.Context, r *flipt.GetRuleRequest) (*flipt.Rule, error) {
 	s.logger.Debug("get rule", zap.Stringer("request", r))
-	rule, err := s.store.GetRule(ctx, r.Id)
+	rule, err := s.store.GetRule(ctx, r.NamespaceKey, r.Id)
 	s.logger.Debug("get rule", zap.Stringer("response", rule))
 	return rule, err
 }
@@ -41,7 +41,7 @@ func (s *Server) ListRules(ctx context.Context, r *flipt.ListRuleRequest) (*flip
 		opts = append(opts, storage.WithOffset(uint64(r.Offset)))
 	}
 
-	results, err := s.store.ListRules(ctx, r.FlagKey, opts...)
+	results, err := s.store.ListRules(ctx, r.NamespaceKey, r.FlagKey, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +50,7 @@ func (s *Server) ListRules(ctx context.Context, r *flipt.ListRuleRequest) (*flip
 
 	resp.Rules = append(resp.Rules, results.Results...)
 
-	total, err := s.store.CountRules(ctx)
+	total, err := s.store.CountRules(ctx, r.NamespaceKey)
 	if err != nil {
 		return nil, err
 	}