chore: bump go version from 1.22 to 1.23 (#9571)

ChrisGe4 · web-flow · commit 1385a7d468f1 · 2024-11-15T17:31:39.000-05:00
* chore: bump go version from 1.22 to 1.23

* bump golangci version from 1.57.1 to 1.62.0
diff --git a/.github/workflows/integration-linux.yml b/.github/workflows/integration-linux.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     # Retrieve build locations with `go env`
diff --git a/.github/workflows/linters-checks.yml b/.github/workflows/linters-checks.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.*
+          go-version: 1.23.*
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/performance-comparison.yml b/.github/workflows/performance-comparison.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/unit-tests-darwin.yml b/.github/workflows/unit-tests-darwin.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     # Retrieve build locations with `go env`
diff --git a/.github/workflows/unit-tests-linux.yml b/.github/workflows/unit-tests-linux.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/unit-tests-windows.yml b/.github/workflows/unit-tests-windows.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     # Retrieve build locations with `go env`
diff --git a/.github/workflows/verify-examples.yml b/.github/workflows/verify-examples.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.*
+        go-version: 1.23.*
       id: go
 
     # Skip changes not affecting examples or integration/examples
diff --git a/cmd/skaffold/app/cmd/inspect_config_dependencies.go b/cmd/skaffold/app/cmd/inspect_config_dependencies.go
@@ -43,7 +43,7 @@ func cmdConfigDependenciesAdd() *cobra.Command {
 		WithArgs(func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
 				errMsg := "`config-dependencies add` requires exactly one file path argument"
-				olog.Entry(context.TODO()).Errorf(errMsg)
+				olog.Entry(context.TODO()).Error(errMsg)
 				return errors.New(errMsg)
 			}
 			return nil
diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps
@@ -163,5 +163,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
     jq \
     apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=golang:1.22.4 /usr/local/go /usr/local/go
+COPY --from=golang:1.23.3 /usr/local/go /usr/local/go
 ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
diff --git a/deploy/skaffold/Dockerfile.deps.slim b/deploy/skaffold/Dockerfile.deps.slim
@@ -104,5 +104,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
     jq \
     apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=golang:1.22.4 /usr/local/go /usr/local/go
+COPY --from=golang:1.23.3 /usr/local/go /usr/local/go
 ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
diff --git a/fs/assets/credits_generated/github.com/hashicorp/hcl/go.mod b/fs/assets/credits_generated/github.com/hashicorp/hcl/go.mod
@@ -1,5 +1,5 @@
 module github.com/hashicorp/hcl
 
-go 1.22
+go 1.23
 
 require github.com/davecgh/go-spew v1.1.1
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleContainerTools/skaffold/v2
 
-go 1.22
+go 1.23
 
 // these require code change may remove these later
 exclude (
diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh
@@ -18,7 +18,7 @@ set -e -o pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BIN=${DIR}/bin
-VERSION=1.57.1
+VERSION=1.62.0
 
 function install_linter() {
   echo "Installing GolangCI-Lint"
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.22
+go 1.23
 
 require (
 	github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752
diff --git a/hack/versions/pkg/diff/godiff_test.go b/hack/versions/pkg/diff/godiff_test.go
@@ -248,7 +248,7 @@ type TestStructure struct {
 
 			t.CheckErrorAndDeepEqual(test.shouldErr, err, test.same, diff == "")
 			if test.same != (diff == "") {
-				t.Errorf(diff)
+				t.Error(diff)
 			}
 		})
 	}
@@ -284,7 +284,7 @@ func TestCompareSchemas(t *testing.T) {
 			t.CheckNoError(err)
 			t.CheckDeepEqual(test.a == test.b, diff == "")
 			if diff != "" && test.a == test.b {
-				t.Errorf(diff)
+				t.Error(diff)
 			}
 		})
 	}
diff --git a/integration/build_test.go b/integration/build_test.go
@@ -308,7 +308,7 @@ func setupGitRepo(t *testing.T, dir string) {
 		cmd := exec.Command("git", args...)
 		cmd.Dir = dir
 		if buf, err := util.RunCmdOut(context.Background(), cmd); err != nil {
-			t.Logf(string(buf))
+			t.Log(string(buf))
 			t.Fatal(err)
 		}
 	}
diff --git a/integration/skaffold/helper.go b/integration/skaffold/helper.go
@@ -317,7 +317,7 @@ func (b *RunBuilder) RunOrFailOutput(t *testing.T) []byte {
 	out, err := cmd.Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			defer t.Errorf(string(ee.Stderr))
+			defer t.Error(string(ee.Stderr))
 		}
 		t.Fatalf("skaffold %s: %v, %s", b.command, err, out)
 	}
