synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Sas Swart
2025-02-07 14:22:19 +00:00
parent 9d0b08b313
commit a0f59a540b
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/database/dbmem/dbmem.go
View File

@ -8150,6 +8150,7 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
defer q.mutex.Unlock() defer q.mutex.Unlock()
preset := database.TemplateVersionPreset{ preset := database.TemplateVersionPreset{
ID: uuid.New(),
TemplateVersionID: arg.TemplateVersionID, TemplateVersionID: arg.TemplateVersionID,
Name: arg.Name, Name: arg.Name,
CreatedAt: arg.CreatedAt, CreatedAt: arg.CreatedAt,
@ -8170,6 +8171,7 @@ func (q *FakeQuerier) InsertPresetParameters(_ context.Context, arg database.Ins
presetParameters := make([]database.TemplateVersionPresetParameter, 0, len(arg.Names)) presetParameters := make([]database.TemplateVersionPresetParameter, 0, len(arg.Names))
for i, v := range arg.Names { for i, v := range arg.Names {
presetParameter := database.TemplateVersionPresetParameter{ presetParameter := database.TemplateVersionPresetParameter{
ID: uuid.New(),
TemplateVersionPresetID: arg.TemplateVersionPresetID, TemplateVersionPresetID: arg.TemplateVersionPresetID,
Name: v, Name: v,
Value: arg.Values[i], Value: arg.Values[i],

10
coderd/provisionerdserver/provisionerdserver.go
View File

@ -1828,7 +1828,8 @@ func InsertWorkspacePresetsAndParameters(ctx context.Context, logger slog.Logger
} }
func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store, templateVersionID uuid.UUID, protoPreset *sdkproto.Preset, t time.Time) error { func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store, templateVersionID uuid.UUID, protoPreset *sdkproto.Preset, t time.Time) error {
dbPreset, err := db.InsertPreset(ctx, database.InsertPresetParams{ err := db.InTx(func(tx database.Store) error {
dbPreset, err := tx.InsertPreset(ctx, database.InsertPresetParams{
TemplateVersionID: templateVersionID, TemplateVersionID: templateVersionID,
Name: protoPreset.Name, Name: protoPreset.Name,
CreatedAt: t, CreatedAt: t,
@ -1843,7 +1844,7 @@ func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store,
presetParameterNames = append(presetParameterNames, parameter.Name) presetParameterNames = append(presetParameterNames, parameter.Name)
presetParameterValues = append(presetParameterValues, parameter.Value) presetParameterValues = append(presetParameterValues, parameter.Value)
} }
_, err = db.InsertPresetParameters(ctx, database.InsertPresetParametersParams{ _, err = tx.InsertPresetParameters(ctx, database.InsertPresetParametersParams{
TemplateVersionPresetID: dbPreset.ID, TemplateVersionPresetID: dbPreset.ID,
Names: presetParameterNames, Names: presetParameterNames,
Values: presetParameterValues, Values: presetParameterValues,
@ -1852,6 +1853,11 @@ func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store,
return xerrors.Errorf("insert preset parameters: %w", err) return xerrors.Errorf("insert preset parameters: %w", err)
} }
return nil return nil
}, nil)
if err != nil {
return xerrors.Errorf("insert preset and parameters: %w", err)
}
return nil
} }
func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, protoResource *sdkproto.Resource, snapshot *telemetry.Snapshot) error { func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, protoResource *sdkproto.Resource, snapshot *telemetry.Snapshot) error {