🐛 Branch-Protection: use debug message when unsure if PRs are required (

ossf#3917) warning when the data isn't available isn't intended. Signed-off-by: Spencer Schrock <[email protected]>
fhoeborn · Apr 1, 2024 · 971e64d · 971e64d
1 parent a942899
commit 971e64d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/checks/branch_protection_test.go b/checks/branch_protection_test.go
@@ -363,9 +363,9 @@ func TestReleaseAndDevBranchProtected(t *testing.T) {
 			expected: scut.TestReturn{
 				Error:         nil,
 				Score:         0,
-				NumberOfWarn:  6,
+				NumberOfWarn:  4,
 				NumberOfInfo:  0,
-				NumberOfDebug: 8,
+				NumberOfDebug: 10,
 			},
 			nonadmin:      true,
 			defaultBranch: main,

diff --git a/checks/evaluation/branch_protection.go b/checks/evaluation/branch_protection.go
@@ -407,15 +407,8 @@ func adminReviewProtection(f *finding.Finding, doLogging bool, dl checker.Detail
 	if f.Outcome == finding.OutcomePositive {
 		score++
 	}
-	switch f.Probe {
-	case requiresLastPushApproval.Probe,
-		requiresUpToDateBranches.Probe:
-		logWithDebug(f, doLogging, dl)
-		if f.Outcome != finding.OutcomeNotAvailable {
-			max++
-		}
-	default:
-		logInfoOrWarn(f, doLogging, dl)
+	logWithDebug(f, doLogging, dl)
+	if f.Outcome != finding.OutcomeNotAvailable {
 		max++
 	}
 	return score, max

diff --git a/checks/evaluation/branch_protection_test.go b/checks/evaluation/branch_protection_test.go
@@ -731,9 +731,9 @@ func TestBranchProtection(t *testing.T) {
 			},
 			result: scut.TestReturn{
 				Score:         3,
-				NumberOfWarn:  3,
+				NumberOfWarn:  2,
 				NumberOfInfo:  2,
-				NumberOfDebug: 4,
+				NumberOfDebug: 5,
 			},
 		},
 		{