@@ -339,7 +339,7 @@ func (b *RunBuilder) RunWithStdoutAndStderrOrFail(t *testing.T, stdout, stderr i
 	err := cmd.Run()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			defer t.Errorf(string(ee.Stderr))
+			defer t.Error(string(ee.Stderr))
 		}
 		t.Fatalf("skaffold %s: %v, %s", b.command, err, stderr)
 	}
diff --git a/pkg/diag/validator/validator.go b/pkg/diag/validator/validator.go
@@ -18,6 +18,7 @@ package validator
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os/exec"
 	"regexp"
@@ -161,7 +162,7 @@ func getPodStatus(pod *v1.Pod) (proto.StatusCode, []string, error) {
 
 	if c, ok := isPodStatusUnknown(pod); ok {
 		log.Entry(context.TODO()).Debugf("Pod %q condition status of type %s is unknown", pod.Name, c.Type)
-		return proto.StatusCode_STATUSCHECK_UNKNOWN, nil, fmt.Errorf(c.Message)
+		return proto.StatusCode_STATUSCHECK_UNKNOWN, nil, errors.New(c.Message)
 	}
 
 	log.Entry(context.TODO()).Debugf("Unable to determine current service state of pod %q", pod.Name)
diff --git a/pkg/skaffold/deploy/cloudrun/deploy_test.go b/pkg/skaffold/deploy/cloudrun/deploy_test.go
@@ -712,7 +712,7 @@ func TestCleanupMultipleResources(tOuter *testing.T) {
 			}
 			for key, val := range test.expectedPath {
 				if val > 0 {
-					t.Fatalf("Missing expected call for path " + key)
+					t.Fatalf("Missing expected call for path %s", key)
 				}
 			}
 		})
diff --git a/pkg/skaffold/deploy/helm/helm.go b/pkg/skaffold/deploy/helm/helm.go
@@ -20,6 +20,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -439,7 +440,7 @@ func (h *Deployer) Cleanup(ctx context.Context, out io.Writer, dryRun bool, _ ma
 	}
 
 	if len(errMsgs) != 0 {
-		return deployerr.CleanupErr(fmt.Errorf(strings.Join(errMsgs, "\n")))
+		return deployerr.CleanupErr(errors.New(strings.Join(errMsgs, "\n")))
 	}
 	return nil
 }
diff --git a/pkg/skaffold/filemon/changes.go b/pkg/skaffold/filemon/changes.go
@@ -117,13 +117,13 @@ func sortEvents(e Events) {
 }
 
 func logEvents(e Events) {
-	if e.Added != nil && len(e.Added) > 0 {
+	if len(e.Added) > 0 {
 		log.Entry(context.TODO()).Infof("files added: %v", e.Added)
 	}
-	if e.Modified != nil && len(e.Modified) > 0 {
+	if len(e.Modified) > 0 {
 		log.Entry(context.TODO()).Infof("files modified: %v", e.Modified)
 	}
-	if e.Deleted != nil && len(e.Deleted) > 0 {
+	if len(e.Deleted) > 0 {
 		log.Entry(context.TODO()).Infof("files deleted: %v", e.Deleted)
 	}
 }
diff --git a/pkg/skaffold/gcs/gsutil.go b/pkg/skaffold/gcs/gsutil.go
@@ -21,6 +21,7 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -122,7 +123,7 @@ func getPerSourceDir(g latest.GoogleCloudStorageInfo) (string, error) {
 // syncDisabledErr returns error to use when remote sync is turned off by the user and the Google Cloud Storage object doesn't exist inside the cache directory.
 func syncDisabledErr(g latest.GoogleCloudStorageInfo, cacheDir string) error {
 	msg := fmt.Sprintf("cache directory %q for Google Cloud Storage source %q does not exist and remote cache sync is explicitly disabled via flag `--sync-remote-cache`", cacheDir, g.Source)
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_CONFIG_REMOTE_REPO_CACHE_NOT_FOUND_ERR,
diff --git a/pkg/skaffold/git/errors.go b/pkg/skaffold/git/errors.go
@@ -17,6 +17,7 @@ limitations under the License.
 package git
 
 import (
+	"errors"
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/errors"
@@ -26,7 +27,7 @@ import (
 // SyncDisabledErr returns error when git repository sync is turned off by the user but the repository clone doesn't exist inside the cache directory.
 func SyncDisabledErr(g Config, repoCacheDir string) error {
 	msg := fmt.Sprintf("cache directory %q for repository %q at ref %q does not exist, and repository sync is explicitly disabled via flag `--sync-remote-cache`", repoCacheDir, g.Repo, g.Ref)
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_CONFIG_REMOTE_REPO_CACHE_NOT_FOUND_ERR,
diff --git a/pkg/skaffold/inspect/errors.go b/pkg/skaffold/inspect/errors.go
@@ -17,6 +17,7 @@ limitations under the License.
 package inspect
 
 import (
+	"errors"
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/errors"
@@ -31,7 +32,7 @@ func BuildEnvAlreadyExists(b BuildEnv, filename string, profile string) error {
 	} else {
 		msg = fmt.Sprintf("trying to create a %q build environment definition that already exists, in profile %q in file %s", b, profile, filename)
 	}
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_INSPECT_BUILD_ENV_ALREADY_EXISTS_ERR,
@@ -52,7 +53,7 @@ func BuildEnvNotFound(b BuildEnv, filename string, profile string) error {
 	} else {
 		msg = fmt.Sprintf("trying to modify a %q build environment definition that doesn't exist, in profile %q in file %s", b, profile, filename)
 	}
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_INSPECT_BUILD_ENV_INCORRECT_TYPE_ERR,
@@ -68,7 +69,7 @@ func BuildEnvNotFound(b BuildEnv, filename string, profile string) error {
 // ProfileNotFound specifies that the target profile doesn't exist
 func ProfileNotFound(profile string) error {
 	msg := fmt.Sprintf("trying to modify a profile %q that doesn't exist", profile)
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_INSPECT_PROFILE_NOT_FOUND_ERR,
diff --git a/pkg/skaffold/kubernetes/status/resource/status.go b/pkg/skaffold/kubernetes/status/resource/status.go
@@ -17,7 +17,7 @@ limitations under the License.
 package resource
 
 import (
-	"fmt"
+	"errors"
 
 	"github.com/GoogleContainerTools/skaffold/v2/proto/v1"
 )
@@ -32,7 +32,7 @@ func (rs Status) Error() error {
 	if rs.ae.ErrCode == proto.StatusCode_STATUSCHECK_SUCCESS {
 		return nil
 	}
-	return fmt.Errorf(rs.ae.Message)
+	return errors.New(rs.ae.Message)
 }
 
 func (rs Status) ActionableError() *proto.ActionableErr {
diff --git a/pkg/skaffold/lsp/handler.go b/pkg/skaffold/lsp/handler.go
@@ -100,7 +100,7 @@ func GetHandler(conn jsonrpc2.Conn, out io.Writer, opts config.SkaffoldOptions,
 			err := recover()
 			if err != nil {
 				log.Entry(ctx).Errorf("recovered from panic at %s: %v\n", req.Method(), err)
-				log.Entry(ctx).Errorf("stacktrace from panic: \n" + string(debug.Stack()))
+				log.Entry(ctx).Errorf("stacktrace from panic: \n%s", string(debug.Stack()))
 			}
 		}()
 		log.Entry(ctx).Debugf("req.Method():  %q\n", req.Method())
@@ -192,6 +192,7 @@ func GetHandler(conn jsonrpc2.Conn, out io.Writer, opts config.SkaffoldOptions,
 	}
 }
 
+//nolint:unparam
 func (h *Handler) updateDocument(ctx context.Context, documentURI, content string) error {
 	h.documentManager.UpdateDocument(documentURI, content)
 	log.Entry(ctx).Debugf("updated document for %q with %d chars\n", documentURI, len(content))
diff --git a/pkg/skaffold/parser/config_test.go b/pkg/skaffold/parser/config_test.go
@@ -1445,11 +1445,11 @@ func TestConfigLocationsParse(t *testing.T) {
 			fp := t.TempFile("skaffoldyaml-", []byte(test.skaffoldYamlText))
 			cfgs, err := GetConfigSet(context.TODO(), config.SkaffoldOptions{ConfigurationFile: fp, Profiles: test.profiles})
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			root, err := kyaml.Parse(test.skaffoldYamlText)
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			var seen bool
 			for _, filters := range test.expected {
@@ -1459,7 +1459,7 @@ func TestConfigLocationsParse(t *testing.T) {
 				for _, filter := range filters {
 					expectedNode, err = expectedNode.Pipe(filter)
 					if err != nil {
-						t.Fatalf(err.Error())
+						t.Fatal(err.Error())
 					}
 				}
 				if expectedNode == nil {
@@ -1539,7 +1539,7 @@ func TestConfigLocationsLocate(t *testing.T) {
 			fp := t.TempFile("skaffoldyaml-", []byte(test.skaffoldYamlText))
 			cfgs, err := GetConfigSet(context.TODO(), config.SkaffoldOptions{ConfigurationFile: fp, Profiles: test.profiles})
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			artifact0Location := cfgs.Locate(cfgs[0].SkaffoldConfig.Build.Artifacts[0])
 			artifact0Location.SourceFile = ""
diff --git a/pkg/skaffold/render/renderer/helm/helm.go b/pkg/skaffold/render/renderer/helm/helm.go
@@ -19,6 +19,7 @@ package helm
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -208,7 +209,7 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
 	if !release.SkipBuildDependencies && release.ChartPath != "" {
 		log.Entry(ctx).Info("Building helm dependencies...")
 		if err := helm.ExecWithStdoutAndStderr(ctx, h, io.Discard, errBuffer, false, env, "dep", "build", release.ChartPath); err != nil {
-			log.Entry(ctx).Infof(errBuffer.String())
+			log.Entry(ctx).Info(errBuffer.String())
 			return nil, helm.UserErr("building helm dependencies", err)
 		}
 	}
@@ -217,11 +218,11 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
 	errorMsg := errBuffer.String()
 
 	if len(errorMsg) > 0 {
-		log.Entry(ctx).Infof(errorMsg)
+		log.Entry(ctx).Info(errorMsg)
 	}
 
 	if err != nil {
-		return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), fmt.Errorf(errorMsg)))
+		return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), errors.New(errorMsg)))
 	}
 
 	return outBuffer.Bytes(), nil
diff --git a/pkg/skaffold/render/transform/transform.go b/pkg/skaffold/render/transform/transform.go
@@ -117,7 +117,7 @@ func (v *Transformer) Append(ts ...latest.Transformer) error {
 }
 
 func (v *Transformer) IsEmpty() bool {
-	return v.config == nil || len(v.config) == 0
+	return len(v.config) == 0
 }
 
 func (v *Transformer) Transform(ctx context.Context, ml manifest.ManifestList) (manifest.ManifestList, error) {
diff --git a/pkg/skaffold/render/validate/validate.go b/pkg/skaffold/render/validate/validate.go
diff --git a/pkg/skaffold/schema/errors/errors.go b/pkg/skaffold/schema/errors/errors.go
diff --git a/pkg/skaffold/schema/validation/validation.go b/pkg/skaffold/schema/validation/validation.go
diff --git a/pkg/skaffold/survey/survey.go b/pkg/skaffold/survey/survey.go
diff --git a/pkg/skaffold/sync/syncer_mux.go b/pkg/skaffold/sync/syncer_mux.go
diff --git a/pkg/skaffold/tags/paths.go b/pkg/skaffold/tags/paths.go
diff --git a/pkg/skaffold/test/custom/custom_test.go b/pkg/skaffold/test/custom/custom_test.go
diff --git a/pkg/skaffold/update/update.go b/pkg/skaffold/update/update.go

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func cmdConfigDependenciesAdd() *cobra.Command {`
`43`	`43`	`WithArgs(func(cmd *cobra.Command, args []string) error {`
`44`	`44`	`if len(args) != 1 {`
`45`	`45`	errMsg := "`config-dependencies add` requires exactly one file path argument"
`46`		`- olog.Entry(context.TODO()).Errorf(errMsg)`
	`46`	`+ olog.Entry(context.TODO()).Error(errMsg)`
`47`	`47`	`return errors.New(errMsg)`
`48`	`48`	`}`
`49`	`49`	`return nil`