Skip to content

feat: add workspace build orchestration storage #25757

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
geokat merged 16 commits into from
Jul 7, 2026
+4,412 −144
Merged

feat: add workspace build orchestration storage #25757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
17867b6
feat(coderd/database): add workspace build orchestration storage
geokat May 7, 2026
2e6d134
reject template version pinning with an error for non-template admins
geokat Jun 15, 2026
bff0b76
get rid of query that's only used in tests
geokat Jun 15, 2026
6f19402
enforce parent_build.workspace_id == child_build.workspace_id in DB
geokat Jun 15, 2026
995c5fd
add constraints for child template version presets
geokat Jun 16, 2026
f4351c9
rename constraints with long names
geokat Jun 16, 2026
46aff2b
add ResourceWorkspaceBuildOrchestration and use it for read/update authz
geokat Jun 16, 2026
b3fc22f
add a racy test of pending gate under concurrent contention
geokat Jun 16, 2026
c8c26cb
merge main into george/plat-143/1-workspace-build-orchestration-storage
geokat Jun 17, 2026
6f49a4d
fix ci: add orchestration api key scopes to db and non-duplicate test…
geokat Jun 17, 2026
6cd5c5e
merge main into george/plat-143/1-workspace-build-orchestration-storage
geokat Jun 17, 2026
6b6fcd3
feat: add on_success workspace build request handling (#25758)
geokat Jul 6, 2026
c0946fb
add explicit comment about bypassing authz when fetching authz context
geokat Jul 6, 2026
637ce51
bump migration number
geokat Jul 6, 2026
c93fdce
merge main into george/plat-143/1-workspace-build-orchestration-storage
geokat Jul 6, 2026
395657f
fix: give the workspace build orchestrator a real clock
geokat Jul 7, 2026
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
56 changes: 56 additions & 0 deletions coderd/apidoc/docs.go
View file
Open in desktop

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

52 changes: 52 additions & 0 deletions coderd/apidoc/swagger.json
View file
Open in desktop

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

18 changes: 17 additions & 1 deletion coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import (
"github.com/coder/coder/v2/coderd/workspaceconnwatcher"
"github.com/coder/coder/v2/coderd/workspacestats"
"github.com/coder/coder/v2/coderd/wsbuilder"
"github.com/coder/coder/v2/coderd/wsbuildorchestrator"
"github.com/coder/coder/v2/coderd/x/chatd"
"github.com/coder/coder/v2/coderd/x/chatd/chatprovider"
"github.com/coder/coder/v2/coderd/x/chatd/mcpclient"
Expand Down Expand Up @@ -968,6 +969,19 @@ func New(options *Options) *API {

api.workspaceAgentConnWatcher = workspaceconnwatcher.New(api.ctx, options.Logger, options.Pubsub, options.Database)

api.workspaceBuildOrchestrator = wsbuildorchestrator.New(wsbuildorchestrator.Options{
Logger: options.Logger,
Database: options.Database,
Pubsub: options.Pubsub,
FileCache: api.FileCache,
BuildUsageChecker: api.BuildUsageChecker,
DeploymentValues: options.DeploymentValues,
Experiments: api.Experiments,
BuilderMetrics: options.WorkspaceBuilderMetrics,
Clock: quartz.NewReal(),
})
api.workspaceBuildOrchestrator.Start(api.ctx)

apiKeyMiddleware := httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{
DB: options.Database,
ActivateDormantUser: ActivateDormantUser(options.Logger, &api.Auditor, options.Database),
Expand Down Expand Up @@ -2316,7 +2330,8 @@ type API struct {
// profiler is process-global, so concurrent collections would fail.
ProfileCollecting atomic.Bool

workspaceAgentConnWatcher *workspaceconnwatcher.Watcher
workspaceAgentConnWatcher *workspaceconnwatcher.Watcher
workspaceBuildOrchestrator *wsbuildorchestrator.Orchestrator
}

// chatDaemonPublishDiffStatusChangeFunc returns chatDaemon's
Expand Down Expand Up @@ -2400,6 +2415,7 @@ func (api *API) Close() error {
_ = api.AppEncryptionKeyCache.Close()
_ = api.UpdatesProvider.Close()
api.workspaceAgentConnWatcher.Close()
api.workspaceBuildOrchestrator.Close()

if current := api.PrebuildsReconciler.Load(); current != nil {
ctx, giveUp := context.WithTimeoutCause(context.Background(), time.Second*30, xerrors.New("gave up waiting for reconciler to stop before shutdown"))
Expand Down
Loading
Loading