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 dbmem tests

Browse Source
This commit is contained in:
Sas Swart
2025-01-21 06:37:38 +00:00
parent f320807a16
commit 353f5a9555
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coderd/database/dbauthz/dbauthz_test.go
View File

@ -3741,6 +3741,10 @@ func (s *MethodTestSuite) TestSystemFunctions() {
OrganizationID: org.ID, OrganizationID: org.ID,
CreatedBy: user.ID, CreatedBy: user.ID,
}) })
_, err := db.InsertPreset(context.Background(), database.InsertPresetParams{
TemplateVersionID: templateVersion.ID,
Name: "test",
})
workspace := dbgen.Workspace(s.T(), db, database.WorkspaceTable{ workspace := dbgen.Workspace(s.T(), db, database.WorkspaceTable{
OrganizationID: org.ID, OrganizationID: org.ID,
OwnerID: user.ID, OwnerID: user.ID,
@ -3755,10 +3759,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
InitiatorID: user.ID, InitiatorID: user.ID,
JobID: job.ID, JobID: job.ID,
}) })
_, err := db.InsertPreset(context.Background(), database.InsertPresetParams{
TemplateVersionID: workspaceBuild.TemplateVersionID,
Name: "test",
})
require.NoError(s.T(), err) require.NoError(s.T(), err)
db.GetPresetByWorkspaceBuildID(context.Background(), workspaceBuild.ID) db.GetPresetByWorkspaceBuildID(context.Background(), workspaceBuild.ID)
check.Args(workspaceBuild.ID).Asserts(rbac.ResourceTemplate, policy.ActionRead) check.Args(workspaceBuild.ID).Asserts(rbac.ResourceTemplate, policy.ActionRead)

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

@ -3785,16 +3785,17 @@ func (q *FakeQuerier) GetPresetByWorkspaceBuildID(_ context.Context, workspaceBu
defer q.mutex.RUnlock() defer q.mutex.RUnlock()
for _, workspaceBuild := range q.workspaceBuilds { for _, workspaceBuild := range q.workspaceBuilds {
if workspaceBuild.ID == workspaceBuildID { if workspaceBuild.ID != workspaceBuildID {
for _, preset := range q.presets { continue
if preset.TemplateVersionID == workspaceBuild.TemplateVersionID { }
return database.GetPresetByWorkspaceBuildIDRow{ for _, preset := range q.presets {
ID: uuid.NullUUID{UUID: preset.ID, Valid: true}, if preset.TemplateVersionID == workspaceBuild.TemplateVersionID {
Name: sql.NullString{String: preset.Name, Valid: true}, return database.GetPresetByWorkspaceBuildIDRow{
CreatedAt: sql.NullTime{Time: preset.CreatedAt, Valid: true}, ID: uuid.NullUUID{UUID: preset.ID, Valid: true},
UpdatedAt: preset.UpdatedAt, Name: sql.NullString{String: preset.Name, Valid: true},
}, nil 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() defer q.mutex.Unlock()
preset := database.TemplateVersionPreset{ preset := database.TemplateVersionPreset{
// TODO (sasswart): double check how we generate these IDs in postgres. TemplateVersionID: arg.TemplateVersionID,
// They should not be params here. Name: arg.Name,
Name: arg.Name, CreatedAt: arg.CreatedAt,
CreatedAt: arg.CreatedAt, UpdatedAt: arg.UpdatedAt,
UpdatedAt: arg.UpdatedAt,
} }
q.presets = append(q.presets, preset) q.presets = append(q.presets, preset)
return preset, nil return preset, nil