chore: simplify featuregate interface (#4454)

Author: borosr

openmeter/billing/worker/subscriptionsync/service/reconciler/patch.go

@@ -80,9 +80,15 @@ func (c patchCollectionRouterConfig) Validate() error {
 	if c.capacity <= 0 {
 		return fmt.Errorf("capacity is required")
 	}
+
 	if c.invoices == nil {
 		return fmt.Errorf("invoices is required")
 	}
+
+	if c.featureGate == nil {
+		return fmt.Errorf("feature gate is required")
+	}
+
 	return nil
 }
 
@@ -133,11 +139,7 @@ func (c patchCollectionRouter) isCreditsEnabled(ns string) (bool, error) {
 	if c.creditsFlag == "" {
 		return true, nil
 	}
-	gate, err := c.featureGate.WithOrg(featuregate.NamespaceOrg(ns))
-	if err != nil {
-		return false, err
-	}
-	return gate.EvaluateBool(c.creditsFlag, false)
+	return c.featureGate.EvaluateBool(ns, c.creditsFlag, false)
 }
 
 func (c patchCollectionRouter) ResolveDefaultCollection(target targetstate.StateItem) (PatchCollection, error) {

openmeter/billing/worker/subscriptionsync/service/reconciler/patch_test.go

@@ -143,18 +143,14 @@ func TestIsCreditEnabled(t *testing.T) {
 	})
 
 	t.Run("no_feature_gate_client", func(t *testing.T) {
-		router, err := newPatchCollectionRouter(patchCollectionRouterConfig{
+		_, err := newPatchCollectionRouter(patchCollectionRouterConfig{
 			capacity:                 1,
 			invoices:                 persistedstate.Invoices{},
 			creditThenInvoiceEnabled: false,
 			creditsEnabled:           true,
-			featureGate:              nil, // If feature gate is nil, it should default to enabled.
+			featureGate:              nil,
 		})
-		require.NoError(t, err)
-
-		enabled, err := router.isCreditsEnabled("test")
-		require.NoError(t, err)
-		require.True(t, enabled)
+		require.Error(t, err)
 	})
 
 	t.Run("credit_flag_disabled", func(t *testing.T) {

openmeter/billing/worker/subscriptionsync/service/reconciler/reconciler.go

@@ -49,6 +49,10 @@ func (c Config) Validate() error {
 		return fmt.Errorf("charges service is required when credit then invoice is enabled")
 	}
 
+	if c.FeatureGate == nil {
+		return fmt.Errorf("feature gate is required")
+	}
+
 	return nil
 }
 

openmeter/billing/worker/subscriptionsync/service/service.go

@@ -59,6 +59,10 @@ func (c Config) Validate() error {
 		return fmt.Errorf("tracer is required")
 	}
 
+	if c.FeatureGate == nil {
+		return fmt.Errorf("feature gate is required")
+	}
+
 	return nil
 }
 

pkg/featuregate/featuregate.go

@@ -1,39 +1,7 @@
 package featuregate
 
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/samber/lo"
-)
-
-type Org interface {
-	Context
-
-	ID() *uuid.UUID
-	PortalID() *uuid.UUID
-	OrgName() *string
-	FeatureSet() *string
-	Tier() *string
-}
-
-type Context interface {
-	Key() string
-	Kind() string
-	Anonymous() bool
-	GetCustomAttributes() map[string]any
-	AddCustomAttribute(name string, value any)
-}
-
 type Gate interface {
-	EvaluateBool(flag string, defaultValue bool) (bool, error)
-	EvaluateInt(flag string, defaultValue int) (int, error)
-	EvaluateFloat64(flag string, defaultValue float64) (float64, error)
-	EvaluateString(flag string, defaultValue string) (string, error)
-	EvaluateJSON(flag string, defaultValue json.RawMessage) (json.RawMessage, error)
-
-	WithOrg(org Org) (Gate, error)
-	WithFFContext(custom ...Context) (Gate, error)
+	EvaluateBool(namespace, flag string, defaultValue bool) (bool, error)
 }
 
 func NewNoop() Gate {
@@ -42,72 +10,6 @@ func NewNoop() Gate {
 
 type Noop struct{}
 
-func (n Noop) EvaluateBool(string, bool) (bool, error) {
+func (n Noop) EvaluateBool(string, string, bool) (bool, error) {
 	return true, nil
 }
-
-func (n Noop) EvaluateInt(string, int) (int, error) {
-	return 0, nil
-}
-
-func (n Noop) EvaluateFloat64(string, float64) (float64, error) {
-	return 0, nil
-}
-
-func (n Noop) EvaluateString(string, string) (string, error) {
-	return "", nil
-}
-
-func (n Noop) EvaluateJSON(string, json.RawMessage) (json.RawMessage, error) {
-	return json.RawMessage(`{}`), nil
-}
-
-func (n Noop) WithFFContext(custom ...Context) (Gate, error) {
-	return Noop{}, nil
-}
-
-func (n Noop) WithOrg(org Org) (Gate, error) {
-	return n.WithFFContext(org)
-}
-
-type NamespaceOrg string
-
-var _ Org = NamespaceOrg("")
-
-func (n NamespaceOrg) AddCustomAttribute(name string, value any) {}
-
-func (n NamespaceOrg) Anonymous() bool {
-	return false
-}
-
-func (n NamespaceOrg) FeatureSet() *string {
-	return nil
-}
-
-func (n NamespaceOrg) GetCustomAttributes() map[string]any {
-	return nil
-}
-
-func (n NamespaceOrg) ID() *uuid.UUID {
-	return lo.ToPtr(uuid.NewSHA1(uuid.NameSpaceURL, []byte(n)))
-}
-
-func (n NamespaceOrg) Key() string {
-	return string(n)
-}
-
-func (n NamespaceOrg) Kind() string {
-	return "namespace"
-}
-
-func (n NamespaceOrg) OrgName() *string {
-	return lo.ToPtr(string(n))
-}
-
-func (n NamespaceOrg) PortalID() *uuid.UUID {
-	return n.ID()
-}
-
-func (n NamespaceOrg) Tier() *string {
-	return nil
-}