mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 13:52:51 +00:00
SilvanandGitHub
22ef817d5c
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
63 lines
1.9 KiB
Go
63 lines
1.9 KiB
Go
package domain
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
)
|
|
|
|
//go:generate enumer -type DomainValidationType -transform lower -trimprefix DomainValidationType -sql
|
|
type DomainValidationType uint8
|
|
|
|
const (
|
|
DomainValidationTypeDNS DomainValidationType = iota
|
|
DomainValidationTypeHTTP
|
|
)
|
|
|
|
//go:generate enumer -type DomainType -transform lower -trimprefix DomainType -sql
|
|
type DomainType uint8
|
|
|
|
const (
|
|
DomainTypeCustom DomainType = iota
|
|
DomainTypeTrusted
|
|
)
|
|
|
|
type domainColumns interface {
|
|
// InstanceIDColumn returns the column for the instance id field.
|
|
InstanceIDColumn() database.Column
|
|
// DomainColumn returns the column for the domain field.
|
|
DomainColumn() database.Column
|
|
// IsPrimaryColumn returns the column for the is primary field.
|
|
IsPrimaryColumn() database.Column
|
|
// CreatedAtColumn returns the column for the created at field.
|
|
CreatedAtColumn() database.Column
|
|
// UpdatedAtColumn returns the column for the updated at field.
|
|
UpdatedAtColumn() database.Column
|
|
}
|
|
|
|
type domainConditions interface {
|
|
// InstanceIDCondition returns a filter on the instance id field.
|
|
InstanceIDCondition(instanceID string) database.Condition
|
|
// DomainCondition returns a filter on the domain field.
|
|
DomainCondition(op database.TextOperation, domain string) database.Condition
|
|
// IsPrimaryCondition returns a filter on the is primary field.
|
|
IsPrimaryCondition(isPrimary bool) database.Condition
|
|
}
|
|
|
|
type domainChanges interface {
|
|
// SetPrimary sets a domain as primary based on the condition.
|
|
// All other domains will be set to non-primary.
|
|
//
|
|
// An error is returned if:
|
|
// - The condition identifies multiple domains.
|
|
// - The condition does not identify any domain.
|
|
//
|
|
// This is a no-op if:
|
|
// - The domain is already primary.
|
|
// - No domain matches the condition.
|
|
SetPrimary() database.Change
|
|
// SetUpdatedAt sets the updated at column.
|
|
// This is used for reducing events.
|
|
SetUpdatedAt(t time.Time) database.Change
|
|
}
|