Skip to content

feat: add audit logs for dormancy events #15298

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 14 commits into from
Oct 31, 2024
Merged

feat: add audit logs for dormancy events #15298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e137e92
feat: add audit logs for dormancy events
coadler Oct 30, 2024
e84b893
fixup! feat: add audit logs for dormancy events
coadler Oct 30, 2024
388111b
fixup! feat: add audit logs for dormancy events
coadler Oct 30, 2024
850ee38
fixup! feat: add audit logs for dormancy events
coadler Oct 30, 2024
7d2b532
fixup! feat: add audit logs for dormancy events
coadler Oct 30, 2024
68adf8a
fixup! feat: add audit logs for dormancy events
coadler Oct 30, 2024
764bc25
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
7846882
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
cd77405
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
95ac736
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
b6c043d
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
b3269d1
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
3829773
fixup! feat: add audit logs for dormancy events
coadler Oct 31, 2024
6fdb233
fix oidc, add test
coadler Oct 31, 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
fixup! feat: add audit logs for dormancy events
  • Loading branch information
@coadler
coadler committed Oct 30, 2024
commit e84b89388c907b24bc7bd3a45b1276bbf7b378ad
8 changes: 7 additions & 1 deletion coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7709,6 +7709,11 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
}
}

status := database.UserStatusDormant
if arg.Status != "" {
status = arg.Status
}

user := database.User{
ID: arg.ID,
Email: arg.Email,
Expand All @@ -7717,7 +7722,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
UpdatedAt: arg.UpdatedAt,
Username: arg.Username,
Name: arg.Name,
Status: database.UserStatusDormant,
Status: status,
RBACRoles: arg.RBACRoles,
LoginType: arg.LoginType,
}
Expand Down Expand Up @@ -8640,6 +8645,7 @@ func (q *FakeQuerier) UpdateInactiveUsersToDormant(_ context.Context, params dat
updated = append(updated, database.UpdateInactiveUsersToDormantRow{
ID: user.ID,
Email: user.Email,
Username: user.Username,
LastSeenAt: user.LastSeenAt,
})
}
Expand Down
7 changes: 5 additions & 2 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions coderd/database/queries/users.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ INSERT INTO
created_at,
updated_at,
rbac_roles,
login_type
login_type,
status
)
VALUES
($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
($1, $2, $3, $4, $5, $6, $7, $8, $9, NULLIF(@status::user_status, '')) RETURNING *;

-- name: UpdateUserProfile :one
UPDATE
Expand Down
2 changes: 2 additions & 0 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,7 @@ func (api *API) organizationByUserAndName(rw http.ResponseWriter, r *http.Reques
type CreateUserRequest struct {
codersdk.CreateUserRequestWithOrgs
LoginType database.LoginType
Status database.UserStatus
SkipNotifications bool
accountCreatorName string
}
Expand All @@ -1354,6 +1355,7 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
// All new users are defaulted to members of the site.
RBACRoles: []string{},
LoginType: req.LoginType,
Status: req.Status,
}
// If a user signs up with OAuth, they can have no password!
if req.Password != "" {
Expand Down
Loading