Skip to content

Commit ca1a3bb

Browse files
EmyrkEmyrk
committed
Fix dbfake
1 parent 1eaa49f commit ca1a3bb

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

‎coderd/database/dbfake/dbfake.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func New() database.Store {
5858
workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
5959
provisionerJobs: make([]database.ProvisionerJob, 0),
6060
templateVersions: make([]database.TemplateVersion, 0),
61-
templates: make([]database.Template, 0),
61+
templates: make([]database.TemplateTable, 0),
6262
workspaceAgentStats: make([]database.WorkspaceAgentStat, 0),
6363
workspaceAgentLogs: make([]database.WorkspaceAgentStartupLog, 0),
6464
workspaceBuilds: make([]database.WorkspaceBuild, 0),
@@ -130,7 +130,7 @@ type data struct {
130130
templateVersions []database.TemplateVersion
131131
templateVersionParameters []database.TemplateVersionParameter
132132
templateVersionVariables []database.TemplateVersionVariable
133-
templates []database.Template
133+
templates []database.TemplateTable
134134
workspaceAgents []database.WorkspaceAgent
135135
workspaceAgentMetadata []database.WorkspaceAgentMetadatum
136136
workspaceAgentLogs []database.WorkspaceAgentStartupLog
@@ -452,15 +452,15 @@ func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (da
452452
return database.Template{}, sql.ErrNoRows
453453
}
454454

455-
func (q *FakeQuerier) templatesWithUser(tpl []database.Template) []database.Template {
455+
func (q *FakeQuerier) templatesWithUser(tpl []database.TemplateTable) []database.Template {
456456
cpy := make([]database.Template, 0, len(tpl))
457457
for _, t := range tpl {
458458
cpy = append(cpy, q.templateWithUser(t))
459459
}
460460
return cpy
461461
}
462462

463-
func (q *FakeQuerier) templateWithUser(tpl database.Template) database.Template {
463+
func (q *FakeQuerier) templateWithUser(tpl database.TemplateTable) database.Template {
464464
var user database.User
465465
for _, _user := range q.users {
466466
if _user.ID == tpl.CreatedBy {
@@ -2118,9 +2118,9 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
21182118

21192119
templates := slices.Clone(q.templates)
21202120
for i := range templates {
2121-
templates[i] = templates[i].DeepCopy()
2121+
templates[i] = templates[i]
21222122
}
2123-
slices.SortFunc(templates, func(i, j database.Template) bool {
2123+
slices.SortFunc(templates, func(i, j database.TemplateTable) bool {
21242124
if i.Name != j.Name {
21252125
return i.Name < j.Name
21262126
}
@@ -3470,7 +3470,7 @@ func (q *FakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
34703470
defer q.mutex.Unlock()
34713471

34723472
//nolint:gosimple
3473-
template := database.Template{
3473+
template := database.TemplateTable{
34743474
ID: arg.ID,
34753475
CreatedAt: arg.CreatedAt,
34763476
UpdatedAt: arg.UpdatedAt,
@@ -5009,7 +5009,8 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
50095009
}
50105010

50115011
var templates []database.Template
5012-
for _, template := range q.templates {
5012+
for _, templateTable := range q.templates {
5013+
template := q.templateWithUser(templateTable)
50135014
if prepared != nil && prepared.Authorize(ctx, template.RBACObject()) != nil {
50145015
continue
50155016
}
@@ -5037,7 +5038,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
50375038
continue
50385039
}
50395040
}
5040-
templates = append(templates, template.DeepCopy())
5041+
templates = append(templates)
50415042
}
50425043
if len(templates) > 0 {
50435044
slices.SortFunc(templates, func(i, j database.Template) bool {
@@ -5046,7 +5047,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
50465047
}
50475048
return i.ID.String() < j.ID.String()
50485049
})
5049-
return q.templatesWithUser(templates), nil
5050+
return templates, nil
50505051
}
50515052

50525053
return nil, sql.ErrNoRows
@@ -5056,7 +5057,7 @@ func (q *FakeQuerier) GetTemplateGroupRoles(_ context.Context, id uuid.UUID) ([]
50565057
q.mutex.RLock()
50575058
defer q.mutex.RUnlock()
50585059

5059-
var template database.Template
5060+
var template database.TemplateTable
50605061
for _, t := range q.templates {
50615062
if t.ID == id {
50625063
template = t
@@ -5093,7 +5094,7 @@ func (q *FakeQuerier) GetTemplateUserRoles(_ context.Context, id uuid.UUID) ([]d
50935094
q.mutex.RLock()
50945095
defer q.mutex.RUnlock()
50955096

5096-
var template database.Template
5097+
var template database.TemplateTable
50975098
for _, t := range q.templates {
50985099
if t.ID == id {
50995100
template = t

‎coderd/database/modelmethods.go

-7
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ func (t Template) RBACObject() rbac.Object {
109109
WithGroupACL(t.GroupACL)
110110
}
111111

112-
func (t Template) RBACObject() rbac.Object {
113-
return rbac.ResourceTemplate.WithID(t.ID).
114-
InOrg(t.OrganizationID).
115-
WithACLUserList(t.UserACL).
116-
WithGroupACL(t.GroupACL)
117-
}
118-
119112
func (t GetFileTemplatesRow) RBACObject() rbac.Object {
120113
return rbac.ResourceTemplate.WithID(t.TemplateID).
121114
InOrg(t.TemplateOrganizationID).

‎coderd/database/sqlc.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,5 @@ sql:
8383
emit_db_tags: true
8484
emit_enum_valid_method: true
8585
emit_all_enum_values: true
86-
omit_unused_structs: true
8786
rename:
8887
template_with_users: TemplateTest

0 commit comments

Comments
 (0)