mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
Improves compatibility of eventstore and related database components with the new relational table package. ## Which problems are solved 1. **Incompatible Database Interfaces**: The existing eventstore was tightly coupled to the database package, which is incompatible with the new, more abstract relational table package in v3. This prevented the new command-side logic from pushing events to the legacy eventstore. 2. **Missing Health Checks**: The database interfaces in the new package lacked a Ping method, making it impossible to perform health checks on database connections. 3. **Event Publishing Logic**: The command handling logic in domain needed a way to collect and push events to the legacy eventstore after a command was successfully executed. ## How the problems are solved 1. **`LegacyEventstore` Interface**: * A new `LegacyEventstore` interface is introduced in the new `database/eventstore` . This interface exposes a `PushWithNewClient` method that accepts the new `database.QueryExecutor` interface, decoupling the v3 domain from the legacy implementation. * The `internal/eventstore.Eventstore` now implements this interface. A wrapper, PushWithClient, is added to convert the old database client types (`*sql.DB`, `*sql.Tx`) into the new `QueryExecutor` types before calling `PushWithNewClient`. 2. **Database Interface Updates**: * The `database.Pool` and `database.Client` interfaces in `storage/eventstore` have been updated to include a Ping method, allowing for consistent health checks across different database dialects. * The `postgres` and `sql` dialect implementations have been updated to support this new method. 3. **Command and Invoker Refactoring**: * The `Commander` interface in domain now includes an `Events() []legacy_es.Command` method. This allows commands to declare which events they will generate. * The `eventCollector` in the invoker logic has been redesigned. It now ensures a database transaction is started before executing a command. After successful execution, it calls the `Events()` method on the command to collect the generated events and appends them to a list. * The `eventStoreInvoker` then pushes all collected events to the legacy eventstore using the new `LegacyEventstore` interface, ensuring that events are only pushed if the entire command (and any sub-commands) executes successfully within the transaction. 4. **Testing**: * New unit tests have been added for the invoker to verify that events are correctly collected from single commands, batched commands, and nested commands. These changes create a clean bridge between the new v3 command-side logic and the existing v1 eventstore, allowing for incremental adoption of the new architecture while maintaining full functionality. ## Additional Information closes https://github.com/zitadel/zitadel/issues/10442
147 lines
4.1 KiB
Go
147 lines
4.1 KiB
Go
package domain
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
legacy_es "github.com/zitadel/zitadel/internal/eventstore"
|
|
)
|
|
|
|
// Commander is all that is needed to implement the command pattern.
|
|
// It is the interface all manipulations need to implement.
|
|
// If possible it should also be used for queries. We will find out if this is possible in the future.
|
|
type Commander interface {
|
|
Execute(ctx context.Context, opts *CommandOpts) (err error)
|
|
// Events returns the events that should be pushed to the event store after the command is executed.
|
|
// If the command does not produce events, it should return nil or an empty slice.
|
|
Events(ctx context.Context) []legacy_es.Command
|
|
fmt.Stringer
|
|
}
|
|
|
|
// Invoker is part of the command pattern.
|
|
// It is the interface that is used to execute commands.
|
|
type Invoker interface {
|
|
Invoke(ctx context.Context, command Commander, opts *CommandOpts) error
|
|
}
|
|
|
|
// CommandOpts are passed to each command
|
|
// it provides common fields used by commands like the database client.
|
|
type CommandOpts struct {
|
|
DB database.QueryExecutor
|
|
Invoker Invoker
|
|
}
|
|
|
|
type ensureTxOpts struct {
|
|
*database.TransactionOptions
|
|
}
|
|
|
|
type EnsureTransactionOpt func(*ensureTxOpts)
|
|
|
|
// EnsureTx ensures that the DB is a transaction. If it is not, it will start a new transaction.
|
|
// The returned close function will end the transaction. If the DB is already a transaction, the close function
|
|
// will do nothing because another [Commander] is already responsible for ending the transaction.
|
|
func (o *CommandOpts) EnsureTx(ctx context.Context, opts ...EnsureTransactionOpt) (close func(context.Context, error) error, err error) {
|
|
beginner, ok := o.DB.(database.Beginner)
|
|
if !ok {
|
|
// db is already a transaction
|
|
return func(_ context.Context, err error) error {
|
|
return err
|
|
}, nil
|
|
}
|
|
|
|
txOpts := &ensureTxOpts{
|
|
TransactionOptions: new(database.TransactionOptions),
|
|
}
|
|
for _, opt := range opts {
|
|
opt(txOpts)
|
|
}
|
|
|
|
tx, err := beginner.Begin(ctx, txOpts.TransactionOptions)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
o.DB = tx
|
|
|
|
return func(ctx context.Context, err error) error {
|
|
return tx.End(ctx, err)
|
|
}, nil
|
|
}
|
|
|
|
// EnsureClient ensures that the o.DB is a client. If it is not, it will get a new client from the [database.Pool].
|
|
// The returned close function will release the client. If the o.DB is already a client or transaction, the close function
|
|
// will do nothing because another [Commander] is already responsible for releasing the client.
|
|
func (o *CommandOpts) EnsureClient(ctx context.Context) (close func(_ context.Context) error, err error) {
|
|
pool, ok := o.DB.(database.Pool)
|
|
if !ok {
|
|
// o.DB is already a client
|
|
return func(_ context.Context) error {
|
|
return nil
|
|
}, nil
|
|
}
|
|
client, err := pool.Acquire(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
o.DB = client
|
|
return func(ctx context.Context) error {
|
|
return client.Release(ctx)
|
|
}, nil
|
|
}
|
|
|
|
func (o *CommandOpts) Invoke(ctx context.Context, command Commander) error {
|
|
if o.Invoker == nil {
|
|
return command.Execute(ctx, o)
|
|
}
|
|
return o.Invoker.Invoke(ctx, command, o)
|
|
}
|
|
|
|
func DefaultOpts(invoker Invoker) *CommandOpts {
|
|
if invoker == nil {
|
|
invoker = &noopInvoker{}
|
|
}
|
|
return &CommandOpts{
|
|
DB: pool,
|
|
Invoker: invoker,
|
|
}
|
|
}
|
|
|
|
// commandBatch is a batch of commands.
|
|
// It uses the [Invoker] provided by the opts to execute each command.
|
|
type commandBatch struct {
|
|
Commands []Commander
|
|
}
|
|
|
|
// Events implements Commander.
|
|
func (cmd *commandBatch) Events(ctx context.Context) []legacy_es.Command {
|
|
commands := make([]legacy_es.Command, 0, len(cmd.Commands))
|
|
for _, c := range cmd.Commands {
|
|
if e := c.Events(ctx); len(e) > 0 {
|
|
commands = append(commands, e...)
|
|
}
|
|
}
|
|
return commands
|
|
}
|
|
|
|
func BatchCommands(cmds ...Commander) *commandBatch {
|
|
return &commandBatch{
|
|
Commands: cmds,
|
|
}
|
|
}
|
|
|
|
// String implements [Commander].
|
|
func (cmd *commandBatch) String() string {
|
|
return "commandBatch"
|
|
}
|
|
|
|
func (b *commandBatch) Execute(ctx context.Context, opts *CommandOpts) (err error) {
|
|
for _, cmd := range b.Commands {
|
|
if err = opts.Invoke(ctx, cmd); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var _ Commander = (*commandBatch)(nil)
|