Skip to content

fix(coderd/database): avoid clobbering workspace build state #9826

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 8 commits into from
Sep 22, 2023
Merged

fix(coderd/database): avoid clobbering workspace build state #9826

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
daece62
RED: update tests in enterprise/coderd/schedule.go to replicate issue
johnstcn Sep 22, 2023
2dd595d
fixup! RED: update tests in enterprise/coderd/schedule.go to replicat…
johnstcn Sep 22, 2023
8c53881
RED: add new database queries
johnstcn Sep 22, 2023
d34b5a4
fixup! RED: add new database queries
johnstcn Sep 22, 2023
f6d839f
GREEN: update to use new queries
johnstcn Sep 22, 2023
a6ef20c
Remove UpdateWorkspaceBuildByID query
johnstcn Sep 22, 2023
6b37452
modify GetActiveWorkspaceBuildsByTemplateID to not return incomplete …
johnstcn Sep 22, 2023
c166635
no context
johnstcn Sep 22, 2023
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! RED: add new database queries
  • Loading branch information
@johnstcn
johnstcn committed Sep 22, 2023
commit d34b5a447308486e9b625b68bb8b52ba0be4814d
13 changes: 12 additions & 1 deletion coderd/database/dbauthz/dbauthz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2702,7 +2702,18 @@ func (q *querier) UpdateWorkspaceBuildCostByID(ctx context.Context, arg database
}

func (q *querier) UpdateWorkspaceBuildDeadlineByID(ctx context.Context, arg database.UpdateWorkspaceBuildDeadlineByIDParams) error {
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
build, err := q.db.GetWorkspaceBuildByID(ctx, arg.ID)
if err != nil {
return err
}

workspace, err := q.db.GetWorkspaceByID(ctx, build.WorkspaceID)
if err != nil {
return err
}

err = q.authorizeContext(ctx, rbac.ActionUpdate, workspace.RBACObject())
if err != nil {
return err
}
return q.db.UpdateWorkspaceBuildDeadlineByID(ctx, arg)
Expand Down