🌱 enable nolintlint linter and fix violations (#3650)

* enable nolintlint Signed-off-by: Spencer Schrock <[email protected]> * first chunk of fixing nolintlint Signed-off-by: Spencer Schrock <[email protected]> * second chunk of fixing nolintlint Signed-off-by: Spencer Schrock <[email protected]> * third chunk of fixing nolintlint Signed-off-by: Spencer Schrock <[email protected]> * fourth chunk of fixing nolintlint Signed-off-by: Spencer Schrock <[email protected]> * include reason for the specific linter config Signed-off-by: Spencer Schrock <[email protected]> * fifth chunk of fixing nolintlint Signed-off-by: Spencer Schrock <[email protected]> * fix linter errors that are somehow still triggering Signed-off-by: Spencer Schrock <[email protected]> --------- Signed-off-by: Spencer Schrock <[email protected]>
ossf · Nov 15, 2023 · 92470de · 92470de
1 parent 288319a
commit 92470de
Show file tree

Hide file tree

Showing 158 changed files with 322 additions and 374 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -58,6 +58,7 @@ linters:
     - misspell
     - nakedret
     - nestif
+    - nolintlint
     - predeclared
     - staticcheck
     - stylecheck
@@ -152,6 +153,10 @@ linters-settings:
       - ptrToRefParam
       - typeUnparen
       - unnecessaryBlock
+  nolintlint:
+    # `//nolint` should mention specific linter such as `//nolint:my-linter`
+    # Overly broad directives can hide unrelated issues
+    require-specific: true
   wrapcheck:
     ignorePackageGlobs:
       - github.com/ossf/scorecard/v4/checks/fileparser
diff --git a/attestor/policy/attestation_policy_test.go b/attestor/policy/attestation_policy_test.go
@@ -170,7 +170,7 @@ func TestCheckPreventBinaryArtifacts(t *testing.T) {
 func TestCheckCodeReviewed(t *testing.T) {
 	t.Parallel()
 
-	// nolint
+	//nolint:govet
 	tests := []struct {
 		err      error
 		raw      *checker.RawResults
@@ -385,7 +385,7 @@ func asPointer(s string) *string {
 func TestNoUnpinnedDependencies(t *testing.T) {
 	t.Parallel()
 
-	// nolint
+	//nolint:govet
 	tests := []struct {
 		err      error
 		raw      *checker.RawResults

diff --git a/checker/check_result_test.go b/checker/check_result_test.go
@@ -50,7 +50,7 @@ func TestAggregateScores(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := AggregateScores(tt.args.scores...); got != tt.want { //nolint:govet
+			if got := AggregateScores(tt.args.scores...); got != tt.want {
 				t.Errorf("AggregateScores() = %v, want %v", got, tt.want)
 			}
 		})
@@ -86,7 +86,7 @@ func TestAggregateScoresWithWeight(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := AggregateScoresWithWeight(tt.args.scores); got != tt.want { //nolint:govet
+			if got := AggregateScoresWithWeight(tt.args.scores); got != tt.want {
 				t.Errorf("AggregateScoresWithWeight() = %v, want %v", got, tt.want)
 			}
 		})
@@ -132,8 +132,8 @@ func TestCreateProportionalScore(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CreateProportionalScore(tt.args.success, tt.args.total); got != tt.want { //nolint:govet
-				t.Errorf("CreateProportionalScore() = %v, want %v", got, tt.want) //nolint:govet
+			if got := CreateProportionalScore(tt.args.success, tt.args.total); got != tt.want {
+				t.Errorf("CreateProportionalScore() = %v, want %v", got, tt.want)
 			}
 		})
 	}
@@ -438,8 +438,8 @@ func TestNormalizeReason(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := NormalizeReason(tt.args.reason, tt.args.score); got != tt.want { //nolint:govet
-				t.Errorf("NormalizeReason() = %v, want %v", got, tt.want) //nolint:govet
+			if got := NormalizeReason(tt.args.reason, tt.args.score); got != tt.want {
+				t.Errorf("NormalizeReason() = %v, want %v", got, tt.want)
 			}
 		})
 	}
@@ -490,8 +490,8 @@ func TestCreateResultWithScore(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CreateResultWithScore(tt.args.name, tt.args.reason, tt.args.score); !cmp.Equal(got, tt.want) { //nolint:lll,govet
-				t.Errorf("CreateResultWithScore() = %v, want %v", got, cmp.Diff(got, tt.want)) //nolint:govet
+			if got := CreateResultWithScore(tt.args.name, tt.args.reason, tt.args.score); !cmp.Equal(got, tt.want) {
+				t.Errorf("CreateResultWithScore() = %v, want %v", got, cmp.Diff(got, tt.want))
 			}
 		})
 	}
@@ -545,8 +545,8 @@ func TestCreateProportionalScoreResult(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CreateProportionalScoreResult(tt.args.name, tt.args.reason, tt.args.b, tt.args.t); !cmp.Equal(got, tt.want) { //nolint:govet,lll
-				t.Errorf("CreateProportionalScoreResult() = %v, want %v", got, cmp.Diff(got, tt.want)) //nolint:govet
+			if got := CreateProportionalScoreResult(tt.args.name, tt.args.reason, tt.args.b, tt.args.t); !cmp.Equal(got, tt.want) { //nolint:lll
+				t.Errorf("CreateProportionalScoreResult() = %v, want %v", got, cmp.Diff(got, tt.want))
 			}
 		})
 	}
@@ -594,7 +594,7 @@ func TestCreateMaxScoreResult(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CreateMaxScoreResult(tt.args.name, tt.args.reason); !cmp.Equal(got, tt.want) { //nolint:govet
+			if got := CreateMaxScoreResult(tt.args.name, tt.args.reason); !cmp.Equal(got, tt.want) {
 				t.Errorf("CreateMaxScoreResult() = %v, want %v", got, cmp.Diff(got, tt.want))
 			}
 		})
@@ -643,7 +643,7 @@ func TestCreateMinScoreResult(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CreateMinScoreResult(tt.args.name, tt.args.reason); !cmp.Equal(got, tt.want) { //nolint:govet
+			if got := CreateMinScoreResult(tt.args.name, tt.args.reason); !cmp.Equal(got, tt.want) {
 				t.Errorf("CreateMinScoreResult() = %v, want %v", got, cmp.Diff(got, tt.want))
 			}
 		})

diff --git a/checker/client_test.go b/checker/client_test.go
@@ -20,9 +20,8 @@ import (
 	"github.com/ossf/scorecard/v4/log"
 )
 
-// nolint:paralleltest
-// because we are using t.Setenv.
-func TestGetClients(t *testing.T) { //nolint:gocognit
+//nolint:paralleltest // because we are using t.Setenv.
+func TestGetClients(t *testing.T) {
 	type args struct { //nolint:govet
 		ctx      context.Context
 		repoURI  string

diff --git a/checker/raw_result.go b/checker/raw_result.go
@@ -25,7 +25,8 @@ import (
 
 // RawResults contains results before a policy
 // is applied.
-// nolint
+//
+//nolint:govet
 type RawResults struct {
 	BinaryArtifactResults       BinaryArtifactData
 	BranchProtectionResults     BranchProtectionsData
@@ -77,7 +78,6 @@ type PackagingData struct {
 }
 
 // Package represents a package.
-// nolint
 type Package struct {
 	// TODO: not supported yet. This needs to be unique across
 	// ecosystems: purl, OSV, CPE, etc.

diff --git a/checks/all_checks_test.go b/checks/all_checks_test.go
@@ -23,12 +23,12 @@ import (
 
 func Test_registerCheck(t *testing.T) {
 	t.Parallel()
-	//nolint
+	//nolint:govet
 	type args struct {
 		name string
 		fn   checker.CheckFn
 	}
-	//nolint
+	//nolint:govet
 	tests := []struct {
 		name    string
 		args    args

diff --git a/checks/branch_protection_test.go b/checks/branch_protection_test.go
@@ -57,15 +57,14 @@ func TestReleaseAndDevBranchProtected(t *testing.T) {
 
 	rel1 := "release/v.1"
 	sha := "8fb3cb86082b17144a80402f5367ae65f06083bd"
-	//nolint:goconst
 	main := "main"
 	trueVal := true
 	falseVal := false
 	var zeroVal int32
 
 	var oneVal int32 = 1
 
-	//nolint
+	//nolint:govet
 	tests := []struct {
 		name          string
 		expected      scut.TestReturn

diff --git a/checks/code_review_test.go b/checks/code_review_test.go
@@ -30,8 +30,7 @@ import (
 // TestCodeReview tests the code review checker.
 func TestCodereview(t *testing.T) {
 	t.Parallel()
-	//fieldalignment lint issue. Ignoring it as it is not important for this test.
-	//nolint
+	//nolint:goerr113
 	tests := []struct {
 		err       error
 		name      string

diff --git a/checks/contributors_test.go b/checks/contributors_test.go
@@ -29,8 +29,6 @@ import (
 // TestContributors tests the contributors check.
 func TestContributors(t *testing.T) {
 	t.Parallel()
-	//fieldalignment lint issue. Ignoring it as it is not important for this test.
-	//nolint
 	tests := []struct {
 		err      error
 		name     string
@@ -61,7 +59,6 @@ func TestContributors(t *testing.T) {
 			name: "Valid contributors with enough contributors and companies",
 			contrib: []clients.User{
 				{
-
 					Companies:        []string{"company1"},
 					NumContributions: 10,
 					Organizations: []clients.User{
@@ -146,7 +143,7 @@ func TestContributors(t *testing.T) {
 			},
 		},
 		{
-			err:     errors.New("error"),
+			err:     errors.New("error"), //nolint:goerr113
 			name:    "Error getting contributors",
 			contrib: []clients.User{},
 			expected: checker.CheckResult{

diff --git a/checks/dependency_update_tool.go b/checks/dependency_update_tool.go
@@ -26,7 +26,7 @@ import (
 // CheckDependencyUpdateTool is the exported name for Automatic-Depdendency-Update.
 const CheckDependencyUpdateTool = "Dependency-Update-Tool"
 
-// nolint
+//nolint:gochecknoinits
 func init() {
 	supportedRequestTypes := []checker.RequestType{
 		checker.FileBased,

diff --git a/checks/dependency_update_tool_test.go b/checks/dependency_update_tool_test.go
@@ -32,7 +32,7 @@ const (
 // TestDependencyUpdateTool tests the DependencyUpdateTool checker.
 func TestDependencyUpdateTool(t *testing.T) {
 	t.Parallel()
-	//nolint
+	//nolint:govet
 	tests := []struct {
 		name              string
 		wantErr           bool

diff --git a/checks/evaluation/binary_artifacts_test.go b/checks/evaluation/binary_artifacts_test.go
@@ -24,7 +24,7 @@ import (
 // TestBinaryArtifacts tests the binary artifacts check.
 func TestBinaryArtifacts(t *testing.T) {
 	t.Parallel()
-	//nolint
+	//nolint:govet
 	type args struct {
 		name string
 		dl   checker.DetailLogger

diff --git a/checks/evaluation/ci_tests_test.go b/checks/evaluation/ci_tests_test.go
@@ -130,8 +130,6 @@ func Test_isTest(t *testing.T) {
 func Test_prHasSuccessfulCheck(t *testing.T) {
 	t.Parallel()
 
-	//enabled nolint because this is a test
-	//nolint
 	tests := []struct {
 		name    string
 		args    checker.RevisionCIInfo
@@ -263,13 +261,13 @@ func Test_prHasSuccessStatus(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			got, err := prHasSuccessStatus(tt.args.r, tt.args.dl) //nolint:govet
-			if (err != nil) != tt.wantErr {                       //nolint:govet
-				t.Errorf("prHasSuccessStatus() error = %v, wantErr %v", err, tt.wantErr) //nolint:govet
+			got, err := prHasSuccessStatus(tt.args.r, tt.args.dl)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("prHasSuccessStatus() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if got != tt.want { //nolint:govet
-				t.Errorf("prHasSuccessStatus() got = %v, want %v", got, tt.want) //nolint:govet
+			if got != tt.want {
+				t.Errorf("prHasSuccessStatus() got = %v, want %v", got, tt.want)
 			}
 		})
 	}
@@ -360,7 +358,7 @@ func Test_prHasSuccessfulCheckAdditional(t *testing.T) {
 				t.Errorf("prHasSuccessfulCheck() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if got != tt.want { //nolint:govet
+			if got != tt.want {
 				t.Errorf("prHasSuccessfulCheck() got = %v, want %v", got, tt.want)
 			}
 		})
@@ -449,8 +447,8 @@ func TestCITests(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			if got := CITests(tt.args.in0, tt.args.c, tt.args.dl); got.Score != tt.want { //nolint:govet
-				t.Errorf("CITests() = %v, want %v", got.Score, tt.want) //nolint:govet
+			if got := CITests(tt.args.in0, tt.args.c, tt.args.dl); got.Score != tt.want {
+				t.Errorf("CITests() = %v, want %v", got.Score, tt.want)
 			}
 		})
 	}

diff --git a/checks/evaluation/dependency_update_tool_test.go b/checks/evaluation/dependency_update_tool_test.go
@@ -25,7 +25,6 @@ import (
 
 func TestDependencyUpdateTool(t *testing.T) {
 	t.Parallel()
-	//nolint
 	tests := []struct {
 		name     string
 		findings []finding.Finding

diff --git a/checks/evaluation/pinned_dependencies_test.go b/checks/evaluation/pinned_dependencies_test.go
@@ -27,7 +27,7 @@ import (
 
 func Test_createScoreForGitHubActionsWorkflow(t *testing.T) {
 	t.Parallel()
-	//nolint
+	//nolint:govet
 	tests := []struct {
 		name   string
 		r      worklowPinningResult
@@ -884,7 +884,7 @@ func Test_addWorkflowPinnedResult(t *testing.T) {
 		w          *worklowPinningResult
 		isGitHub   bool
 	}
-	tests := []struct { //nolint:govet
+	tests := []struct {
 		name string
 		want *worklowPinningResult
 		args args

diff --git a/checks/evaluation/security_policy_test.go b/checks/evaluation/security_policy_test.go
@@ -25,7 +25,6 @@ import (
 
 func TestSecurityPolicy(t *testing.T) {
 	t.Parallel()
-	//nolint
 	tests := []struct {
 		name     string
 		findings []finding.Finding

diff --git a/checks/evaluation/signed_releases.go b/checks/evaluation/signed_releases.go
@@ -32,7 +32,8 @@ var (
 const releaseLookBack = 5
 
 // SignedReleases applies the score policy for the Signed-Releases check.
-// nolint
+//
+//nolint:gocognit
 func SignedReleases(name string, dl checker.DetailLogger, r *checker.SignedReleasesData) checker.CheckResult {
 	if r == nil {
 		e := sce.WithMessage(sce.ErrScorecardInternal, "empty raw data")

diff --git a/checks/evaluation/vulnerabilities_test.go b/checks/evaluation/vulnerabilities_test.go
@@ -25,18 +25,18 @@ import (
 // TestVulnerabilities tests the vulnerabilities checker.
 func TestVulnerabilities(t *testing.T) {
 	t.Parallel()
-	//nolint
+	//nolint:govet
 	tests := []struct {
 		name     string
-		findings     []finding.Finding
-		result     scut.TestReturn
+		findings []finding.Finding
+		result   scut.TestReturn
 		expected []struct {
 			lineNumber uint
 		}
 	}{
 		{
 			name: "no vulnerabilities",
-			findings: []finding.Finding {
+			findings: []finding.Finding{
 				{
 					Probe:   "hasOSVVulnerabilities",
 					Outcome: finding.OutcomePositive,
@@ -48,7 +48,7 @@ func TestVulnerabilities(t *testing.T) {
 		},
 		{
 			name: "three vulnerabilities",
-			findings: []finding.Finding {
+			findings: []finding.Finding{
 				{
 					Probe:   "hasOSVVulnerabilities",
 					Outcome: finding.OutcomeNegative,
@@ -63,13 +63,13 @@ func TestVulnerabilities(t *testing.T) {
 				},
 			},
 			result: scut.TestReturn{
-				Score: 7,
+				Score:        7,
 				NumberOfWarn: 3,
 			},
 		},
 		{
 			name: "twelve vulnerabilities to check that score is not less than 0",
-			findings: []finding.Finding {
+			findings: []finding.Finding{
 				{
 					Probe:   "hasOSVVulnerabilities",
 					Outcome: finding.OutcomeNegative,
@@ -120,13 +120,13 @@ func TestVulnerabilities(t *testing.T) {
 				},
 			},
 			result: scut.TestReturn{
-				Score: 0,
+				Score:        0,
 				NumberOfWarn: 12,
 			},
 		},
 		{
-			name: "invalid findings",
-			findings: []finding.Finding {},
+			name:     "invalid findings",
+			findings: []finding.Finding{},
 			result: scut.TestReturn{
 				Score: -1,
 				Error: sce.ErrScorecardInternal,