Backport of bootstrap: upgrade golangci-lint in prep for go1.20 into …

…release/1.3.x (#16027)

* bootstrap: upgrade golangci-lint in prep for go1.20

This PR updates golangci-lint to work better with go1.20 - the previous
version would cause in oom on 'make check'.

(manual cherry-pick of ff4d9e8)

* test: add missing imports

* test: fixup imports

---------

Co-authored-by: Seth Hoenig <shoenig@duck.com>

GNUmakefile

@@ -136,7 +136,7 @@ deps:  ## Install build and development dependencies
 lint-deps: ## Install linter dependencies
 ## Keep versions in sync with tools/go.mod (see https://github.com/golang/go/issues/30515)
 	@echo "==> Updating linter dependencies..."
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.0
 	go install github.com/client9/misspell/cmd/misspell@v0.3.4
 	go install github.com/hashicorp/go-hclog/hclogvet@v0.1.5
 

command/agent/acl_endpoint_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/nomad/ci"
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"
+	"github.com/shoenig/test/must"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

e2e/e2eutil/job.go

@@ -29,9 +29,7 @@ func Register(jobID, jobFilePath string) error {
 func RegisterWithArgs(jobID, jobFilePath string, args ...string) error {
 
 	baseArgs := []string{"job", "run", "-detach"}
-	for i := range args {
-		baseArgs = append(baseArgs, args[i])
-	}
+	baseArgs = append(baseArgs, args...)
 	baseArgs = append(baseArgs, "-")
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
@@ -224,9 +222,7 @@ func StopJob(jobID string, args ...string) error {
 	// Build our argument list in the correct order, ensuring the jobID is last
 	// and the Nomad subcommand are first.
 	baseArgs := []string{"job", "stop"}
-	for i := range args {
-		baseArgs = append(baseArgs, args[i])
-	}
+	baseArgs = append(baseArgs, args...)
 	baseArgs = append(baseArgs, jobID)
 
 	// Execute the command. We do not care about the stdout, only stderr.

nomad/acl_endpoint_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -13,6 +14,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/testutil"
+	"github.com/shoenig/test/must"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

nomad/state/state_store_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/kr/pretty"
+	"github.com/shoenig/test/must"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )