Skip to content

feat: claim prebuilds based on workspace parameters instead of preset id #19279

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: claim prebuilds based on workspace parameters instead of preset id #19279

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0405ad
Initial, inefficient attempt at preset parameter matching
SasSwart Aug 7, 2025
8e2e62e
WIP: claim prebuilds based on parameters
SasSwart Aug 11, 2025
268db8a
Merge remote-tracking branch 'origin/main' into jjs/18356
SasSwart Aug 11, 2025
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
Next Next commit
Initial, inefficient attempt at preset parameter matching
  • Loading branch information
@SasSwart
SasSwart committed Aug 7, 2025
commit b0405ada49e4b18bb107f011c2a0bc48abb3a1d2
57 changes: 51 additions & 6 deletions coderd/wsbuilder/wsbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,57 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object

var workspaceBuild database.WorkspaceBuild
err = b.store.InTx(func(store database.Store) error {
names, values, err := b.getParameters()
if err != nil {
// getParameters already wraps errors in BuildError
return err
}

if b.templateVersionPresetID == uuid.Nil {
parameterMap := make(map[string]string)
for i, name := range names {
parameterMap[name] = values[i]
}

presetParameters, err := b.store.GetPresetParametersByTemplateVersionID(b.ctx, templateVersionID)
if err != nil {
return BuildError{http.StatusInternalServerError, "get preset parameters", err}
}

presetMap := make(map[uuid.UUID]map[string]string)
for _, presetParameter := range presetParameters {
if _, ok := presetMap[presetParameter.TemplateVersionPresetID]; !ok {
presetMap[presetParameter.TemplateVersionPresetID] = make(map[string]string)
}
presetMap[presetParameter.TemplateVersionPresetID][presetParameter.Name] = presetParameter.Value
}

// Compare each preset's parameters to the provided parameters to find any matches
for presetID, presetParams := range presetMap {
isMatch := true
// Check that all preset parameters match the provided parameters
for paramName, presetValue := range presetParams {
if providedValue, exists := parameterMap[paramName]; !exists || providedValue != presetValue {
isMatch = false
break
}
}
// Check that all provided parameters match the preset parameters
if isMatch {
for paramName, providedValue := range parameterMap {
if presetValue, exists := presetParams[paramName]; !exists || providedValue != presetValue {
isMatch = false
break
}
}
}
if isMatch {
b.templateVersionPresetID = presetID
break
}
}
}

err = store.InsertWorkspaceBuild(b.ctx, database.InsertWorkspaceBuildParams{
ID: workspaceBuildID,
CreatedAt: now,
Expand Down Expand Up @@ -473,12 +524,6 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
return BuildError{code, "insert workspace build", err}
}

names, values, err := b.getParameters()
if err != nil {
// getParameters already wraps errors in BuildError
return err
}

err = store.InsertWorkspaceBuildParameters(b.ctx, database.InsertWorkspaceBuildParametersParams{
WorkspaceBuildID: workspaceBuildID,
Name: names,
Expand Down