Fix scoring issue with Code Review check (ossf#2292)

Signed-off-by: Raghav Kaul <raghavkaul@google.com> Signed-off-by: Raghav Kaul <raghavkaul@google.com>
raghavkaul · Feb 9, 2023 · 4f74f7a · 4f74f7a
1 parent fc7219a
commit 4f74f7a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/checks/evaluation/code_review.go b/checks/evaluation/code_review.go
@@ -42,10 +42,9 @@ func CodeReview(name string, dl checker.DetailLogger, r *checker.CodeReviewData)
 		return checker.CreateInconclusiveResult(name, "no commits found")
 	}
 
-	score := 0
 	numReviewed := 0
 	for i := range r.DefaultBranchChangesets {
-		score += reviewScoreForChangeset(&r.DefaultBranchChangesets[i])
+		score := reviewScoreForChangeset(&r.DefaultBranchChangesets[i])
 		if score >= changesReviewed {
 			numReviewed += 1
 		}
@@ -54,7 +53,7 @@ func CodeReview(name string, dl checker.DetailLogger, r *checker.CodeReviewData)
 		"%v out of last %v changesets reviewed before merge", numReviewed, len(r.DefaultBranchChangesets),
 	)
 
-	return checker.CreateProportionalScoreResult(name, reason, score, len(r.DefaultBranchChangesets))
+	return checker.CreateProportionalScoreResult(name, reason, numReviewed, len(r.DefaultBranchChangesets))
 }
 
 func reviewScoreForChangeset(changeset *checker.Changeset) (score reviewScore) {

diff --git a/checks/evaluation/code_review_test.go b/checks/evaluation/code_review_test.go
@@ -63,6 +63,47 @@ func TestCodeReview(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "all changesets reviewed",
+			expected: scut.TestReturn{
+				Score: checker.MaxResultScore,
+			},
+			rawData: &checker.CodeReviewData{
+				DefaultBranchChangesets: []checker.Changeset{
+					{
+						ReviewPlatform: checker.ReviewPlatformGitHub,
+						RevisionID:     "1",
+						Commits: []clients.Commit{
+							{
+								SHA: "1",
+								AssociatedMergeRequest: clients.PullRequest{
+									Reviews: []clients.Review{
+										{
+											State: "APPROVED",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "all changesets reviewed outside github",
+			expected: scut.TestReturn{
+				Score: checker.MaxResultScore,
+			},
+			rawData: &checker.CodeReviewData{
+				DefaultBranchChangesets: []checker.Changeset{
+					{
+						ReviewPlatform: checker.ReviewPlatformGerrit,
+						RevisionID:     "1",
+						Commits:        []clients.Commit{{SHA: "1"}},
+					},
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {