mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-21 06:54:25 +00:00
## Problem description During tests we found concurrency issues in the relational table projections. Tests got flaky if a table (e.g. organization domains) had too many foreign keys to tables which were projected by another handler. ## Resolution The projections of the relational tables got merged into one handler to enforce sequential reduction of events. ## Additional info - closes https://github.com/zitadel/zitadel/issues/11703 - closes https://github.com/zitadel/zitadel/issues/10810 --------- Co-authored-by: Marco Ardizzone <[email protected]>
106 lines
3.6 KiB
Go
106 lines
3.6 KiB
Go
package projection
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
repoDomain "github.com/zitadel/zitadel/backend/v3/domain"
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
v3_sql "github.com/zitadel/zitadel/backend/v3/storage/database/dialect/sql"
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
|
"github.com/zitadel/zitadel/internal/repository/project"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
const (
|
|
ProjectRoleRelationalTable = "zitadel.project_roles"
|
|
ProjectRoleRelationalKeyCol = "key"
|
|
ProjectRoleRelationalDisplayNameCol = "display_name"
|
|
ProjectRoleRelationalRoleGroupCol = "role_group"
|
|
)
|
|
|
|
func (p *relationalTablesProjection) reduceProjectRoleAdded(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*project.RoleAddedEvent)
|
|
if !ok {
|
|
return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-EiPa5", "reduce.wrong.event.type %s", project.RoleAddedType)
|
|
}
|
|
return handler.NewStatement(e, func(ctx context.Context, ex handler.Executer, _ string) error {
|
|
tx, ok := ex.(*sql.Tx)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "HANDL-ohR0u", "reduce.wrong.db.pool %T", ex)
|
|
}
|
|
|
|
// Group is optional and nullable but not a pointer in the event
|
|
// so we need to convert the empty string to a nil pointer
|
|
var group *string
|
|
if e.Group != "" {
|
|
group = &e.Group
|
|
}
|
|
|
|
repo := repository.ProjectRepository().Role()
|
|
return repo.Create(ctx, v3_sql.SQLTx(tx), &repoDomain.ProjectRole{
|
|
InstanceID: e.Aggregate().InstanceID,
|
|
OrganizationID: e.Aggregate().ResourceOwner,
|
|
ProjectID: e.Aggregate().ID,
|
|
CreatedAt: e.CreationDate(),
|
|
UpdatedAt: e.CreationDate(),
|
|
Key: e.Key,
|
|
DisplayName: e.DisplayName,
|
|
RoleGroup: group,
|
|
})
|
|
}), nil
|
|
}
|
|
|
|
func (p *relationalTablesProjection) reduceProjectRoleChanged(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*project.RoleChangedEvent)
|
|
if !ok {
|
|
return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-PieJ9", "reduce.wrong.event.type %s", project.RoleChangedType)
|
|
}
|
|
if e.DisplayName == nil && e.Group == nil {
|
|
return handler.NewNoOpStatement(e), nil
|
|
}
|
|
|
|
repo := repository.ProjectRepository().Role()
|
|
changes := make([]database.Change, 0, 3)
|
|
changes = append(changes,
|
|
repo.SetUpdatedAt(e.CreationDate()),
|
|
)
|
|
if e.DisplayName != nil {
|
|
changes = append(changes, repo.SetDisplayName(*e.DisplayName))
|
|
}
|
|
if e.Group != nil {
|
|
changes = append(changes, repo.SetRoleGroup(*e.Group))
|
|
}
|
|
return handler.NewStatement(e, func(ctx context.Context, ex handler.Executer, _ string) error {
|
|
tx, ok := ex.(*sql.Tx)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "HANDL-ooCo1", "reduce.wrong.db.pool %T", ex)
|
|
}
|
|
_, err := repo.Update(ctx, v3_sql.SQLTx(tx),
|
|
repo.PrimaryKeyCondition(e.Aggregate().InstanceID, e.Aggregate().ID, e.Key),
|
|
changes...,
|
|
)
|
|
return err
|
|
}), nil
|
|
}
|
|
|
|
func (p *relationalTablesProjection) reduceProjectRoleRemoved(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*project.RoleRemovedEvent)
|
|
if !ok {
|
|
return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Ei9po", "reduce.wrong.event.type %s", project.RoleRemovedType)
|
|
}
|
|
return handler.NewStatement(e, func(ctx context.Context, ex handler.Executer, _ string) error {
|
|
repo := repository.ProjectRepository().Role()
|
|
tx, ok := ex.(*sql.Tx)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "HANDL-Voh4a", "reduce.wrong.db.pool %T", ex)
|
|
}
|
|
_, err := repo.Delete(ctx, v3_sql.SQLTx(tx),
|
|
repo.PrimaryKeyCondition(e.Aggregate().InstanceID, e.Aggregate().ID, e.Key),
|
|
)
|
|
return err
|
|
}), nil
|
|
}
|