chore: update go and golanci lint (#810)

This PR updates go to 1.23.1 and updates golanci-lint to v1.61.1, while fixing new lint errors. --------- Signed-off-by: Ramon Petgrave <[email protected]> Signed-off-by: Ramon Petgrave <[email protected]>
slsa-framework · Oct 10, 2024 · 4cd7d48 · 4cd7d48
1 parent 9093b4f
commit 4cd7d48
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 170 deletions.
diff --git a/.github/workflows/pre-submit.lint.yml b/.github/workflows/pre-submit.lint.yml
@@ -16,13 +16,13 @@ jobs:
           go-version-file: "go.mod"
           # not needed but gets rid of warnings
           cache: false
-      - uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
+      - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
         name: golangci-lint
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.59.1
+          version: v1.61.0
 
   yamllint:
     runs-on: ubuntu-latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -3,7 +3,6 @@ run:
   concurrency: 2
   deadline: 5m
   # For generics.
-  go: 1.18
 issues:
   include:
     - EXC0012
@@ -32,7 +31,7 @@ linters:
     # - errcheck
     - errorlint
     - exhaustive
-    - exportloopref
+    - copyloopvar
     # TODO(https://github.com/slsa-framework/slsa-verifier/issues/363): Restore linter
     # - gci
     - gochecknoinits

diff --git a/cli/slsa-verifier/main_regression_test.go b/cli/slsa-verifier/main_regression_test.go
@@ -524,7 +524,6 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			// Avoid rate limiting by not running the tests in parallel.
 			// t.Parallel()
@@ -805,7 +804,6 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -866,7 +864,7 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
 
 					outBuilderID, err := cmd.Exec(context.Background(), []string{image})
 					if !errCmp(err, tt.err) {
-						t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+						t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 					}
 
 					if err != nil {
@@ -1267,7 +1265,6 @@ func Test_runVerifyGCBArtifactImage(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1335,7 +1332,7 @@ func Test_runVerifyGCBArtifactImage(t *testing.T) {
 					outBuilderID, err := cmd.Exec(context.Background(), []string{image})
 
 					if !errCmp(err, tt.err) {
-						t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+						t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 					}
 
 					if err != nil {
@@ -1432,7 +1429,6 @@ func Test_runVerifyGHAContainerBased(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1958,7 +1954,6 @@ func Test_runVerifyNpmPackage(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -2023,7 +2018,6 @@ func Test_runVerifyVSA(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/slsa-framework/slsa-verifier/v2
 
-go 1.22.0
+go 1.23.1
 
 require (
 	github.com/docker/go v1.5.1-1

diff --git a/verifiers/internal/gcb/provenance_test.go b/verifiers/internal/gcb/provenance_test.go
@@ -189,7 +189,6 @@ func Test_VerifyBuilder(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -216,7 +215,7 @@ func Test_VerifyBuilder(t *testing.T) {
 			}
 			outBuilderID, err := prov.VerifyBuilder(&builderOpts)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 
 			if err != nil {
@@ -228,7 +227,7 @@ func Test_VerifyBuilder(t *testing.T) {
 			}
 
 			if err := outBuilderID.MatchesLoose(tt.builderID, false); err != nil {
-				t.Errorf(fmt.Sprintf("matches failed: %v", err))
+				t.Errorf("matches failed: %v", err)
 			}
 		})
 	}
@@ -304,7 +303,6 @@ func Test_validateBuildType(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -315,7 +313,7 @@ func Test_validateBuildType(t *testing.T) {
 			}
 			err = validateBuildType(*builderID, tt.buildType)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -554,7 +552,6 @@ func Test_VerifySourceURI(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -582,7 +579,7 @@ func Test_VerifySourceURI(t *testing.T) {
 			}
 			err = prov.VerifySourceURI(tt.source, *builderID)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -692,7 +689,6 @@ func Test_VerifySignature(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -708,7 +704,7 @@ func Test_VerifySignature(t *testing.T) {
 
 			err = prov.VerifySignature()
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -739,7 +735,6 @@ func Test_ProvenanceFromBytes(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -750,7 +745,7 @@ func Test_ProvenanceFromBytes(t *testing.T) {
 
 			_, err = ProvenanceFromBytes(content)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -793,7 +788,6 @@ func Test_VerifySubjectDigest(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -816,7 +810,7 @@ func Test_VerifySubjectDigest(t *testing.T) {
 
 			err = prov.VerifySubjectDigest(tt.hash)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -870,7 +864,6 @@ func Test_VerifySummary(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -896,7 +889,7 @@ func Test_VerifySummary(t *testing.T) {
 			}
 			err = prov.VerifySummary(&provenanceOpts)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -952,7 +945,6 @@ func Test_VerifyMetadata(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -978,7 +970,7 @@ func Test_VerifyMetadata(t *testing.T) {
 			}
 			err = prov.VerifyMetadata(&provenanceOpts)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -1023,7 +1015,6 @@ func Test_VerifyTextProvenance(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1047,7 +1038,7 @@ func Test_VerifyTextProvenance(t *testing.T) {
 			if !tt.alter {
 				err = prov.VerifyTextProvenance()
 				if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-					t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+					t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 				}
 				return
 			}
@@ -1119,7 +1110,7 @@ func Test_VerifyTextProvenance(t *testing.T) {
 
 				err = prov.VerifyTextProvenance()
 				if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-					t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+					t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 				}
 				// Start with the original string value.
 				patch = []byte(strings.Clone(string(cpy)))
@@ -1171,7 +1162,6 @@ func Test_VerifyBranch(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1194,7 +1184,7 @@ func Test_VerifyBranch(t *testing.T) {
 
 			err = prov.VerifyBranch(tt.branch)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -1285,7 +1275,6 @@ func Test_VerifyTag(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1308,7 +1297,7 @@ func Test_VerifyTag(t *testing.T) {
 
 			err = prov.VerifyTag(tt.tag)
 			if !cmp.Equal(err, tt.err, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -1485,7 +1474,6 @@ func Test_VerifyVersionedTag(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1508,7 +1496,7 @@ func Test_VerifyVersionedTag(t *testing.T) {
 
 			err = prov.VerifyVersionedTag(tt.tag)
 			if !cmp.Equal(err, tt.err, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 			}
 		})
 	}

diff --git a/verifiers/internal/gcb/slsaprovenance/v0.1/provenance_test.go b/verifiers/internal/gcb/slsaprovenance/v0.1/provenance_test.go
@@ -40,7 +40,6 @@ func Test_New(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -51,7 +50,7 @@ func Test_New(t *testing.T) {
 			fmt.Println(string(content))
 			_, err = New(content)
 			if !cmp.Equal(err, tt.expected, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.expected, cmpopts.EquateErrors()))
 			}
 		})
 	}
@@ -92,7 +91,6 @@ func Test_getSubstitutionsField(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -109,10 +107,10 @@ func Test_getSubstitutionsField(t *testing.T) {
 
 			value, err := getSubstitutionsField(internalParemeters, tt.field)
 			if !cmp.Equal(err, tt.err, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 			}
 			if err == nil && !cmp.Equal(value, tt.value) {
-				t.Errorf(cmp.Diff(value, tt.value))
+				t.Error(cmp.Diff(value, tt.value))
 			}
 		})
 	}

diff --git a/verifiers/internal/gcb/slsaprovenance/v1.0/provenance_test.go b/verifiers/internal/gcb/slsaprovenance/v1.0/provenance_test.go
@@ -41,7 +41,6 @@ func Test_getSubstitutionsField(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt // Re-initializing variable so it is not changed while executing the closure below
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -58,10 +57,10 @@ func Test_getSubstitutionsField(t *testing.T) {
 
 			value, err := getSubstitutionsField(internalParemeters, tt.field)
 			if !cmp.Equal(err, tt.err, cmpopts.EquateErrors()) {
-				t.Errorf(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
+				t.Error(cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
 			}
 			if err == nil && !cmp.Equal(value, tt.value) {
-				t.Errorf(cmp.Diff(value, tt.value))
+				t.Error(cmp.Diff(value, tt.value))
 			}
 		})
 	}