Skip to content

fix: add postgres triggers to remove deleted users from user_links #12117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Feb 20, 2024
Merged

fix: add postgres triggers to remove deleted users from user_links #12117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7e17c09
chore: add database test fixture to insert non-unique linked_ids
Emyrk Feb 12, 2024
4abe528
mend
Emyrk Feb 12, 2024
5fdbf98
mend
Emyrk Feb 12, 2024
513e1cc
rename test fixute
Emyrk Feb 12, 2024
8435d59
add extra case
Emyrk Feb 12, 2024
9e3085d
accidental file change
Emyrk Feb 12, 2024
fea25b0
chore: add database test fixture to insert non-unique linked_ids
Emyrk Feb 12, 2024
51de1f4
mend
Emyrk Feb 12, 2024
0e9270b
mend
Emyrk Feb 12, 2024
0b80aa5
rename test fixute
Emyrk Feb 12, 2024
7030101
accidental file change
Emyrk Feb 12, 2024
4d89937
chore: creaet unit test to exercise failed email change bug
Emyrk Feb 12, 2024
4628c39
Add links to existing issues
Emyrk Feb 13, 2024
c426259
fix: add postgres triggers to keep user_links clear of deleted users
Emyrk Feb 13, 2024
188f03b
Add migrations to prevent deleted users with links
Emyrk Feb 13, 2024
e0902a3
Force soft delete of users, do not allow un-delete
Emyrk Feb 13, 2024
e3788d5
fix some tests
Emyrk Feb 13, 2024
ee6aabc
move code
Emyrk Feb 13, 2024
f2c90c1
linting
Emyrk Feb 13, 2024
c6ff417
move migration
Emyrk Feb 13, 2024
fa3401e
Make gen
Emyrk Feb 13, 2024
a54b652
fix user gen
Emyrk Feb 13, 2024
b70a8c9
remove excess fixture file
Emyrk Feb 13, 2024
f8b63ca
rename SoftDelete back to UpdateDeleted
Emyrk Feb 20, 2024
149875e
Fix dbauthz
Emyrk Feb 20, 2024
f97567c
Merge remote-tracking branch 'origin/main' into stevenmasley/deleted_…
Emyrk Feb 20, 2024
f28491e
bump migrations
Emyrk Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix some tests
  • Loading branch information
@Emyrk
Emyrk committed Feb 13, 2024
commit e3788d55bd1caf0e8ac67aa699d63faa1e3db56e
6 changes: 1 addition & 5 deletions cli/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbauthz"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/pty/ptytest"
Expand Down Expand Up @@ -95,10 +94,7 @@ func TestDelete(t *testing.T) {
// this way.
ctx := testutil.Context(t, testutil.WaitShort)
// nolint:gocritic // Unit test
err := api.Database.UpdateUserDeletedByID(dbauthz.AsSystemRestricted(ctx), database.UpdateUserDeletedByIDParams{
ID: deleteMeUser.ID,
Deleted: true,
})
err := api.Database.SoftDeleteUserByID(dbauthz.AsSystemRestricted(ctx), deleteMeUser.ID)
require.NoError(t, err)

inv, root := clitest.New(t, "delete", fmt.Sprintf("%s/%s", deleteMeUser.ID, workspace.Name), "-y", "--orphan")
Expand Down
7 changes: 0 additions & 7 deletions coderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,13 +1018,6 @@ func (s *MethodTestSuite) TestUser() {
u := dbgen.User(s.T(), db, database.User{})
check.Args(u.ID).Asserts(u, rbac.ActionDelete).Returns()
}))
s.Run("UpdateUserDeletedByID", s.Subtest(func(db database.Store, check *expects) {
u := dbgen.User(s.T(), db, database.User{Deleted: true})
check.Args(database.UpdateUserDeletedByIDParams{
ID: u.ID,
Deleted: true,
}).Asserts(u, rbac.ActionDelete).Returns()
}))
s.Run("UpdateUserHashedPassword", s.Subtest(func(db database.Store, check *expects) {
u := dbgen.User(s.T(), db, database.User{})
check.Args(database.UpdateUserHashedPasswordParams{
Expand Down
5 changes: 1 addition & 4 deletions coderd/database/dbgen/dbgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,7 @@ func User(t testing.TB, db database.Store, orig database.User) database.User {
}

if orig.Deleted {
err = db.UpdateUserDeletedByID(genCtx, database.UpdateUserDeletedByIDParams{
ID: user.ID,
Deleted: orig.Deleted,
})
err = db.SoftDeleteUserByID(genCtx, user.ID)
require.NoError(t, err, "set user as deleted")
}
return user
Expand Down