⚠️ Removing the pass field from result (#1853)

- Removing the pass field from result - #1393 Signed-off-by: naveensrinivasan <[email protected]>
ossf · May 3, 2022 · 2cb6541 · 2cb6541
1 parent 875b6f6
commit 2cb6541
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 138 deletions.
diff --git a/checks/binary_artifact_test.go b/checks/binary_artifact_test.go
@@ -42,7 +42,6 @@ func TestBinaryArtifacts(t *testing.T) {
 			err:         nil,
 			expected: checker.CheckResult{
 				Score: 9,
-				Pass:  true,
 			},
 		},
 		{
@@ -51,7 +50,6 @@ func TestBinaryArtifacts(t *testing.T) {
 			err:         nil,
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 	}
@@ -89,9 +87,6 @@ func TestBinaryArtifacts(t *testing.T) {
 			if result.Score != tt.expected.Score {
 				t.Errorf("BinaryArtifacts: %v, expected %v for tests %v", result.Score, tt.expected.Score, tt.name)
 			}
-			if result.Pass != tt.expected.Pass {
-				t.Errorf("BinaryArtifacts: %v, expected %v for tests %v", result.Pass, tt.expected.Pass, tt.name)
-			}
 
 			ctrl.Finish()
 		})

diff --git a/checks/code_review_test.go b/checks/code_review_test.go
@@ -88,7 +88,6 @@ func TestCodereview(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 		{
@@ -112,7 +111,6 @@ func TestCodereview(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 		{
@@ -136,7 +134,6 @@ func TestCodereview(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 		{
@@ -217,9 +214,6 @@ func TestCodereview(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/checks/contributors_test.go b/checks/contributors_test.go
@@ -134,7 +134,6 @@ func TestContributors(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 		{
@@ -185,9 +184,6 @@ func TestContributors(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/checks/maintained_test.go b/checks/maintained_test.go
@@ -355,9 +355,6 @@ func Test_Maintained(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/checks/sast_test.go b/checks/sast_test.go
@@ -53,7 +53,7 @@ func TestSAST(t *testing.T) {
 			commits:      []clients.Commit{},
 			searchresult: clients.SearchResponse{},
 			checkRuns:    []clients.CheckRun{},
-			expected:     checker.CheckResult{Score: -1, Pass: false},
+			expected:     checker.CheckResult{Score: -1},
 		},
 		{
 			name: "Successful SAST checker should return success status",
@@ -76,7 +76,6 @@ func TestSAST(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 10,
-				Pass:  true,
 			},
 		},
 		{
@@ -116,7 +115,6 @@ func TestSAST(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 7,
-				Pass:  false,
 			},
 		},
 		{
@@ -153,7 +151,6 @@ func TestSAST(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 0,
-				Pass:  false,
 			},
 		},
 		{
@@ -175,7 +172,6 @@ func TestSAST(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 0,
-				Pass:  false,
 			},
 		},
 		{
@@ -198,7 +194,6 @@ func TestSAST(t *testing.T) {
 			},
 			expected: checker.CheckResult{
 				Score: 0,
-				Pass:  false,
 			},
 		},
 	}
@@ -232,9 +227,6 @@ func TestSAST(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/checks/signed_releases_test.go b/checks/signed_releases_test.go
@@ -39,7 +39,6 @@ func TestSignedRelease(t *testing.T) {
 		{
 			name: "NoReleases",
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: -1,
 			},
 		},
@@ -54,7 +53,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: -1,
 			},
 		},
@@ -74,7 +72,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: 0,
 			},
 		},
@@ -94,7 +91,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -114,7 +110,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -134,7 +129,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -154,7 +148,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -178,7 +171,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -217,7 +209,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
@@ -252,7 +243,6 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: 5,
 			},
 		},
@@ -351,15 +341,13 @@ func TestSignedRelease(t *testing.T) {
 				},
 			},
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 		},
 		{
 			name: "Error getting releases",
 			err:  errors.New("Error getting releases"),
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: -1,
 				Error: errors.New("Error getting releases"),
 			},
@@ -400,9 +388,6 @@ func TestSignedRelease(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/checks/webhook_test.go b/checks/webhook_test.go
@@ -40,7 +40,6 @@ func TestWebhooks(t *testing.T) {
 			name: "No Webhooks",
 			uri:  "github.com/owner/repo",
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 			err:      nil,
@@ -50,7 +49,6 @@ func TestWebhooks(t *testing.T) {
 			name: "With Webhooks and secret set",
 			uri:  "github.com/owner/repo",
 			expected: checker.CheckResult{
-				Pass:  true,
 				Score: 10,
 			},
 			err: nil,
@@ -65,7 +63,6 @@ func TestWebhooks(t *testing.T) {
 			name: "With Webhooks and no secret set",
 			uri:  "github.com/owner/repo",
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: 0,
 			},
 			err: nil,
@@ -80,7 +77,6 @@ func TestWebhooks(t *testing.T) {
 			name: "With 2 Webhooks with and whitout secrets configured",
 			uri:  "github.com/owner/repo",
 			expected: checker.CheckResult{
-				Pass:  false,
 				Score: 5,
 			},
 			err: nil,
@@ -133,9 +129,6 @@ func TestWebhooks(t *testing.T) {
 			if res.Score != tt.expected.Score {
 				t.Errorf("Expected score %d, got %d for %v", tt.expected.Score, res.Score, tt.name)
 			}
-			if res.Pass != tt.expected.Pass {
-				t.Errorf("Expected pass %t, got %t for %v", tt.expected.Pass, res.Pass, tt.name)
-			}
 			ctrl.Finish()
 		})
 	}

diff --git a/cron/format/json.go b/cron/format/json.go
@@ -97,7 +97,6 @@ func AsJSON(r *pkg.ScorecardResult, showDetails bool, logLevel log.Level, writer
 	for _, checkResult := range r.Checks {
 		tmpResult := jsonCheckResult{
 			Name:       checkResult.Name,
-			Pass:       checkResult.Pass,
 			Confidence: checkResult.Confidence,
 		}
 		if showDetails {

diff --git a/e2e/binary_artifacts_test.go b/e2e/binary_artifacts_test.go
@@ -79,14 +79,13 @@ var _ = Describe("E2E TEST:"+checks.CheckBinaryArtifacts, func() {
 			expected := scut.TestReturn{
 				Error:         nil,
 				Score:         checker.MinResultScore,
-				NumberOfWarn:  24,
+				NumberOfWarn:  25,
 				NumberOfInfo:  0,
 				NumberOfDebug: 0,
 			}
 			result := checks.BinaryArtifacts(&req)
 			// UPGRADEv2: to remove.
 			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "binary artifacts", &expected, &result, &dl)).Should(BeTrue())
 			Expect(repoClient.Close()).Should(BeNil())
@@ -114,9 +113,6 @@ var _ = Describe("E2E TEST:"+checks.CheckBinaryArtifacts, func() {
 				NumberOfDebug: 0,
 			}
 			result := checks.BinaryArtifacts(&req)
-			// UPGRADEv2: to remove.
-			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "binary artifacts", &expected, &result, &dl)).Should(BeTrue())
 			Expect(repoClient.Close()).Should(BeNil())

diff --git a/e2e/branch_protection_test.go b/e2e/branch_protection_test.go
@@ -54,7 +54,6 @@ var _ = Describe("E2E TEST PAT:"+checks.CheckBranchProtection, func() {
 			result := checks.BranchProtection(&req)
 			// UPGRADEv2: to remove.
 			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "branch protection accessible", &expected, &result, &dl)).Should(BeTrue())
@@ -83,9 +82,6 @@ var _ = Describe("E2E TEST PAT:"+checks.CheckBranchProtection, func() {
 				NumberOfDebug: 0,
 			}
 			result := checks.BranchProtection(&req)
-			// UPGRADEv2: to remove.
-			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "branch protection accessible", &expected, &result, &dl)).Should(BeTrue())
@@ -114,9 +110,6 @@ var _ = Describe("E2E TEST PAT:"+checks.CheckBranchProtection, func() {
 				NumberOfDebug: 3,
 			}
 			result := checks.BranchProtection(&req)
-			// UPGRADEv2: to remove.
-			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "branch protection accessible", &expected, &result, &dl)).Should(BeTrue())

diff --git a/e2e/cii_best_practices_test.go b/e2e/cii_best_practices_test.go
@@ -50,9 +50,6 @@ var _ = Describe("E2E TEST:"+checks.CheckCIIBestPractices, func() {
 				NumberOfDebug: 0,
 			}
 			result := checks.CIIBestPractices(&req)
-			// UPGRADEv2: to remove.
-			// Old version.
-			Expect(result.Pass).Should(BeFalse())
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "passing badge", &expected, &result, &dl)).Should(BeTrue())
 		})

diff --git a/e2e/contributors_test.go b/e2e/contributors_test.go
@@ -50,9 +50,6 @@ var _ = Describe("E2E TEST:"+checks.CheckContributors, func() {
 				NumberOfDebug: 0,
 			}
 			result := checks.Contributors(&req)
-			// UPGRADEv2: to remove.
-			// Old version.
-			Expect(result.Pass).Should(BeTrue())
 			// New version.
 			Expect(scut.ValidateTestReturn(nil, "several contributors", &expected, &result, &dl)).Should(BeTrue())
 			Expect(repoClient.Close()).Should(BeNil())