fix: update config to commands (and queries) (#1342)

* fix: adaot config to commands (and queries)

* remove dependency on vv2 in v1

* add queries user to operator

* set password for queries on tests

* set password for queries on tests

* fix config

internal/eventstore/config.go

@@ -0,0 +1,24 @@
+package eventstore
+
+import (
+	"github.com/caos/zitadel/internal/config/types"
+	"github.com/caos/zitadel/internal/eventstore/repository/sql"
+)
+
+func Start(sqlConfig types.SQL) (*Eventstore, error) {
+	sqlClient, err := sqlConfig.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	return NewEventstore(sql.NewCRDB(sqlClient)), nil
+}
+
+func StartWithUser(baseConfig types.SQLBase, userConfig types.SQLUser) (*Eventstore, error) {
+	sqlClient, err := userConfig.Start(baseConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewEventstore(sql.NewCRDB(sqlClient)), nil
+}

internal/eventstore/local_crdb_test.go

@@ -95,6 +95,7 @@ func setPasswordNULL() error {
 		"authpassword",
 		"notificationpassword",
 		"authzpassword",
+		"queriespassword",
 	}
 	for _, name := range passwordNames {
 		if err := os.Setenv(name, "NULL"); err != nil {

internal/eventstore/repository/sql/local_crdb_test.go

@@ -99,6 +99,7 @@ func setPasswordNULL() error {
 		"authpassword",
 		"notificationpassword",
 		"authzpassword",
+		"queriespassword",
 	}
 	for _, name := range passwordNames {
 		if err := os.Setenv(name, "NULL"); err != nil {

internal/eventstore/v1/config.go

@@ -2,10 +2,7 @@ package v1
 
 import (
 	"github.com/caos/zitadel/internal/cache/config"
-	eventstore2 "github.com/caos/zitadel/internal/eventstore"
-	sql_v2 "github.com/caos/zitadel/internal/eventstore/repository/sql"
 	"github.com/caos/zitadel/internal/eventstore/v1/internal/repository/sql"
-	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Config struct {
@@ -15,14 +12,12 @@ type Config struct {
 }
 
 func Start(conf Config) (Eventstore, error) {
-	repo, sqlClient, err := sql.Start(conf.Repository)
+	repo, _, err := sql.Start(conf.Repository)
 	if err != nil {
 		return nil, err
 	}
 
 	return &eventstore{
-		repo:             repo,
-		aggregateCreator: models.NewAggregateCreator(conf.ServiceName),
-		esV2:             eventstore2.NewEventstore(sql_v2.NewCRDB(sqlClient)),
+		repo: repo,
 	}, nil
 }

internal/eventstore/v1/eventstore.go

@@ -2,54 +2,22 @@ package v1
 
 import (
 	"context"
-	eventstore2 "github.com/caos/zitadel/internal/eventstore"
 
-	"github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1/internal/repository"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Eventstore interface {
-	AggregateCreator() *models.AggregateCreator
 	Health(ctx context.Context) error
-	PushAggregates(ctx context.Context, aggregates ...*models.Aggregate) error
 	FilterEvents(ctx context.Context, searchQuery *models.SearchQuery) (events []*models.Event, err error)
 	LatestSequence(ctx context.Context, searchQuery *models.SearchQueryFactory) (uint64, error)
-	V2() *eventstore2.Eventstore
 	Subscribe(aggregates ...models.AggregateType) *Subscription
 }
 
 var _ Eventstore = (*eventstore)(nil)
 
 type eventstore struct {
-	repo             repository.Repository
-	aggregateCreator *models.AggregateCreator
-
-	esV2 *eventstore2.Eventstore
-}
-
-func (es *eventstore) AggregateCreator() *models.AggregateCreator {
-	return es.aggregateCreator
-}
-
-func (es *eventstore) PushAggregates(ctx context.Context, aggregates ...*models.Aggregate) (err error) {
-	for _, aggregate := range aggregates {
-		if len(aggregate.Events) == 0 {
-			return errors.ThrowInvalidArgument(nil, "EVENT-cNhIj", "no events in aggregate")
-		}
-		for _, event := range aggregate.Events {
-			if err = event.Validate(); err != nil {
-				return errors.ThrowInvalidArgument(err, "EVENT-tzIhl", "validate event failed")
-			}
-		}
-	}
-	err = es.repo.PushAggregates(ctx, aggregates...)
-	if err != nil {
-		return err
-	}
-
-	go notify(aggregates)
-	return nil
+	repo repository.Repository
 }
 
 func (es *eventstore) FilterEvents(ctx context.Context, searchQuery *models.SearchQuery) ([]*models.Event, error) {
@@ -69,7 +37,3 @@ func (es *eventstore) LatestSequence(ctx context.Context, queryFactory *models.S
 func (es *eventstore) Health(ctx context.Context) error {
 	return es.repo.Health(ctx)
 }
-
-func (es *eventstore) V2() *eventstore2.Eventstore {
-	return es.esV2
-}