updates

ossf · Mar 17, 2022 · c8097e7 · c8097e7
1 parent 5e85c14
commit c8097e7
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 21 deletions.
diff --git a/checks/binary_artifact.go b/checks/binary_artifact.go
@@ -26,7 +26,7 @@ const CheckBinaryArtifacts string = "Binary-Artifacts"
 
 //nolint
 func init() {
-	var supportedRequestTypes = []checker.RequestType{
+	supportedRequestTypes := []checker.RequestType{
 		checker.FileBased,
 		checker.CommitBased,
 	}
@@ -47,7 +47,6 @@ func BinaryArtifacts(c *checker.CheckRequest) checker.CheckResult {
 	// Return raw results.
 	if c.RawResults != nil {
 		c.RawResults.BinaryArtifactResults = rawData
-		return checker.CheckResult{}
 	}
 
 	// Return the score evaluation.

diff --git a/checks/branch_protection.go b/checks/branch_protection.go
@@ -43,7 +43,6 @@ func BranchProtection(c *checker.CheckRequest) checker.CheckResult {
 	// Return raw results.
 	if c.RawResults != nil {
 		c.RawResults.BranchProtectionResults = rawData
-		return checker.CheckResult{}
 	}
 
 	// Return the score evaluation.

diff --git a/checks/code_review.go b/checks/code_review.go
@@ -46,7 +46,6 @@ func CodeReview(c *checker.CheckRequest) checker.CheckResult {
 	// Return raw results.
 	if c.RawResults != nil {
 		c.RawResults.CodeReviewResults = rawData
-		return checker.CheckResult{}
 	}
 
 	// Return the score evaluation.

diff --git a/checks/dependency_update_tool.go b/checks/dependency_update_tool.go
@@ -26,7 +26,7 @@ const CheckDependencyUpdateTool = "Dependency-Update-Tool"
 
 //nolint
 func init() {
-	var supportedRequestTypes = []checker.RequestType{
+	supportedRequestTypes := []checker.RequestType{
 		checker.FileBased,
 	}
 	if err := registerCheck(CheckDependencyUpdateTool, DependencyUpdateTool, supportedRequestTypes); err != nil {
@@ -46,7 +46,6 @@ func DependencyUpdateTool(c *checker.CheckRequest) checker.CheckResult {
 	// Return raw results.
 	if c.RawResults != nil {
 		c.RawResults.DependencyUpdateToolResults = rawData
-		return checker.CheckResult{}
 	}
 
 	// Return the score evaluation.

diff --git a/checks/security_policy.go b/checks/security_policy.go
@@ -47,7 +47,6 @@ func SecurityPolicy(c *checker.CheckRequest) checker.CheckResult {
 	// Set the raw results.
 	if c.RawResults != nil {
 		c.RawResults.SecurityPolicyResults = rawData
-		return checker.CheckResult{}
 	}
 
 	return evaluation.SecurityPolicy(CheckSecurityPolicy, c.Dlogger, &rawData)

diff --git a/checks/vulnerabilities.go b/checks/vulnerabilities.go
@@ -46,7 +46,6 @@ func Vulnerabilities(c *checker.CheckRequest) checker.CheckResult {
 	// Set the raw results.
 	if c.RawResults != nil {
 		c.RawResults.VulnerabilitiesResults = rawData
-		return checker.CheckResult{}
 	}
 
 	return evaluation.Vulnerabilities(CheckVulnerabilities, c.Dlogger, &rawData)

diff --git a/cmd/root.go b/cmd/root.go
@@ -128,7 +128,6 @@ func rootCmd(o *options.Options) {
 		ctx,
 		repoURI,
 		o.Commit,
-		o.Format == options.FormatRaw,
 		enabledChecks,
 		repoClient,
 		ossFuzzRepoClient,

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -69,7 +69,7 @@ func serveCmd(o *options.Options) *cobra.Command {
 				defer ossFuzzRepoClient.Close()
 				ciiClient := clients.DefaultCIIBestPracticesClient()
 				repoResult, err := pkg.RunScorecards(
-					ctx, repo, clients.HeadSHA /*commitSHA*/, false /*raw*/, checks.AllChecks, repoClient,
+					ctx, repo, clients.HeadSHA /*commitSHA*/, checks.AllChecks, repoClient,
 					ossFuzzRepoClient, ciiClient, vulnsClient)
 				if err != nil {
 					logger.Error(err, "running enabled scorecard checks on repo")

diff --git a/cron/worker/main.go b/cron/worker/main.go
@@ -106,7 +106,7 @@ func processRequest(ctx context.Context,
 		for _, check := range blacklistedChecks {
 			delete(checksToRun, check)
 		}
-		result, err := pkg.RunScorecards(ctx, repo, commitSHA, false /*raw*/, checksToRun,
+		result, err := pkg.RunScorecards(ctx, repo, commitSHA, checksToRun,
 			repoClient, ossFuzzRepoClient, ciiClient, vulnsClient)
 		if errors.Is(err, sce.ErrRepoUnreachable) {
 			// Not accessible repo - continue.

diff --git a/pkg/scorecard.go b/pkg/scorecard.go
@@ -31,7 +31,8 @@ func runEnabledChecks(ctx context.Context,
 	repo clients.Repo, raw *checker.RawResults, checksToRun checker.CheckNameToFnMap,
 	repoClient clients.RepoClient, ossFuzzRepoClient clients.RepoClient, ciiClient clients.CIIBestPracticesClient,
 	vulnsClient clients.VulnerabilitiesClient,
-	resultsCh chan checker.CheckResult) {
+	resultsCh chan checker.CheckResult,
+) {
 	request := checker.CheckRequest{
 		Ctx:                   ctx,
 		RepoClient:            repoClient,
@@ -78,12 +79,12 @@ func getRepoCommitHash(r clients.RepoClient) (string, error) {
 func RunScorecards(ctx context.Context,
 	repo clients.Repo,
 	commitSHA string,
-	raw bool,
 	checksToRun checker.CheckNameToFnMap,
 	repoClient clients.RepoClient,
 	ossFuzzRepoClient clients.RepoClient,
 	ciiClient clients.CIIBestPracticesClient,
-	vulnsClient clients.VulnerabilitiesClient) (ScorecardResult, error) {
+	vulnsClient clients.VulnerabilitiesClient,
+) (ScorecardResult, error) {
 	if err := repoClient.InitRepo(repo, commitSHA); err != nil {
 		// No need to call sce.WithMessage() since InitRepo will do that for us.
 		//nolint:wrapcheck
@@ -108,13 +109,8 @@ func RunScorecards(ctx context.Context,
 		Date: time.Now(),
 	}
 	resultsCh := make(chan checker.CheckResult)
-	if raw {
-		go runEnabledChecks(ctx, repo, &ret.RawResults, checksToRun, repoClient, ossFuzzRepoClient,
-			ciiClient, vulnsClient, resultsCh)
-	} else {
-		go runEnabledChecks(ctx, repo, nil, checksToRun, repoClient, ossFuzzRepoClient,
-			ciiClient, vulnsClient, resultsCh)
-	}
+	go runEnabledChecks(ctx, repo, &ret.RawResults, checksToRun, repoClient, ossFuzzRepoClient,
+		ciiClient, vulnsClient, resultsCh)
 
 	for result := range resultsCh {
 		ret.Checks = append(ret.Checks, result)