Fix dbfake, replaced the wrong function

Emyrk · Emyrk · commit 1898c595bc7b · 2023-07-21T10:38:24.000-04:00
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -810,7 +810,7 @@ func (s *MethodTestSuite) TestTemplate() {
 			TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
 			Name:       tv.Name,
 			UpdatedAt:  tv.UpdatedAt,
-		}).Asserts(t1, rbac.ActionUpdate).Returns(tv)
+		}).Asserts(t1, rbac.ActionUpdate)
 	}))
 	s.Run("UpdateTemplateVersionDescriptionByJobID", s.Subtest(func(db database.Store, check *expects) {
 		jobID := uuid.New()
@@ -1242,7 +1242,7 @@ func (s *MethodTestSuite) TestWorkspace() {
 			UpdatedAt:        build.UpdatedAt,
 			Deadline:         build.Deadline,
 			ProvisionerState: []byte{},
-		}).Asserts(ws, rbac.ActionUpdate).Returns(build)
+		}).Asserts(ws, rbac.ActionUpdate)
 	}))
 	s.Run("SoftDeleteWorkspaceByID", s.Subtest(func(db database.Store, check *expects) {
 		ws := dbgen.Workspace(s.T(), db, database.Workspace{})
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -422,9 +422,9 @@ func (q *FakeQuerier) getWorkspaceByAgentIDNoLock(_ context.Context, agentID uui
 }
 
 func (q *FakeQuerier) getWorkspaceBuildByIDNoLock(_ context.Context, id uuid.UUID) (database.WorkspaceBuild, error) {
-	for _, history := range q.workspaceBuilds {
-		if history.ID == id {
-			return q.workspaceBuildWithUserNoLock(history), nil
+	for _, build := range q.workspaceBuilds {
+		if build.ID == id {
+			return q.workspaceBuildWithUserNoLock(build), nil
 		}
 	}
 	return database.WorkspaceBuild{}, sql.ErrNoRows
@@ -2738,7 +2738,12 @@ func (q *FakeQuerier) GetWorkspaceBuildByJobID(ctx context.Context, jobID uuid.U
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
-	return q.getWorkspaceBuildByIDNoLock(ctx, jobID)
+	for _, build := range q.workspaceBuilds {
+		if build.JobID == jobID {
+			return q.workspaceBuildWithUserNoLock(build), nil
+		}
+	}
+	return database.WorkspaceBuild{}, sql.ErrNoRows
 }
 
 func (q *FakeQuerier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild, error) {

Original file line number	Diff line number	Diff line change
`@@ -422,9 +422,9 @@ func (q *FakeQuerier) getWorkspaceByAgentIDNoLock(_ context.Context, agentID uui`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`func (q *FakeQuerier) getWorkspaceBuildByIDNoLock(_ context.Context, id uuid.UUID) (database.WorkspaceBuild, error) {`
`425`		`- for _, history := range q.workspaceBuilds {`
`426`		`- if history.ID == id {`
`427`		`- return q.workspaceBuildWithUserNoLock(history), nil`
	`425`	`+ for _, build := range q.workspaceBuilds {`
	`426`	`+ if build.ID == id {`
	`427`	`+ return q.workspaceBuildWithUserNoLock(build), nil`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`	`return database.WorkspaceBuild{}, sql.ErrNoRows`
`@@ -2738,7 +2738,12 @@ func (q *FakeQuerier) GetWorkspaceBuildByJobID(ctx context.Context, jobID uuid.U`
`2738`	`2738`	`q.mutex.RLock()`
`2739`	`2739`	`defer q.mutex.RUnlock()`
`2740`	`2740`
`2741`		`- return q.getWorkspaceBuildByIDNoLock(ctx, jobID)`
	`2741`	`+ for _, build := range q.workspaceBuilds {`
	`2742`	`+ if build.JobID == jobID {`
	`2743`	`+ return q.workspaceBuildWithUserNoLock(build), nil`
	`2744`	`+ }`
	`2745`	`+ }`
	`2746`	`+ return database.WorkspaceBuild{}, sql.ErrNoRows`
`2742`	`2747`	`}`
`2743`	`2748`
`2744`	`2749`	`func (q *FakeQuerier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild, error) {`