Skip to content

Commit 1eaa49f

Browse files
EmyrkEmyrk
committed
TemplateWithUser -> Template
1 parent b3d5199 commit 1eaa49f

23 files changed

+123
-118
lines changed

‎coderd/audit/diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// AuditableResources, then add it to this interface.
1010
type Auditable interface {
1111
database.APIKey |
12-
database.TemplateWithUser |
12+
database.Template |
1313
database.TemplateVersion |
1414
database.User |
1515
database.Workspace |

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,11 +1157,11 @@ func (q *querier) GetTemplateAverageBuildTime(ctx context.Context, arg database.
11571157
return q.db.GetTemplateAverageBuildTime(ctx, arg)
11581158
}
11591159

1160-
func (q *querier) GetTemplateByID(ctx context.Context, id uuid.UUID) (database.TemplateWithUser, error) {
1160+
func (q *querier) GetTemplateByID(ctx context.Context, id uuid.UUID) (database.Template, error) {
11611161
return fetch(q.log, q.auth, q.db.GetTemplateByID)(ctx, id)
11621162
}
11631163

1164-
func (q *querier) GetTemplateByOrganizationAndName(ctx context.Context, arg database.GetTemplateByOrganizationAndNameParams) (database.TemplateWithUser, error) {
1164+
func (q *querier) GetTemplateByOrganizationAndName(ctx context.Context, arg database.GetTemplateByOrganizationAndNameParams) (database.Template, error) {
11651165
return fetch(q.log, q.auth, q.db.GetTemplateByOrganizationAndName)(ctx, arg)
11661166
}
11671167

@@ -1302,14 +1302,14 @@ func (q *querier) GetTemplateVersionsCreatedAfter(ctx context.Context, createdAt
13021302
return q.db.GetTemplateVersionsCreatedAfter(ctx, createdAt)
13031303
}
13041304

1305-
func (q *querier) GetTemplates(ctx context.Context) ([]database.TemplateWithUser, error) {
1305+
func (q *querier) GetTemplates(ctx context.Context) ([]database.Template, error) {
13061306
if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
13071307
return nil, err
13081308
}
13091309
return q.db.GetTemplates(ctx)
13101310
}
13111311

1312-
func (q *querier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.TemplateWithUser, error) {
1312+
func (q *querier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.Template, error) {
13131313
prep, err := prepareSQLFilter(ctx, q.auth, rbac.ActionRead, rbac.ResourceTemplate.Type)
13141314
if err != nil {
13151315
return nil, xerrors.Errorf("(dev error) prepare sql filter: %w", err)
@@ -2138,7 +2138,7 @@ func (q *querier) UpdateReplica(ctx context.Context, arg database.UpdateReplicaP
21382138
}
21392139

21402140
func (q *querier) UpdateTemplateACLByID(ctx context.Context, arg database.UpdateTemplateACLByIDParams) error {
2141-
fetch := func(ctx context.Context, arg database.UpdateTemplateACLByIDParams) (database.TemplateWithUser, error) {
2141+
fetch := func(ctx context.Context, arg database.UpdateTemplateACLByIDParams) (database.Template, error) {
21422142
return q.db.GetTemplateByID(ctx, arg.ID)
21432143
}
21442144
// UpdateTemplateACL uses the ActionCreate action. Only users that can create the template
@@ -2147,7 +2147,7 @@ func (q *querier) UpdateTemplateACLByID(ctx context.Context, arg database.Update
21472147
}
21482148

21492149
func (q *querier) UpdateTemplateActiveVersionByID(ctx context.Context, arg database.UpdateTemplateActiveVersionByIDParams) error {
2150-
fetch := func(ctx context.Context, arg database.UpdateTemplateActiveVersionByIDParams) (database.TemplateWithUser, error) {
2150+
fetch := func(ctx context.Context, arg database.UpdateTemplateActiveVersionByIDParams) (database.Template, error) {
21512151
return q.db.GetTemplateByID(ctx, arg.ID)
21522152
}
21532153
return update(q.log, q.auth, fetch, q.db.UpdateTemplateActiveVersionByID)(ctx, arg)
@@ -2159,14 +2159,14 @@ func (q *querier) UpdateTemplateDeletedByID(ctx context.Context, arg database.Up
21592159
}
21602160

21612161
func (q *querier) UpdateTemplateMetaByID(ctx context.Context, arg database.UpdateTemplateMetaByIDParams) error {
2162-
fetch := func(ctx context.Context, arg database.UpdateTemplateMetaByIDParams) (database.TemplateWithUser, error) {
2162+
fetch := func(ctx context.Context, arg database.UpdateTemplateMetaByIDParams) (database.Template, error) {
21632163
return q.db.GetTemplateByID(ctx, arg.ID)
21642164
}
21652165
return update(q.log, q.auth, fetch, q.db.UpdateTemplateMetaByID)(ctx, arg)
21662166
}
21672167

21682168
func (q *querier) UpdateTemplateScheduleByID(ctx context.Context, arg database.UpdateTemplateScheduleByIDParams) error {
2169-
fetch := func(ctx context.Context, arg database.UpdateTemplateScheduleByIDParams) (database.TemplateWithUser, error) {
2169+
fetch := func(ctx context.Context, arg database.UpdateTemplateScheduleByIDParams) (database.Template, error) {
21702170
return q.db.GetTemplateByID(ctx, arg.ID)
21712171
}
21722172
return update(q.log, q.auth, fetch, q.db.UpdateTemplateScheduleByID)(ctx, arg)
@@ -2510,7 +2510,7 @@ func (q *querier) UpdateWorkspaceTTL(ctx context.Context, arg database.UpdateWor
25102510
}
25112511

25122512
func (q *querier) UpdateWorkspaceTTLToBeWithinTemplateMax(ctx context.Context, arg database.UpdateWorkspaceTTLToBeWithinTemplateMaxParams) error {
2513-
fetch := func(ctx context.Context, arg database.UpdateWorkspaceTTLToBeWithinTemplateMaxParams) (database.TemplateWithUser, error) {
2513+
fetch := func(ctx context.Context, arg database.UpdateWorkspaceTTLToBeWithinTemplateMaxParams) (database.Template, error) {
25142514
return q.db.GetTemplateByID(ctx, arg.TemplateID)
25152515
}
25162516
return fetchAndExec(q.log, q.auth, rbac.ActionUpdate, fetch, q.db.UpdateWorkspaceTTLToBeWithinTemplateMax)(ctx, arg)
@@ -2577,7 +2577,7 @@ func (q *querier) UpsertTailnetCoordinator(ctx context.Context, id uuid.UUID) (d
25772577
return q.db.UpsertTailnetCoordinator(ctx, id)
25782578
}
25792579

2580-
func (q *querier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, _ rbac.PreparedAuthorized) ([]database.TemplateWithUser, error) {
2580+
func (q *querier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, _ rbac.PreparedAuthorized) ([]database.Template, error) {
25812581
// TODO Delete this function, all GetTemplates should be authorized. For now just call getTemplates on the authz querier.
25822582
return q.GetTemplatesWithFilter(ctx, arg)
25832583
}

‎coderd/database/dbfake/dbfake.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -443,32 +443,32 @@ func (q *FakeQuerier) getLatestWorkspaceBuildByWorkspaceIDNoLock(_ context.Conte
443443
return row, nil
444444
}
445445

446-
func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (database.TemplateWithUser, error) {
446+
func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (database.Template, error) {
447447
for _, template := range q.templates {
448448
if template.ID == id {
449449
return q.templateWithUser(template), nil
450450
}
451451
}
452-
return database.TemplateWithUser{}, sql.ErrNoRows
452+
return database.Template{}, sql.ErrNoRows
453453
}
454454

455-
func (q *FakeQuerier) templatesWithUser(tpl []database.Template) []database.TemplateWithUser {
456-
cpy := make([]database.TemplateWithUser, 0, len(tpl))
455+
func (q *FakeQuerier) templatesWithUser(tpl []database.Template) []database.Template {
456+
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.TemplateWithUser {
463+
func (q *FakeQuerier) templateWithUser(tpl database.Template) database.Template {
464464
var user database.User
465465
for _, _user := range q.users {
466466
if _user.ID == tpl.CreatedBy {
467467
user = _user
468468
break
469469
}
470470
}
471-
var withUser database.TemplateWithUser
471+
var withUser database.Template
472472
// This is a cheeky way to copy the fields over without explictly listing them all.
473473
d, _ := json.Marshal(tpl)
474474
_ = json.Unmarshal(d, &withUser)
@@ -1869,16 +1869,16 @@ func (q *FakeQuerier) GetTemplateAverageBuildTime(ctx context.Context, arg datab
18691869
return row, nil
18701870
}
18711871

1872-
func (q *FakeQuerier) GetTemplateByID(ctx context.Context, id uuid.UUID) (database.TemplateWithUser, error) {
1872+
func (q *FakeQuerier) GetTemplateByID(ctx context.Context, id uuid.UUID) (database.Template, error) {
18731873
q.mutex.RLock()
18741874
defer q.mutex.RUnlock()
18751875

18761876
return q.getTemplateByIDNoLock(ctx, id)
18771877
}
18781878

1879-
func (q *FakeQuerier) GetTemplateByOrganizationAndName(_ context.Context, arg database.GetTemplateByOrganizationAndNameParams) (database.TemplateWithUser, error) {
1879+
func (q *FakeQuerier) GetTemplateByOrganizationAndName(_ context.Context, arg database.GetTemplateByOrganizationAndNameParams) (database.Template, error) {
18801880
if err := validateDatabaseType(arg); err != nil {
1881-
return database.TemplateWithUser{}, err
1881+
return database.Template{}, err
18821882
}
18831883

18841884
q.mutex.RLock()
@@ -1896,7 +1896,7 @@ func (q *FakeQuerier) GetTemplateByOrganizationAndName(_ context.Context, arg da
18961896
}
18971897
return q.templateWithUser(template), nil
18981898
}
1899-
return database.TemplateWithUser{}, sql.ErrNoRows
1899+
return database.Template{}, sql.ErrNoRows
19001900
}
19011901

19021902
func (q *FakeQuerier) GetTemplateDAUs(_ context.Context, arg database.GetTemplateDAUsParams) ([]database.GetTemplateDAUsRow, error) {
@@ -2112,7 +2112,7 @@ func (q *FakeQuerier) GetTemplateVersionsCreatedAfter(_ context.Context, after t
21122112
return versions, nil
21132113
}
21142114

2115-
func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.TemplateWithUser, error) {
2115+
func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, error) {
21162116
q.mutex.RLock()
21172117
defer q.mutex.RUnlock()
21182118

@@ -2130,7 +2130,7 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.TemplateWithUs
21302130
return q.templatesWithUser(templates), nil
21312131
}
21322132

2133-
func (q *FakeQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.TemplateWithUser, error) {
2133+
func (q *FakeQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.Template, error) {
21342134
if err := validateDatabaseType(arg); err != nil {
21352135
return nil, err
21362136
}
@@ -4992,7 +4992,7 @@ func (*FakeQuerier) UpsertTailnetCoordinator(context.Context, uuid.UUID) (databa
49924992
return database.TailnetCoordinator{}, ErrUnimplemented
49934993
}
49944994

4995-
func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]database.TemplateWithUser, error) {
4995+
func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]database.Template, error) {
49964996
if err := validateDatabaseType(arg); err != nil {
49974997
return nil, err
49984998
}

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/modelmethods.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (t Template) RBACObject() rbac.Object {
109109
WithGroupACL(t.GroupACL)
110110
}
111111

112-
func (t TemplateWithUser) RBACObject() rbac.Object {
112+
func (t Template) RBACObject() rbac.Object {
113113
return rbac.ResourceTemplate.WithID(t.ID).
114114
InOrg(t.OrganizationID).
115115
WithACLUserList(t.UserACL).
@@ -130,7 +130,7 @@ func (t Template) DeepCopy() Template {
130130
return cpy
131131
}
132132

133-
func (TemplateVersion) RBACObject(template TemplateWithUser) rbac.Object {
133+
func (TemplateVersion) RBACObject(template Template) rbac.Object {
134134
// Just use the parent template resource for controlling versions
135135
return template.RBACObject()
136136
}

‎coderd/database/modelqueries.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ type customQuerier interface {
2727
}
2828

2929
type templateQuerier interface {
30-
GetAuthorizedTemplates(ctx context.Context, arg GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]TemplateWithUser, error)
30+
GetAuthorizedTemplates(ctx context.Context, arg GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]Template, error)
3131
GetTemplateGroupRoles(ctx context.Context, id uuid.UUID) ([]TemplateGroup, error)
3232
GetTemplateUserRoles(ctx context.Context, id uuid.UUID) ([]TemplateUser, error)
3333
}
3434

35-
func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]TemplateWithUser, error) {
35+
func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]Template, error) {
3636
authorizedFilter, err := prepared.CompileToSQL(ctx, regosql.ConvertConfig{
3737
VariableConverter: regosql.TemplateConverter(),
3838
})
@@ -57,9 +57,9 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
5757
return nil, err
5858
}
5959
defer rows.Close()
60-
var items []TemplateWithUser
60+
var items []Template
6161
for rows.Next() {
62-
var i TemplateWithUser
62+
var i Template
6363
if err := rows.Scan(
6464
&i.ID,
6565
&i.CreatedAt,

0 commit comments

Comments
 (0)