diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go index e6c3f8a477..8e4d0aabe5 100644 --- a/coderd/database/dbauthz/dbauthz_test.go +++ b/coderd/database/dbauthz/dbauthz_test.go @@ -3741,6 +3741,10 @@ func (s *MethodTestSuite) TestSystemFunctions() { OrganizationID: org.ID, CreatedBy: user.ID, }) + _, err := db.InsertPreset(context.Background(), database.InsertPresetParams{ + TemplateVersionID: templateVersion.ID, + Name: "test", + }) workspace := dbgen.Workspace(s.T(), db, database.WorkspaceTable{ OrganizationID: org.ID, OwnerID: user.ID, @@ -3755,10 +3759,6 @@ func (s *MethodTestSuite) TestSystemFunctions() { InitiatorID: user.ID, JobID: job.ID, }) - _, err := db.InsertPreset(context.Background(), database.InsertPresetParams{ - TemplateVersionID: workspaceBuild.TemplateVersionID, - Name: "test", - }) require.NoError(s.T(), err) db.GetPresetByWorkspaceBuildID(context.Background(), workspaceBuild.ID) check.Args(workspaceBuild.ID).Asserts(rbac.ResourceTemplate, policy.ActionRead) diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index 78a109b63e..0d5a0ca425 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -3785,16 +3785,17 @@ func (q *FakeQuerier) GetPresetByWorkspaceBuildID(_ context.Context, workspaceBu defer q.mutex.RUnlock() for _, workspaceBuild := range q.workspaceBuilds { - if workspaceBuild.ID == workspaceBuildID { - for _, preset := range q.presets { - if preset.TemplateVersionID == workspaceBuild.TemplateVersionID { - return database.GetPresetByWorkspaceBuildIDRow{ - ID: uuid.NullUUID{UUID: preset.ID, Valid: true}, - Name: sql.NullString{String: preset.Name, Valid: true}, - CreatedAt: sql.NullTime{Time: preset.CreatedAt, Valid: true}, - UpdatedAt: preset.UpdatedAt, - }, nil - } + if workspaceBuild.ID != workspaceBuildID { + continue + } + for _, preset := range q.presets { + if preset.TemplateVersionID == workspaceBuild.TemplateVersionID { + return database.GetPresetByWorkspaceBuildIDRow{ + ID: uuid.NullUUID{UUID: preset.ID, Valid: true}, + Name: sql.NullString{String: preset.Name, Valid: true}, + CreatedAt: sql.NullTime{Time: preset.CreatedAt, Valid: true}, + UpdatedAt: preset.UpdatedAt, + }, nil } } } @@ -8112,11 +8113,10 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP defer q.mutex.Unlock() preset := database.TemplateVersionPreset{ - // TODO (sasswart): double check how we generate these IDs in postgres. - // They should not be params here. - Name: arg.Name, - CreatedAt: arg.CreatedAt, - UpdatedAt: arg.UpdatedAt, + TemplateVersionID: arg.TemplateVersionID, + Name: arg.Name, + CreatedAt: arg.CreatedAt, + UpdatedAt: arg.UpdatedAt, } q.presets = append(q.presets, preset) return preset, nil