mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
fix(enterprise/dbcrypt): do not skip deleted users when encrypting or deleting (#9694)
- Broadens scope of data generation in TestServerDBCrypt over all user login types, statuses, and deletion status. - Adds support for specifying user status / user deletion status in dbgen - Adds more comprehensive logging in TestServerDBCrypt upon test failure (to be generalized and expanded upon in a follow-up) - Adds AllUserIDs query, updates dbcrypt to use this instead of GetUsers.
This commit is contained in:
@@ -227,7 +227,7 @@ func User(t testing.TB, db database.Store, orig database.User) database.User {
|
||||
|
||||
user, err = db.UpdateUserStatus(genCtx, database.UpdateUserStatusParams{
|
||||
ID: user.ID,
|
||||
Status: database.UserStatusActive,
|
||||
Status: takeFirst(orig.Status, database.UserStatusActive),
|
||||
UpdatedAt: dbtime.Now(),
|
||||
})
|
||||
require.NoError(t, err, "insert user")
|
||||
@@ -240,6 +240,14 @@ func User(t testing.TB, db database.Store, orig database.User) database.User {
|
||||
})
|
||||
require.NoError(t, err, "user last seen")
|
||||
}
|
||||
|
||||
if orig.Deleted {
|
||||
err = db.UpdateUserDeletedByID(genCtx, database.UpdateUserDeletedByIDParams{
|
||||
ID: user.ID,
|
||||
Deleted: orig.Deleted,
|
||||
})
|
||||
require.NoError(t, err, "set user as deleted")
|
||||
}
|
||||
return user
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user