Skip to content

Commit 2bea418

Browse files
sreyasreya
committed
integrate xstate
1 parent 6ac1ba2 commit 2bea418

File tree

15 files changed

+251
-56
lines changed

15 files changed

+251
-56
lines changed

‎coderd/apidoc/docs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/autobuild/lifecycle_executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
178178
// Lock the workspace if it has breached the template's
179179
// threshold for inactivity.
180180
if reason == database.BuildReasonAutolock {
181-
err = tx.UpdateWorkspaceLockedDeletingAt(e.ctx, database.UpdateWorkspaceLockedDeletingAtParams{
181+
ws, err = tx.UpdateWorkspaceLockedDeletingAt(e.ctx, database.UpdateWorkspaceLockedDeletingAtParams{
182182
ID: ws.ID,
183183
LockedAt: sql.NullTime{
184184
Time: database.Now(),

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2511,11 +2511,11 @@ func (q *querier) UpdateWorkspaceLastUsedAt(ctx context.Context, arg database.Up
25112511
return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceLastUsedAt)(ctx, arg)
25122512
}
25132513

2514-
func (q *querier) UpdateWorkspaceLockedDeletingAt(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
2514+
func (q *querier) UpdateWorkspaceLockedDeletingAt(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) (database.Workspace, error) {
25152515
fetch := func(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) (database.Workspace, error) {
25162516
return q.db.GetWorkspaceByID(ctx, arg.ID)
25172517
}
2518-
return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceLockedDeletingAt)(ctx, arg)
2518+
return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateWorkspaceLockedDeletingAt)(ctx, arg)
25192519
}
25202520

25212521
func (q *querier) UpdateWorkspaceProxy(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {

‎coderd/database/dbfake/dbfake.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5082,9 +5082,9 @@ func (q *FakeQuerier) UpdateWorkspaceLastUsedAt(_ context.Context, arg database.
50825082
return sql.ErrNoRows
50835083
}
50845084

5085-
func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
5085+
func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) (database.Workspace, error) {
50865086
if err := validateDatabaseType(arg); err != nil {
5087-
return err
5087+
return database.Workspace{}, err
50885088
}
50895089
q.mutex.Lock()
50905090
defer q.mutex.Unlock()
@@ -5106,7 +5106,7 @@ func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg dat
51065106
}
51075107
}
51085108
if template.ID == uuid.Nil {
5109-
return xerrors.Errorf("unable to find workspace template")
5109+
return database.Workspace{}, xerrors.Errorf("unable to find workspace template")
51105110
}
51115111
if template.LockedTTL > 0 {
51125112
workspace.DeletingAt = sql.NullTime{
@@ -5116,9 +5116,9 @@ func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg dat
51165116
}
51175117
}
51185118
q.workspaces[index] = workspace
5119-
return nil
5119+
return workspace, nil
51205120
}
5121-
return sql.ErrNoRows
5121+
return database.Workspace{}, sql.ErrNoRows
51225122
}
51235123

51245124
func (q *FakeQuerier) UpdateWorkspaceProxy(_ context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 25 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaces.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ WHERE
482482
)
483483
) AND workspaces.deleted = 'false';
484484

485-
-- name: UpdateWorkspaceLockedDeletingAt :exec
485+
-- name: UpdateWorkspaceLockedDeletingAt :one
486486
UPDATE
487487
workspaces
488488
SET
@@ -498,7 +498,8 @@ FROM
498498
WHERE
499499
workspaces.template_id = templates.id
500500
AND
501-
workspaces.id = $1;
501+
workspaces.id = $1
502+
RETURNING workspaces.*;
502503

503504
-- name: UpdateWorkspacesDeletingAtByTemplateID :exec
504505
UPDATE

0 commit comments

Comments
 (0)