Skip to content

Commit 054663f

Browse files
Kira-PilotKira-Pilot
committed
added a new restart transition
1 parent 1c6a891 commit 054663f

17 files changed

+318
-442
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/coderd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@ func New(options *Options) *API {
683683
r.Route("/builds", func(r chi.Router) {
684684
r.Get("/", api.workspaceBuilds)
685685
r.Post("/", api.postWorkspaceBuilds)
686-
r.Post("/restart", api.restartWorkspace)
687686
})
688687
r.Route("/autostart", func(r chi.Router) {
689688
r.Put("/", api.putWorkspaceAutostart)

‎coderd/database/dbfake/databasefake.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,22 @@ func (q *fakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
12551255
continue
12561256
}
12571257

1258+
case database.WorkspaceStatusRestarted:
1259+
if !job.CompletedAt.Valid &&
1260+
job.CanceledAt.Valid &&
1261+
job.Error.Valid &&
1262+
build.Transition != database.WorkspaceTransitionRestart {
1263+
continue
1264+
}
1265+
1266+
case database.WorkspaceStatusRestarting:
1267+
if !job.CompletedAt.Valid &&
1268+
job.CanceledAt.Valid &&
1269+
job.Error.Valid &&
1270+
build.Transition != database.WorkspaceTransitionRestart {
1271+
continue
1272+
}
1273+
12581274
default:
12591275
return nil, xerrors.Errorf("unknown workspace status in filter: %q", arg.Status)
12601276
}

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000117_add_workspace_transition_restart.down.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- It's not possible to drop enum values from enum types, so the UP has "IF NOT
2+
-- EXISTS".

‎coderd/database/migrations/000117_add_workspace_transition_restart.up.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TYPE workspace_transition ADD VALUE IF NOT EXISTS 'restart';

‎coderd/database/modelmethods.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,26 @@ import (
1313
type WorkspaceStatus string
1414

1515
const (
16-
WorkspaceStatusPending WorkspaceStatus = "pending"
17-
WorkspaceStatusStarting WorkspaceStatus = "starting"
18-
WorkspaceStatusRunning WorkspaceStatus = "running"
19-
WorkspaceStatusStopping WorkspaceStatus = "stopping"
20-
WorkspaceStatusStopped WorkspaceStatus = "stopped"
21-
WorkspaceStatusFailed WorkspaceStatus = "failed"
22-
WorkspaceStatusCanceling WorkspaceStatus = "canceling"
23-
WorkspaceStatusCanceled WorkspaceStatus = "canceled"
24-
WorkspaceStatusDeleting WorkspaceStatus = "deleting"
25-
WorkspaceStatusDeleted WorkspaceStatus = "deleted"
16+
WorkspaceStatusPending WorkspaceStatus = "pending"
17+
WorkspaceStatusStarting WorkspaceStatus = "starting"
18+
WorkspaceStatusRunning WorkspaceStatus = "running"
19+
WorkspaceStatusStopping WorkspaceStatus = "stopping"
20+
WorkspaceStatusStopped WorkspaceStatus = "stopped"
21+
WorkspaceStatusFailed WorkspaceStatus = "failed"
22+
WorkspaceStatusCanceling WorkspaceStatus = "canceling"
23+
WorkspaceStatusCanceled WorkspaceStatus = "canceled"
24+
WorkspaceStatusDeleting WorkspaceStatus = "deleting"
25+
WorkspaceStatusDeleted WorkspaceStatus = "deleted"
26+
WorkspaceStatusRestarting WorkspaceStatus = "restarting"
27+
WorkspaceStatusRestarted WorkspaceStatus = "restarted"
2628
)
2729

2830
func (s WorkspaceStatus) Valid() bool {
2931
switch s {
3032
case WorkspaceStatusPending, WorkspaceStatusStarting, WorkspaceStatusRunning,
3133
WorkspaceStatusStopping, WorkspaceStatusStopped, WorkspaceStatusFailed,
3234
WorkspaceStatusCanceling, WorkspaceStatusCanceled, WorkspaceStatusDeleting,
33-
WorkspaceStatusDeleted:
35+
WorkspaceStatusDeleted, WorkspaceStatusRestarting, WorkspaceStatusRestarted:
3436
return true
3537
default:
3638
return false

‎coderd/database/models.go

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

0 commit comments

Comments
 (0)