authzquery: workspace: fix GetWorkspaceAppByAgentIDAndSlug and GetWorkspaceAppsByAgentID

johnstcn · johnstcn · commit 76a490eca785 · 2023-01-31T16:06:21.000Z
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -109,12 +109,12 @@ func (q *AuthzQuerier) UpdateWorkspaceAgentLifecycleStateByID(ctx context.Contex
 
 func (q *AuthzQuerier) GetWorkspaceAppByAgentIDAndSlug(ctx context.Context, arg database.GetWorkspaceAppByAgentIDAndSlugParams) (database.WorkspaceApp, error) {
 	// If we can fetch the workspace, we can fetch the apps. Use the authorized call.
-	_, err := q.GetWorkspaceByID(ctx, arg.AgentID)
+	_, err := q.GetWorkspaceByAgentID(ctx, arg.AgentID)
 	if err != nil {
 		return database.WorkspaceApp{}, err
 	}
 
-	return q.GetWorkspaceAppByAgentIDAndSlug(ctx, arg)
+	return q.database.GetWorkspaceAppByAgentIDAndSlug(ctx, arg)
 }
 
 func (q *AuthzQuerier) GetWorkspaceAppsByAgentID(ctx context.Context, agentID uuid.UUID) ([]database.WorkspaceApp, error) {
@@ -266,7 +266,7 @@ func (q *AuthzQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID u
 	if err != nil {
 		return nil, nil
 	}
-	return q.GetWorkspaceResourcesByJobID(ctx, jobID)
+	return q.database.GetWorkspaceResourcesByJobID(ctx, jobID)
 }
 
 // GetWorkspaceResourcesByJobIDs is an all or nothing call. If a single resource is not authorized, then

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,12 @@ func (q *AuthzQuerier) UpdateWorkspaceAgentLifecycleStateByID(ctx context.Contex`
`109`	`109`
`110`	`110`	`func (q *AuthzQuerier) GetWorkspaceAppByAgentIDAndSlug(ctx context.Context, arg database.GetWorkspaceAppByAgentIDAndSlugParams) (database.WorkspaceApp, error) {`
`111`	`111`	`// If we can fetch the workspace, we can fetch the apps. Use the authorized call.`
`112`		`- _, err := q.GetWorkspaceByID(ctx, arg.AgentID)`
	`112`	`+ _, err := q.GetWorkspaceByAgentID(ctx, arg.AgentID)`
`113`	`113`	`if err != nil {`
`114`	`114`	`return database.WorkspaceApp{}, err`
`115`	`115`	`}`
`116`	`116`
`117`		`- return q.GetWorkspaceAppByAgentIDAndSlug(ctx, arg)`
	`117`	`+ return q.database.GetWorkspaceAppByAgentIDAndSlug(ctx, arg)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func (q *AuthzQuerier) GetWorkspaceAppsByAgentID(ctx context.Context, agentID uuid.UUID) ([]database.WorkspaceApp, error) {`
`@@ -266,7 +266,7 @@ func (q *AuthzQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID u`
`266`	`266`	`if err != nil {`
`267`	`267`	`return nil, nil`
`268`	`268`	`}`
`269`		`- return q.GetWorkspaceResourcesByJobID(ctx, jobID)`
	`269`	`+ return q.database.GetWorkspaceResourcesByJobID(ctx, jobID)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`// GetWorkspaceResourcesByJobIDs is an all or nothing call. If a single resource is not authorized, then`