Start removing QueryByRelated

Emyrk · Emyrk · commit 073aa2cddfbb · 2023-02-07T08:11:43.000-06:00
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -28,15 +28,11 @@ func (q *AuthzQuerier) GetWorkspaces(ctx context.Context, arg database.GetWorksp
 }
 
 func (q *AuthzQuerier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {
-	fetch := func(_ database.WorkspaceBuild, workspaceID uuid.UUID) (database.Workspace, error) {
-		return q.db.GetWorkspaceByID(ctx, workspaceID)
+	_, err := q.GetWorkspaceByID(ctx, workspaceID)
+	if err != nil {
+		return database.WorkspaceBuild{}, nil
 	}
-	return queryWithRelated(
-		q.log,
-		q.auth,
-		rbac.ActionRead,
-		fetch,
-		q.db.GetLatestWorkspaceBuildByWorkspaceID)(ctx, workspaceID)
+	return q.db.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)
 }
 
 func (q *AuthzQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) {
@@ -54,11 +50,11 @@ func (q *AuthzQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Contex
 }
 
 func (q *AuthzQuerier) GetWorkspaceAgentByID(ctx context.Context, id uuid.UUID) (database.WorkspaceAgent, error) {
-	fetch := func(agent database.WorkspaceAgent, _ uuid.UUID) (database.Workspace, error) {
-		return q.db.GetWorkspaceByAgentID(ctx, agent.ID)
+	_, err := q.GetWorkspaceByAgentID(ctx, id)
+	if err != nil {
+		return database.WorkspaceAgent{}, err
 	}
-	// Currently agent resource is just the related workspace resource.
-	return queryWithRelated(q.log, q.auth, rbac.ActionRead, fetch, q.db.GetWorkspaceAgentByID)(ctx, id)
+	return q.db.GetWorkspaceAgentByID(ctx, id)
 }
 
 // GetWorkspaceAgentByInstanceID might want to be a system call? Unsure exactly,

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,11 @@ func (q *AuthzQuerier) GetWorkspaces(ctx context.Context, arg database.GetWorksp`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func (q *AuthzQuerier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {`
`31`		`- fetch := func(_ database.WorkspaceBuild, workspaceID uuid.UUID) (database.Workspace, error) {`
`32`		`- return q.db.GetWorkspaceByID(ctx, workspaceID)`
	`31`	`+ _, err := q.GetWorkspaceByID(ctx, workspaceID)`
	`32`	`+ if err != nil {`
	`33`	`+ return database.WorkspaceBuild{}, nil`
`33`	`34`	`}`
`34`		`- return queryWithRelated(`
`35`		`- q.log,`
`36`		`- q.auth,`
`37`		`- rbac.ActionRead,`
`38`		`- fetch,`
`39`		`- q.db.GetLatestWorkspaceBuildByWorkspaceID)(ctx, workspaceID)`
	`35`	`+ return q.db.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspaceID)`
`40`	`36`	`}`
`41`	`37`
`42`	`38`	`func (q *AuthzQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) {`
`@@ -54,11 +50,11 @@ func (q *AuthzQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Contex`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`func (q *AuthzQuerier) GetWorkspaceAgentByID(ctx context.Context, id uuid.UUID) (database.WorkspaceAgent, error) {`
`57`		`- fetch := func(agent database.WorkspaceAgent, _ uuid.UUID) (database.Workspace, error) {`
`58`		`- return q.db.GetWorkspaceByAgentID(ctx, agent.ID)`
	`53`	`+ _, err := q.GetWorkspaceByAgentID(ctx, id)`
	`54`	`+ if err != nil {`
	`55`	`+ return database.WorkspaceAgent{}, err`
`59`	`56`	`}`
`60`		`- // Currently agent resource is just the related workspace resource.`
`61`		`- return queryWithRelated(q.log, q.auth, rbac.ActionRead, fetch, q.db.GetWorkspaceAgentByID)(ctx, id)`
	`57`	`+ return q.db.GetWorkspaceAgentByID(ctx, id)`
`62`	`58`	`}`
`63`	`59`
`64`	`60`	`// GetWorkspaceAgentByInstanceID might want to be a system call? Unsure exactly,`