mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-29 02:57:51 +00:00
c0e45b63d8
* reproduce #5808 Add an integration test that imports and gets N amount of human users. - With N set to 1-10 the operation seems to succeed always - With N set to 100 the operation seems to fail between 1 and 7 times. * fix merge issue * fix: reset the call timestamp after a bulk trigger With the use of `AS OF SYSTEM TIME` in queries, there was a change for the query package not finding the latest projection verson after a bulk trigger. If events where processed in the bulk trigger, the resulting row timestamp would be after the call start timestamp. This sometimes resulted in consistency issues when Set and Get API methods are called in short succession. For example a Import and Get user could sometimes result in a Not Found error. Although the issue was reported for the Management API user import, it is likely this bug contributed to the flaky integration and e2e tests. Fixes #5808 * trigger bulk action in GetSession * don't use the new context in handler schedule * disable reproduction test --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
243 lines
6.7 KiB
Go
243 lines
6.7 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
errs "errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/api/call"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
type UserMetadataList struct {
|
|
SearchResponse
|
|
Metadata []*UserMetadata
|
|
}
|
|
|
|
type UserMetadata struct {
|
|
CreationDate time.Time
|
|
ChangeDate time.Time
|
|
ResourceOwner string
|
|
Sequence uint64
|
|
Key string
|
|
Value []byte
|
|
}
|
|
|
|
type UserMetadataSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
var (
|
|
userMetadataTable = table{
|
|
name: projection.UserMetadataProjectionTable,
|
|
instanceIDCol: projection.UserMetadataColumnInstanceID,
|
|
}
|
|
UserMetadataUserIDCol = Column{
|
|
name: projection.UserMetadataColumnUserID,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataCreationDateCol = Column{
|
|
name: projection.UserMetadataColumnCreationDate,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataChangeDateCol = Column{
|
|
name: projection.UserMetadataColumnChangeDate,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataResourceOwnerCol = Column{
|
|
name: projection.UserMetadataColumnResourceOwner,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataInstanceIDCol = Column{
|
|
name: projection.UserMetadataColumnInstanceID,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataSequenceCol = Column{
|
|
name: projection.UserMetadataColumnSequence,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataKeyCol = Column{
|
|
name: projection.UserMetadataColumnKey,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataValueCol = Column{
|
|
name: projection.UserMetadataColumnValue,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataOwnerRemovedCol = Column{
|
|
name: projection.UserMetadataColumnOwnerRemoved,
|
|
table: userMetadataTable,
|
|
}
|
|
)
|
|
|
|
func (q *Queries) GetUserMetadataByKey(ctx context.Context, shouldTriggerBulk bool, userID, key string, withOwnerRemoved bool, queries ...SearchQuery) (_ *UserMetadata, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
ctx = projection.UserMetadataProjection.Trigger(ctx)
|
|
}
|
|
|
|
query, scan := prepareUserMetadataQuery(ctx, q.client)
|
|
for _, q := range queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
eq := sq.Eq{
|
|
UserMetadataUserIDCol.identifier(): userID,
|
|
UserMetadataKeyCol.identifier(): key,
|
|
UserMetadataInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
if !withOwnerRemoved {
|
|
eq[UserMetadataOwnerRemovedCol.identifier()] = false
|
|
}
|
|
stmt, args, err := query.Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-aDGG2", "Errors.Query.SQLStatment")
|
|
}
|
|
|
|
row := q.client.QueryRowContext(ctx, stmt, args...)
|
|
return scan(row)
|
|
}
|
|
|
|
func (q *Queries) SearchUserMetadata(ctx context.Context, shouldTriggerBulk bool, userID string, queries *UserMetadataSearchQueries, withOwnerRemoved bool) (_ *UserMetadataList, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
ctx = projection.UserMetadataProjection.Trigger(ctx)
|
|
}
|
|
|
|
query, scan := prepareUserMetadataListQuery(ctx, q.client)
|
|
eq := sq.Eq{
|
|
UserMetadataUserIDCol.identifier(): userID,
|
|
UserMetadataInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
if !withOwnerRemoved {
|
|
eq[UserMetadataOwnerRemovedCol.identifier()] = false
|
|
}
|
|
stmt, args, err := queries.toQuery(query).Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-Egbgd", "Errors.Query.SQLStatment")
|
|
}
|
|
|
|
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-Hr2wf", "Errors.Internal")
|
|
}
|
|
metadata, err := scan(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
metadata.LatestSequence, err = q.latestSequence(ctx, userMetadataTable)
|
|
return metadata, err
|
|
}
|
|
|
|
func (q *UserMetadataSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
|
query = q.SearchRequest.toQuery(query)
|
|
for _, q := range q.Queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
return query
|
|
}
|
|
|
|
func (r *UserMetadataSearchQueries) AppendMyResourceOwnerQuery(orgID string) error {
|
|
query, err := NewUserMetadataResourceOwnerSearchQuery(orgID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
r.Queries = append(r.Queries, query)
|
|
return nil
|
|
}
|
|
|
|
func NewUserMetadataResourceOwnerSearchQuery(value string) (SearchQuery, error) {
|
|
return NewTextQuery(UserMetadataResourceOwnerCol, value, TextEquals)
|
|
}
|
|
|
|
func NewUserMetadataKeySearchQuery(value string, comparison TextComparison) (SearchQuery, error) {
|
|
return NewTextQuery(UserMetadataKeyCol, value, comparison)
|
|
}
|
|
|
|
func prepareUserMetadataQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Row) (*UserMetadata, error)) {
|
|
return sq.Select(
|
|
UserMetadataCreationDateCol.identifier(),
|
|
UserMetadataChangeDateCol.identifier(),
|
|
UserMetadataResourceOwnerCol.identifier(),
|
|
UserMetadataSequenceCol.identifier(),
|
|
UserMetadataKeyCol.identifier(),
|
|
UserMetadataValueCol.identifier(),
|
|
).
|
|
From(userMetadataTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*UserMetadata, error) {
|
|
m := new(UserMetadata)
|
|
err := row.Scan(
|
|
&m.CreationDate,
|
|
&m.ChangeDate,
|
|
&m.ResourceOwner,
|
|
&m.Sequence,
|
|
&m.Key,
|
|
&m.Value,
|
|
)
|
|
|
|
if err != nil {
|
|
if errs.Is(err, sql.ErrNoRows) {
|
|
return nil, errors.ThrowNotFound(err, "QUERY-Rgh32", "Errors.User.NotFound")
|
|
}
|
|
return nil, errors.ThrowInternal(err, "QUERY-Hhjt2", "Errors.Internal")
|
|
}
|
|
return m, nil
|
|
}
|
|
}
|
|
|
|
func prepareUserMetadataListQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*UserMetadataList, error)) {
|
|
return sq.Select(
|
|
UserMetadataCreationDateCol.identifier(),
|
|
UserMetadataChangeDateCol.identifier(),
|
|
UserMetadataResourceOwnerCol.identifier(),
|
|
UserMetadataSequenceCol.identifier(),
|
|
UserMetadataKeyCol.identifier(),
|
|
UserMetadataValueCol.identifier(),
|
|
countColumn.identifier()).
|
|
From(userMetadataTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*UserMetadataList, error) {
|
|
metadata := make([]*UserMetadata, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
m := new(UserMetadata)
|
|
err := rows.Scan(
|
|
&m.CreationDate,
|
|
&m.ChangeDate,
|
|
&m.ResourceOwner,
|
|
&m.Sequence,
|
|
&m.Key,
|
|
&m.Value,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
metadata = append(metadata, m)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-sd3gh", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &UserMetadataList{
|
|
Metadata: metadata,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|