Update golangci-lint from v1.29.0 to v1.42.1 (letsencrypt#5745)

aarongable · web-flow · commit eb5d0e9ba994 · 2021-10-22T16:26:59.000-07:00
Update the version of golangci-lint we use in our docker image, and update the version of the docker image we use in our tests. Fix a couple places where we were violating lints (ineffective assign and calling `t.Fatal` from outside the main test goroutine), and add one lint (using math/rand) to the ignore list. Fixes letsencrypt#5710
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,9 +25,10 @@ issues:
       # G401: Use of weak cryptographic primitive
       # G402: TLS InsecureSkipVerify set true.
       # G403: RSA keys should be at least 2048 bits
+      # G404: Use of weak random number generator (math/rand instead of crypto/rand)
       # G501: Blacklisted import `crypto/md5`: weak cryptographic primitive
       # G505: Blacklisted import `crypto/sha1`: weak cryptographic primitive
-      text: "G(101|102|107|201|202|306|401|402|403|501|505)"
+      text: "G(101|102|107|201|202|306|401|402|403|404|501|505)"
     - linters:
       - staticcheck
       text: "(SA1019|ST1005|ST1013|SA6003|SA5011|S1029|SA2002):"
diff --git a/cmd/bad-key-revoker/main_test.go b/cmd/bad-key-revoker/main_test.go
@@ -61,12 +61,12 @@ func TestSelectUncheckedRows(t *testing.T) {
 
 	hashA, hashB, hashC := randHash(t), randHash(t), randHash(t)
 	insertBlockedRow(t, dbMap, fc, hashA, 1, true)
-	row, err := bkr.selectUncheckedKey()
+	_, err = bkr.selectUncheckedKey()
 	test.AssertError(t, err, "selectUncheckedKey didn't fail with no rows to process")
 	test.Assert(t, db.IsNoRows(err), "returned error is not sql.ErrNoRows")
 	insertBlockedRow(t, dbMap, fc, hashB, 1, false)
 	insertBlockedRow(t, dbMap, fc, hashC, 1, false)
-	row, err = bkr.selectUncheckedKey()
+	row, err := bkr.selectUncheckedKey()
 	test.AssertNotError(t, err, "selectUncheckKey failed")
 	test.AssertByteEquals(t, row.KeyHash, hashB)
 	test.AssertEquals(t, row.RevokedBy, int64(1))
diff --git a/cmd/clock_generic.go b/cmd/clock_generic.go
@@ -1,4 +1,4 @@
-// +build !integration
+//go:build !integration
 
 package cmd
 
diff --git a/cmd/clock_integration.go b/cmd/clock_integration.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package cmd
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   boulder:
-    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-08-26}
+    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-10-22}
     environment:
       FAKE_DNS: 10.77.77.77
       BOULDER_CONFIG_DIR: test/config
diff --git a/grpc/interceptors_test.go b/grpc/interceptors_test.go
@@ -156,9 +156,9 @@ func TestTimeouts(t *testing.T) {
 	test_proto.RegisterChillerServer(s, &testServer{})
 	go func() {
 		start := time.Now()
-		if err := s.Serve(lis); err != nil &&
-			!strings.HasSuffix(err.Error(), "use of closed network connection") {
-			t.Fatalf("s.Serve: %v after %s", err, time.Since(start))
+		err := s.Serve(lis)
+		if err != nil && !strings.HasSuffix(err.Error(), "use of closed network connection") {
+			t.Logf("s.Serve: %v after %s", err, time.Since(start))
 		}
 	}()
 	defer s.Stop()
@@ -218,9 +218,9 @@ func TestRequestTimeTagging(t *testing.T) {
 	// Chill until ill
 	go func() {
 		start := time.Now()
-		if err := s.Serve(lis); err != nil &&
-			!strings.HasSuffix(err.Error(), "use of closed network connection") {
-			t.Fatalf("s.Serve: %v after %s", err, time.Since(start))
+		err := s.Serve(lis)
+		if err != nil && !strings.HasSuffix(err.Error(), "use of closed network connection") {
+			t.Logf("s.Serve: %v after %s", err, time.Since(start))
 		}
 	}()
 	defer s.Stop()
@@ -303,9 +303,9 @@ func TestInFlightRPCStat(t *testing.T) {
 	// Chill until ill
 	go func() {
 		start := time.Now()
-		if err := s.Serve(lis); err != nil &&
-			!strings.HasSuffix(err.Error(), "use of closed network connection") {
-			t.Fatalf("s.Serve: %v after %s", err, time.Since(start))
+		err := s.Serve(lis)
+		if err != nil && !strings.HasSuffix(err.Error(), "use of closed network connection") {
+			t.Logf("s.Serve: %v after %s", err, time.Since(start))
 		}
 	}()
 	defer s.Stop()
diff --git a/test/boulder-tools/build.sh b/test/boulder-tools/build.sh
@@ -31,7 +31,7 @@ unzip /tmp/protoc.zip -d /usr/local/protoc
 export GOBIN=/usr/local/bin GOCACHE=/tmp/gocache
 
 # Install golangci-lint
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOBIN v1.29.0
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOBIN v1.42.1
 
 # Install protobuf and testing/dev tools.
 # Note: The version of golang/protobuf is partially tied to the version of grpc
diff --git a/test/integration/akamai_purger_drain_queue_test.go b/test/integration/akamai_purger_drain_queue_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/authz_test.go b/test/integration/authz_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/caa_test.go b/test/integration/caa_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/common_mock.go b/test/integration/common_mock.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/common_test.go b/test/integration/common_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/errors_test.go b/test/integration/errors_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/ocsp_test.go b/test/integration/ocsp_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/orphan_finder_test.go b/test/integration/orphan_finder_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/ratelimit_test.go b/test/integration/ratelimit_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/test/integration/revocation_test.go b/test/integration/revocation_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package integration
 
diff --git a/test/integration/wfe_test.go b/test/integration/wfe_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package integration
 
diff --git a/wfe2/wfe_test.go b/wfe2/wfe_test.go
@@ -3338,10 +3338,9 @@ func TestPrepAuthzForDisplay(t *testing.T) {
 	}
 
 	// We expect the authz challenge has its URL set and the URI emptied.
-	chal := authz.Challenges[0]
 	authz.ID = "12345"
 	wfe.prepAuthorizationForDisplay(&http.Request{Host: "localhost"}, authz)
-	chal = authz.Challenges[0]
+	chal := authz.Challenges[0]
 	test.AssertEquals(t, chal.URL, "http://localhost/acme/chall-v3/12345/po1V2w")
 	test.AssertEquals(t, chal.URI, "")
 	test.AssertEquals(t, chal.ProvidedKeyAuthorization, "")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !integration`
	`1`	`+//go:build !integration`
`2`	`2`
`3`	`3`	`package cmd`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build integration`
	`1`	`+//go:build integration`
`2`	`2`
`3`	`3`	`package cmd`
`4`	`4`