build: Bump golangci-lint and enable more linters (#678)

.golangci.yml

@@ -7,36 +7,54 @@ run:
 linters:
   disable-all: true
   enable:
+    - asciicheck
+    - bidichk
+    - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
+    - decorder
     - depguard
+    - dogsled
+    - durationcheck
     - errcheck
     - errchkjson
     - errname
-    - gocheckcompilerdirectives
-    - gochecknoinits
+    - errorlint
+    - exhaustive
     - gci
     - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecksumtype
     - goconst
     - gocritic
     - gocyclo
     - godot
     - gofumpt
+    - gomoddirectives
     - gosec
     - gosimple
     - govet
     - ineffassign
+    - interfacebloat
+    - intrange
     - lll
     - loggercheck
     - mirror
     - misspell
+    - musttag
+    - nestif
+    - nilerr
     - nolintlint
+    - nosprintfhostport
     - prealloc
     - reassign
     - staticcheck
     - stylecheck
     - tenv
     - testableexamples
+    - testifylint
     - thelper
     - tparallel
     - typecheck

archive/archive_test.go

@@ -7,6 +7,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"compress/gzip"
+	"errors"
 	"io"
 	"os"
 	"path/filepath"
@@ -40,7 +41,7 @@ func TestArchiveDirectorySuccess(t *testing.T) {
 	tr := tar.NewReader(gzr)
 	for {
 		hdr, err := tr.Next()
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break // End of archive
 		}
 		require.NoError(t, err, "error reading listing from tarball")
@@ -51,7 +52,7 @@ func TestArchiveDirectorySuccess(t *testing.T) {
 		_, err = io.CopyN(&buf, tr, 1024)
 		require.Condition(
 			t,
-			func() (success bool) { return err == nil || err == io.EOF },
+			func() (success bool) { return err == nil || errors.Is(err, io.EOF) },
 			"error reading content from tarball",
 		)
 		archivedContents[hdr.Name] = buf.String()
@@ -81,7 +82,7 @@ func TestArchiveDirectoryToTarSuccess(t *testing.T) {
 	tr := tar.NewReader(f)
 	for {
 		hdr, err := tr.Next()
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break // End of archive
 		}
 		require.NoError(t, err, "error reading listing from tarball")
@@ -92,7 +93,7 @@ func TestArchiveDirectoryToTarSuccess(t *testing.T) {
 		_, err = io.CopyN(&buf, tr, 1024)
 		require.Condition(
 			t,
-			func() (success bool) { return err == nil || err == io.EOF },
+			func() (success bool) { return err == nil || errors.Is(err, io.EOF) },
 			"error reading content from tarball",
 		)
 		archivedContents[hdr.Name] = buf.String()

cmd/mindthegap/create/helmbundle/helm_bundle.go

@@ -170,7 +170,7 @@ func NewCommand(out output.Output) *cobra.Command {
 						)
 						if err != nil {
 							out.EndOperationWithStatus(output.Failure())
-							return fmt.Errorf("failed to create Helm chart bundle: %v", err)
+							return fmt.Errorf("failed to create Helm chart bundle: %w", err)
 						}
 
 						if err := helmClient.PushHelmChartToOCIRegistry(
@@ -199,7 +199,7 @@ func NewCommand(out output.Output) *cobra.Command {
 				)
 				if err != nil {
 					out.EndOperationWithStatus(output.Failure())
-					return fmt.Errorf("failed to create Helm chart bundle: %v", err)
+					return fmt.Errorf("failed to create Helm chart bundle: %w", err)
 				}
 
 				chrt, err := helm.LoadChart(downloaded)

cmd/mindthegap/flags/custom_flags_test.go

@@ -64,8 +64,7 @@ func Test_parsePossibleURI(t *testing.T) {
 			expectedPath:    "/dkp",
 		},
 	}
-	for ti := range tests {
-		tt := tests[ti]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			scheme, address, host, path, _ := parsePossibleURI(tt.in)

cmd/mindthegap/push/bundle/bundle.go

@@ -305,7 +305,7 @@ func pushImages(
 ) error {
 	puller, err := remote.NewPuller(destRemoteOpts...)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	// Sort registries for deterministic ordering.

cmd/mindthegap/serve/bundle/bundle.go

@@ -4,6 +4,7 @@
 package bundle
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -102,7 +103,8 @@ func NewCommand(
 			out.Infof("Listening on %s\n", reg.Address())
 
 			go func() {
-				if err := reg.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+				if err := reg.ListenAndServe(); err != nil &&
+					!errors.Is(err, http.ErrServerClosed) {
 					out.Error(err, "error serving Docker registry")
 					os.Exit(2)
 				}

cmd/mindthegap/utils/glob_test.go

@@ -51,8 +51,7 @@ func TestFilesWithGlobs(t *testing.T) {
 			expectedOutput: combinedCreatedFiles,
 		},
 	}
-	for ti := range tests {
-		tt := tests[ti]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			out, err := FilesWithGlobs(tt.in)

config/helm_charts_config_test.go

@@ -116,8 +116,7 @@ func TestParseHelmChartsFile(t *testing.T) {
 			},
 		},
 	}}
-	for ti := range tests {
-		tt := tests[ti]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			ext := "yaml"
@@ -324,8 +323,7 @@ func TestMergeHelmConfig(t *testing.T) {
 		},
 	}
 
-	for ti := range tests {
-		tt := tests[ti]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got := tt.src.Merge(tt.with)

docker/ecr/registry_test.go

@@ -46,7 +46,6 @@ func TestIsECRRegistry(t *testing.T) {
 		want:            true,
 	}}
 	for _, tt := range tests {
-		tt := tt // Capture range variable.
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			if got := IsECRRegistry(tt.registryAddress); got != tt.want {
@@ -102,7 +101,6 @@ func TestParseECRRegistry(t *testing.T) {
 		wantRegion:      "",
 	}}
 	for _, tt := range tests {
-		tt := tt // Capture range variable.
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			gotID, gotFips, gotRegion, gotErr := ParseECRRegistry(tt.registryAddress)

go.mod

@@ -3,7 +3,7 @@
 
 module github.com/mesosphere/mindthegap
 
-go 1.21
+go 1.22
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.26.1

hack/flakes/flake.nix

@@ -10,7 +10,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       with nixpkgs.legacyPackages.${system}; rec {
         packages = rec {
-          golangci-lint = pkgs.golangci-lint.override { buildGoModule = buildGo121Module; };
+          golangci-lint = pkgs.golangci-lint.override { buildGoModule = buildGo122Module; };
 
           go-mod-upgrade = buildGo121Module rec {
             name = "go-mod-upgrade";

images/authnhelpers/static_keychain.go

@@ -14,8 +14,6 @@ type staticHelper struct {
 	authConfig *types.DockerAuthConfig
 }
 
-var _ authn.Helper = staticHelper{}
-
 func (h staticHelper) Get(serverURL string) (username, password string, err error) {
 	if h.authConfig != nil && serverURL == h.registry {
 		password := h.authConfig.Password

images/httputils/configurable_tls_transport.go

@@ -32,7 +32,7 @@ func TLSConfiguredRoundTripper(
 	if tr.TLSClientConfig.RootCAs == nil {
 		systemPool, err := tlsconfig.SystemCertPool()
 		if err != nil {
-			return nil, fmt.Errorf("unable to get system cert pool: %v", err)
+			return nil, fmt.Errorf("unable to get system cert pool: %w", err)
 		}
 		tr.TLSClientConfig.RootCAs = systemPool
 	}

images/manifest_test.go

@@ -204,7 +204,6 @@ func TestManifestListForImage_RemoteIndex(t *testing.T) {
 		},
 	}}
 	for _, tt := range tests {
-		tt := tt // Capture range variable
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			svr := httptest.NewServer(
@@ -411,7 +410,6 @@ func TestManifestListForImage_RemoteImage(t *testing.T) {
 		},
 	}}
 	for _, tt := range tests {
-		tt := tt // Capture range variable
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()