clarify function name, wrap an error

Emyrk · Emyrk · commit 107bb45b016c · 2023-07-19T14:17:02.000-04:00
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -446,21 +446,21 @@ func (q *FakeQuerier) getLatestWorkspaceBuildByWorkspaceIDNoLock(_ context.Conte
 func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (database.Template, error) {
 	for _, template := range q.templates {
 		if template.ID == id {
-			return q.templateWithUser(template), nil
+			return q.templateWithUserNoLock(template), nil
 		}
 	}
 	return database.Template{}, sql.ErrNoRows
 }
 
-func (q *FakeQuerier) templatesWithUser(tpl []database.TemplateTable) []database.Template {
+func (q *FakeQuerier) templatesWithUserNoLock(tpl []database.TemplateTable) []database.Template {
 	cpy := make([]database.Template, 0, len(tpl))
 	for _, t := range tpl {
-		cpy = append(cpy, q.templateWithUser(t))
+		cpy = append(cpy, q.templateWithUserNoLock(t))
 	}
 	return cpy
 }
 
-func (q *FakeQuerier) templateWithUser(tpl database.TemplateTable) database.Template {
+func (q *FakeQuerier) templateWithUserNoLock(tpl database.TemplateTable) database.Template {
 	var user database.User
 	for _, _user := range q.users {
 		if _user.ID == tpl.CreatedBy {
@@ -1894,7 +1894,7 @@ func (q *FakeQuerier) GetTemplateByOrganizationAndName(_ context.Context, arg da
 		if template.Deleted != arg.Deleted {
 			continue
 		}
-		return q.templateWithUser(template), nil
+		return q.templateWithUserNoLock(template), nil
 	}
 	return database.Template{}, sql.ErrNoRows
 }
@@ -2124,7 +2124,7 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
 		return i.ID.String() < j.ID.String()
 	})
 
-	return q.templatesWithUser(templates), nil
+	return q.templatesWithUserNoLock(templates), nil
 }
 
 func (q *FakeQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.Template, error) {
@@ -5007,7 +5007,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
 
 	var templates []database.Template
 	for _, templateTable := range q.templates {
-		template := q.templateWithUser(templateTable)
+		template := q.templateWithUserNoLock(templateTable)
 		if prepared != nil && prepared.Authorize(ctx, template.RBACObject()) != nil {
 			continue
 		}
diff --git a/coderd/schedule/template.go b/coderd/schedule/template.go
@@ -86,7 +86,7 @@ func (*agplTemplateScheduleStore) SetTemplateScheduleOptions(ctx context.Context
 			LockedTTL:          tpl.LockedTTL,
 		})
 		if err != nil {
-			return err
+			return xerrors.Errorf("update template schedule: %w", err)
 		}
 
 		template, err = db.GetTemplateByID(ctx, tpl.ID)

Original file line number	Diff line number	Diff line change
`@@ -446,21 +446,21 @@ func (q *FakeQuerier) getLatestWorkspaceBuildByWorkspaceIDNoLock(_ context.Conte`
`446`	`446`	`func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (database.Template, error) {`
`447`	`447`	`for _, template := range q.templates {`
`448`	`448`	`if template.ID == id {`
`449`		`- return q.templateWithUser(template), nil`
	`449`	`+ return q.templateWithUserNoLock(template), nil`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`	`return database.Template{}, sql.ErrNoRows`
`453`	`453`	`}`
`454`	`454`
`455`		`-func (q *FakeQuerier) templatesWithUser(tpl []database.TemplateTable) []database.Template {`
	`455`	`+func (q *FakeQuerier) templatesWithUserNoLock(tpl []database.TemplateTable) []database.Template {`
`456`	`456`	`cpy := make([]database.Template, 0, len(tpl))`
`457`	`457`	`for _, t := range tpl {`
`458`		`- cpy = append(cpy, q.templateWithUser(t))`
	`458`	`+ cpy = append(cpy, q.templateWithUserNoLock(t))`
`459`	`459`	`}`
`460`	`460`	`return cpy`
`461`	`461`	`}`
`462`	`462`
`463`		`-func (q *FakeQuerier) templateWithUser(tpl database.TemplateTable) database.Template {`
	`463`	`+func (q *FakeQuerier) templateWithUserNoLock(tpl database.TemplateTable) database.Template {`
`464`	`464`	`var user database.User`
`465`	`465`	`for _, _user := range q.users {`
`466`	`466`	`if _user.ID == tpl.CreatedBy {`
`@@ -1894,7 +1894,7 @@ func (q *FakeQuerier) GetTemplateByOrganizationAndName(_ context.Context, arg da`
`1894`	`1894`	`if template.Deleted != arg.Deleted {`
`1895`	`1895`	`continue`
`1896`	`1896`	`}`
`1897`		`- return q.templateWithUser(template), nil`
	`1897`	`+ return q.templateWithUserNoLock(template), nil`
`1898`	`1898`	`}`
`1899`	`1899`	`return database.Template{}, sql.ErrNoRows`
`1900`	`1900`	`}`
`@@ -2124,7 +2124,7 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro`
`2124`	`2124`	`return i.ID.String() < j.ID.String()`
`2125`	`2125`	`})`
`2126`	`2126`
`2127`		`- return q.templatesWithUser(templates), nil`
	`2127`	`+ return q.templatesWithUserNoLock(templates), nil`
`2128`	`2128`	`}`
`2129`	`2129`
`2130`	`2130`	`func (q *FakeQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTemplatesWithFilterParams) ([]database.Template, error) {`
`@@ -5007,7 +5007,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G`
`5007`	`5007`
`5008`	`5008`	`var templates []database.Template`
`5009`	`5009`	`for _, templateTable := range q.templates {`
`5010`		`- template := q.templateWithUser(templateTable)`
	`5010`	`+ template := q.templateWithUserNoLock(templateTable)`
`5011`	`5011`	`if prepared != nil && prepared.Authorize(ctx, template.RBACObject()) != nil {`
`5012`	`5012`	`continue`
`5013`	`5013`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (*agplTemplateScheduleStore) SetTemplateScheduleOptions(ctx context.Context`
`86`	`86`	`LockedTTL: tpl.LockedTTL,`
`87`	`87`	`})`
`88`	`88`	`if err != nil {`
`89`		`- return err`
	`89`	`+ return xerrors.Errorf("update template schedule: %w", err)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`template, err = db.GetTemplateByID(ctx, tpl.ID)`