andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-11-12 00:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(authorizations): flaky integration tests (#11215)

Browse Source 
# Which Problems Are Solved

Flaky integration tests related to authorizations RT.

# How the Problems Are Solved

By setting the `created_at` and `updated_at` timestamps based on event
timestamps while creating an authorization.

# Additional Changes
N/A
# Additional Context

https://cloud.nx.app/runs/ICj84SxEf0/task/%40zitadel%2Fapi%3Atest-integration
This commit is contained in:
Gayathri Vijayan
2025-12-22 09:41:01 +01:00
committed by GitHub
parent 7c01deb8ed
commit af8deb1145
3 changed files with 105 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/v3/storage/database/repository/authorization.go
+15 -3
View File
@@ -37,18 +37,28 @@ func (a authorization) qualifiedAuthorizationRolesTableName() string {
// -------------------------------------------------------------
const insertAuthorizationStmt = `INSERT INTO zitadel.authorizations (
instance_id, id, user_id, grant_id, project_id, state
instance_id, id, user_id, grant_id, project_id, state, created_at, updated_at
)
VALUES ($1, $2, $3, $4, $5, $6)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
RETURNING created_at, updated_at`
const insertAuthorizationWithRolesStmt = `WITH roles AS (
INSERT INTO zitadel.authorization_roles
(instance_id, authorization_id, grant_id, project_id, role_key)
VALUES ($1, $2, $4, $5, unnest($7::text[])))` + insertAuthorizationStmt
VALUES ($1, $2, $4, $5, unnest($9::text[])))` + insertAuthorizationStmt
// Create implements [domain.AuthorizationRepository].
func (a authorization) Create(ctx context.Context, client database.QueryExecutor, authorization *domain.Authorization) error {
var (
createdAt, updatedAt any = database.DefaultInstruction, database.DefaultInstruction
)
if !authorization.CreatedAt.IsZero() {
createdAt = authorization.CreatedAt
}
if !authorization.UpdatedAt.IsZero() {
updatedAt = authorization.UpdatedAt
}
builder := database.NewStatementBuilder(insertAuthorizationWithRolesStmt,
authorization.InstanceID,
authorization.ID,
@@ -56,6 +66,8 @@ func (a authorization) Create(ctx context.Context, client database.QueryExecutor
authorization.GrantID,
authorization.ProjectID,
authorization.State,
createdAt,
updatedAt,
authorization.Roles,
)
backend/v3/storage/database/repository/authorization_test.go
+68
View File
@@ -44,6 +44,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, existingAuthorization)
require.NoError(t, err)
@@ -66,6 +68,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: "random-id",
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: new(database.ForeignKeyError),
},
@@ -78,6 +82,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: new(database.ForeignKeyError),
},
@@ -90,6 +96,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{"role3"},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: new(database.ForeignKeyError),
},
@@ -103,6 +111,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: new(database.ForeignKeyError),
},
@@ -129,6 +139,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: existingAuthorization.InstanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: database.NewUniqueError("authorizations", "uq_authorizations_instance_id_id", nil),
},
@@ -140,6 +152,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: database.NewCheckError("authorizations", "", nil),
},
@@ -152,6 +166,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
},
{
@@ -163,6 +179,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1, role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
},
{
@@ -175,6 +193,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
},
{
@@ -187,6 +207,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
wantErr: new(database.ForeignKeyError),
},
@@ -200,6 +222,8 @@ func TestCreateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
},
},
}
@@ -255,6 +279,8 @@ func TestGetAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1, role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, authorizationWithRolesUser)
require.NoError(t, err)
@@ -267,6 +293,8 @@ func TestGetAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRolesUser)
require.NoError(t, err)
@@ -283,6 +311,8 @@ func TestGetAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationProjectGrantWithRoles)
require.NoError(t, err)
@@ -294,6 +324,8 @@ func TestGetAuthorization(t *testing.T) {
GrantID: gu.Ptr(grantID),
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationProjectGrantWithoutRoles)
require.NoError(t, err)
@@ -443,6 +475,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{project1Role1, project1Role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, authorizationWithRolesUser1Project1)
require.NoError(t, err)
@@ -455,6 +489,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRolesUser1Project1)
require.NoError(t, err)
@@ -467,6 +503,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{project2Role1, project2Role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithRolesUser1Project2)
require.NoError(t, err)
@@ -480,6 +518,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateInactive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRolesUser1Project2)
require.NoError(t, err)
@@ -493,6 +533,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{project1Role1, project1Role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithRolesUser2Project1)
require.NoError(t, err)
@@ -505,6 +547,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateInactive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRolesUser2Project1)
require.NoError(t, err)
@@ -517,6 +561,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{project2Role1, project2Role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithRolesUser2Project2)
require.NoError(t, err)
@@ -529,6 +575,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRolesUser2Project2)
require.NoError(t, err)
@@ -545,6 +593,8 @@ func TestListAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{project1Role1},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationProjectGrantWithRoles)
require.NoError(t, err)
@@ -556,6 +606,8 @@ func TestListAuthorization(t *testing.T) {
GrantID: gu.Ptr(grantID),
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationProjectGrantWithoutRoles)
require.NoError(t, err)
@@ -847,6 +899,8 @@ func TestUpdateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, activeAuthorization)
require.NoError(t, err)
@@ -858,6 +912,8 @@ func TestUpdateAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateInactive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, inactiveAuthorization)
require.NoError(t, err)
@@ -964,6 +1020,8 @@ func TestAuthorizationUpdate_setRoles(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, authorization1)
require.NoError(t, err)
@@ -975,6 +1033,8 @@ func TestAuthorizationUpdate_setRoles(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role5, role6},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorization2)
require.NoError(t, err)
@@ -1081,6 +1141,8 @@ func TestDeleteAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1, role2},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err := authorizationRepo.Create(t.Context(), tx, authorizationWithRoles)
require.NoError(t, err)
@@ -1092,6 +1154,8 @@ func TestDeleteAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationWithoutRoles)
require.NoError(t, err)
@@ -1103,6 +1167,8 @@ func TestDeleteAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: nil,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, deletedAuthorization)
require.NoError(t, err)
@@ -1122,6 +1188,8 @@ func TestDeleteAuthorization(t *testing.T) {
InstanceID: instanceID,
State: domain.AuthorizationStateActive,
Roles: []string{role1},
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
err = authorizationRepo.Create(t.Context(), tx, authorizationProjectGrant)
require.NoError(t, err)