Skip to content

Commit a986059

Browse files
authored
feat: mark prebuilds as such and set their preset ids (#16965)
This pull request closes coder/internal#513
1 parent 73f5af8 commit a986059

File tree

24 files changed

+606
-308
lines changed

24 files changed

+606
-308
lines changed

cli/testdata/coder_list_--output_json.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
"count": 0,
6868
"available": 0,
6969
"most_recently_seen": null
70-
}
70+
},
71+
"template_version_preset_id": null
7172
},
7273
"latest_app_status": null,
7374
"outdated": false,

coderd/apidoc/docs.go

Lines changed: 13 additions & 0 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: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/dbmem/dbmem.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9788,19 +9788,20 @@ func (q *FakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser
97889788
defer q.mutex.Unlock()
97899789

97909790
workspaceBuild := database.WorkspaceBuild{
9791-
ID: arg.ID,
9792-
CreatedAt: arg.CreatedAt,
9793-
UpdatedAt: arg.UpdatedAt,
9794-
WorkspaceID: arg.WorkspaceID,
9795-
TemplateVersionID: arg.TemplateVersionID,
9796-
BuildNumber: arg.BuildNumber,
9797-
Transition: arg.Transition,
9798-
InitiatorID: arg.InitiatorID,
9799-
JobID: arg.JobID,
9800-
ProvisionerState: arg.ProvisionerState,
9801-
Deadline: arg.Deadline,
9802-
MaxDeadline: arg.MaxDeadline,
9803-
Reason: arg.Reason,
9791+
ID: arg.ID,
9792+
CreatedAt: arg.CreatedAt,
9793+
UpdatedAt: arg.UpdatedAt,
9794+
WorkspaceID: arg.WorkspaceID,
9795+
TemplateVersionID: arg.TemplateVersionID,
9796+
BuildNumber: arg.BuildNumber,
9797+
Transition: arg.Transition,
9798+
InitiatorID: arg.InitiatorID,
9799+
JobID: arg.JobID,
9800+
ProvisionerState: arg.ProvisionerState,
9801+
Deadline: arg.Deadline,
9802+
MaxDeadline: arg.MaxDeadline,
9803+
Reason: arg.Reason,
9804+
TemplateVersionPresetID: arg.TemplateVersionPresetID,
98049805
}
98059806
q.workspaceBuilds = append(q.workspaceBuilds, workspaceBuild)
98069807
return nil

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727

2828
"cdr.dev/slog"
2929

30+
"github.com/coder/quartz"
31+
3032
"github.com/coder/coder/v2/coderd/apikey"
3133
"github.com/coder/coder/v2/coderd/audit"
3234
"github.com/coder/coder/v2/coderd/database"
@@ -46,7 +48,6 @@ import (
4648
"github.com/coder/coder/v2/provisionerd/proto"
4749
"github.com/coder/coder/v2/provisionersdk"
4850
sdkproto "github.com/coder/coder/v2/provisionersdk/proto"
49-
"github.com/coder/quartz"
5051
)
5152

5253
const (
@@ -635,6 +636,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
635636
WorkspaceBuildId: workspaceBuild.ID.String(),
636637
WorkspaceOwnerLoginType: string(owner.LoginType),
637638
WorkspaceOwnerRbacRoles: ownerRbacRoles,
639+
IsPrebuild: input.IsPrebuild,
638640
},
639641
LogLevel: input.LogLevel,
640642
},
@@ -2460,6 +2462,7 @@ type TemplateVersionImportJob struct {
24602462
type WorkspaceProvisionJob struct {
24612463
WorkspaceBuildID uuid.UUID `json:"workspace_build_id"`
24622464
DryRun bool `json:"dry_run"`
2465+
IsPrebuild bool `json:"is_prebuild,omitempty"`
24632466
LogLevel string `json:"log_level,omitempty"`
24642467
}
24652468

0 commit comments

Comments
 (0)