switch maintained check off logfindings and delete it

Signed-off-by: Spencer Schrock <[email protected]>

checker/check_result.go

@@ -243,27 +243,7 @@ func CreateRuntimeErrorResult(name string, e error) CheckResult {
 	}
 }
 
-// LogFindings logs the list of findings.
-func LogFindings(findings []finding.Finding, dl DetailLogger) {
-	for i := range findings {
-		f := &findings[i]
-		switch f.Outcome {
-		case finding.OutcomeFalse:
-			dl.Warn(&LogMessage{
-				Finding: f,
-			})
-		case finding.OutcomeTrue:
-			dl.Info(&LogMessage{
-				Finding: f,
-			})
-		default:
-			dl.Debug(&LogMessage{
-				Finding: f,
-			})
-		}
-	}
-}
-
+// LogFinding logs the given finding at the given level.
 func LogFinding(dl DetailLogger, f *finding.Finding, level DetailType) {
 	lm := LogMessage{Finding: f}
 	switch level {

checks/evaluation/maintained.go

@@ -50,21 +50,15 @@ func Maintained(name string,
 		return checker.CreateRuntimeErrorResult(name, e)
 	}
 
-	if projectIsArchived(findings) {
-		checker.LogFindings(falseFindings(findings), dl)
-		return checker.CreateMinScoreResult(name, "project is archived")
-	}
-
-	if projectWasCreatedInLast90Days(findings) {
-		checker.LogFindings(falseFindings(findings), dl)
-		return checker.CreateMinScoreResult(name, "project was created in last 90 days. please review its contents carefully")
-	}
+	var archived, recentlyCreated bool
 
 	var commitsWithinThreshold, numberOfIssuesUpdatedWithinThreshold int
 	var err error
 	for i := range findings {
 		f := &findings[i]
-		if f.Outcome == finding.OutcomeTrue {
+		// currently this works but when we switch notArchived for #3654 this will need to also check the probe
+		switch f.Outcome {
+		case finding.OutcomeTrue:
 			switch f.Probe {
 			case issueActivityByProjectMember.Probe:
 				numberOfIssuesUpdatedWithinThreshold, err = strconv.Atoi(f.Values[issueActivityByProjectMember.NumIssuesKey])
@@ -77,31 +71,29 @@ func Maintained(name string,
 					return checker.CreateRuntimeErrorResult(name, sce.WithMessage(sce.ErrScorecardInternal, err.Error()))
 				}
 			}
+		case finding.OutcomeFalse:
+			switch f.Probe {
+			case notArchived.Probe:
+				archived = true
+			case notCreatedRecently.Probe:
+				recentlyCreated = true
+			}
+			checker.LogFinding(dl, f, checker.DetailWarn)
+		default:
+			checker.LogFinding(dl, f, checker.DetailDebug)
 		}
 	}
 
+	if archived {
+		return checker.CreateMinScoreResult(name, "project is archived")
+	}
+
+	if recentlyCreated {
+		return checker.CreateMinScoreResult(name, "project was created in last 90 days. please review its contents carefully")
+	}
+
 	return checker.CreateProportionalScoreResult(name, fmt.Sprintf(
 		"%d commit(s) and %d issue activity found in the last %d days",
 		commitsWithinThreshold, numberOfIssuesUpdatedWithinThreshold, lookBackDays),
 		commitsWithinThreshold+numberOfIssuesUpdatedWithinThreshold, activityPerWeek*lookBackDays/daysInOneWeek)
 }
-
-func projectIsArchived(findings []finding.Finding) bool {
-	for i := range findings {
-		f := &findings[i]
-		if f.Outcome == finding.OutcomeFalse && f.Probe == notArchived.Probe {
-			return true
-		}
-	}
-	return false
-}
-
-func projectWasCreatedInLast90Days(findings []finding.Finding) bool {
-	for i := range findings {
-		f := &findings[i]
-		if f.Outcome == finding.OutcomeFalse && f.Probe == notCreatedRecently.Probe {
-			return true
-		}
-	}
-	return false
-}

checks/evaluation/maintained_test.go

@@ -65,9 +65,11 @@ func TestMaintained(t *testing.T) {
 				{
 					Probe:   hasRecentCommits.Probe,
 					Outcome: finding.OutcomeFalse,
+					Message: "no recent commits",
 				}, {
 					Probe:   issueActivityByProjectMember.Probe,
 					Outcome: finding.OutcomeFalse,
+					Message: "no recent issues",
 				}, {
 					Probe:   notArchived.Probe,
 					Outcome: finding.OutcomeTrue,
@@ -77,7 +79,8 @@ func TestMaintained(t *testing.T) {
 				},
 			},
 			result: scut.TestReturn{
-				Score: 0,
+				Score:        0,
+				NumberOfWarn: 2,
 			},
 		},
 		{