fixup! remove queryWithRelated

johnstcn · johnstcn · commit 509ebdc24cc9 · 2023-02-07T14:44:57.000Z
diff --git a/coderd/authzquery/template.go b/coderd/authzquery/template.go
@@ -176,7 +176,7 @@ func (q *AuthzQuerier) GetTemplateVersionsByTemplateID(ctx context.Context, arg
 
 func (q *AuthzQuerier) GetTemplateVersionsCreatedAfter(ctx context.Context, createdAt time.Time) ([]database.TemplateVersion, error) {
 	// An actor can read execute this query if they can read all templates.
-	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceTemplate); err != nil {
+	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceTemplate.All()); err != nil {
 		return nil, err
 	}
 	return q.db.GetTemplateVersionsCreatedAfter(ctx, createdAt)
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -29,7 +29,7 @@ func (q *AuthzQuerier) GetWorkspaces(ctx context.Context, arg database.GetWorksp
 
 func (q *AuthzQuerier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {
 	if _, err := q.GetWorkspaceByID(ctx, workspaceID); err != nil {
-		return database.WorkspaceBuild{}, nil
+		return database.WorkspaceBuild{}, err
 	}
 	return q.db.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)
 }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (q *AuthzQuerier) GetTemplateVersionsByTemplateID(ctx context.Context, arg`
`176`	`176`
`177`	`177`	`func (q *AuthzQuerier) GetTemplateVersionsCreatedAfter(ctx context.Context, createdAt time.Time) ([]database.TemplateVersion, error) {`
`178`	`178`	`// An actor can read execute this query if they can read all templates.`
`179`		`- if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceTemplate); err != nil {`
	`179`	`+ if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceTemplate.All()); err != nil {`
`180`	`180`	`return nil, err`
`181`	`181`	`}`
`182`	`182`	`return q.db.GetTemplateVersionsCreatedAfter(ctx, createdAt)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (q *AuthzQuerier) GetWorkspaces(ctx context.Context, arg database.GetWorksp`
`29`	`29`
`30`	`30`	`func (q *AuthzQuerier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {`
`31`	`31`	`if _, err := q.GetWorkspaceByID(ctx, workspaceID); err != nil {`
`32`		`- return database.WorkspaceBuild{}, nil`
	`32`	`+ return database.WorkspaceBuild{}, err`
`33`	`33`	`}`
`34`	`34`	`return q.db.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)`
`35`	`35`	`}`