feat(subject): remove manager (#3398)

Author: hekike

app/common/subject.go

@@ -1,20 +1,17 @@
 package common
 
 import (
-	"context"
 	"fmt"
 	"log/slog"
 
 	"github.com/google/wire"
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/openmeterio/openmeter/app/config"
 	"github.com/openmeterio/openmeter/openmeter/customer"
 	entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
 	"github.com/openmeterio/openmeter/openmeter/registry"
 	"github.com/openmeterio/openmeter/openmeter/subject"
 	"github.com/openmeterio/openmeter/openmeter/subject/adapter"
-	"github.com/openmeterio/openmeter/openmeter/subject/manager"
 	"github.com/openmeterio/openmeter/openmeter/subject/service"
 	subjecthooks "github.com/openmeterio/openmeter/openmeter/subject/service/hooks"
 )
@@ -24,38 +21,12 @@ var Subject = wire.NewSet(
 	NewSubjectAdapter,
 )
 
-var SubjectManager = wire.NewSet(
-	NewSubjectManager,
-)
-
 func NewSubjectService(
 	adapter subject.Adapter,
 ) (subject.Service, error) {
 	return service.New(adapter)
 }
 
-func NewSubjectManager(
-	ctx context.Context,
-	ent *entdb.Client,
-	logger *slog.Logger,
-	subjectConfig config.SubjectManagerConfig,
-) (*manager.Manager, error) {
-	subjectManager, err := manager.NewManager(&manager.Config{
-		Ent:                 ent,
-		Logger:              logger,
-		CacheReloadInterval: subjectConfig.CacheReloadInterval,
-		CacheReloadTimeout:  subjectConfig.CacheReloadTimeout,
-		CachePrefillCount:   subjectConfig.CachePrefillCount,
-		CacheSize:           subjectConfig.CacheSize,
-		PaginationSize:      subjectConfig.PaginationSize,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to create subject manager: %w", err)
-	}
-
-	return subjectManager, nil
-}
-
 func NewSubjectAdapter(
 	db *entdb.Client,
 ) (subject.Adapter, error) {

app/config/config.go

@@ -36,7 +36,6 @@ type Configuration struct {
 	Portal          PortalConfiguration
 	Postgres        PostgresConfig
 	Sink            SinkConfiguration
-	Subject         SubjectConfig
 	BalanceWorker   BalanceWorkerConfiguration
 	Notification    NotificationConfiguration
 	ProductCatalog  ProductCatalogConfiguration
@@ -120,10 +119,6 @@ func (c Configuration) Validate() error {
 		errs = append(errs, errorsx.WithPrefix(err, "svix"))
 	}
 
-	if err := c.Subject.Validate(); err != nil {
-		errs = append(errs, errorsx.WithPrefix(err, "subject"))
-	}
-
 	if err := c.ProductCatalog.Validate(); err != nil {
 		errs = append(errs, errorsx.WithPrefix(err, "product catalog"))
 	}
@@ -191,7 +186,6 @@ func SetViperDefaults(v *viper.Viper, flags *pflag.FlagSet) {
 	ConfigureNotification(v)
 	ConfigureBilling(v, flags)
 	ConfigureProductCatalog(v)
-	ConfigureSubject(v)
 	ConfigureApps(v, flags)
 	ConfigureEntitlements(v, flags)
 	ConfigureTermination(v, "termination")

app/config/config_test.go

@@ -395,15 +395,6 @@ func TestComplete(t *testing.T) {
 				},
 			},
 		},
-		Subject: SubjectConfig{
-			Manager: SubjectManagerConfig{
-				CacheReloadInterval: 5 * time.Minute,
-				CacheReloadTimeout:  2 * time.Minute,
-				CachePrefillCount:   250_000,
-				CacheSize:           1_000_000,
-				PaginationSize:      10_000,
-			},
-		},
 		Customer: CustomerConfiguration{
 			EnableSubjectHook: true,
 			IgnoreErrors:      true,