Skip to content

Commit 1385a7d

Browse files
ChrisGe4ChrisGe4
authored
chore: bump go version from 1.22 to 1.23 (GoogleContainerTools#9571)
* chore: bump go version from 1.22 to 1.23 * bump golangci version from 1.57.1 to 1.62.0
1 parent 08001f6 commit 1385a7d

File tree

37 files changed

+74
-65
lines changed

37 files changed

+74
-65
lines changed

‎.github/workflows/integration-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@v5
3636
with:
37-
go-version: 1.22.*
37+
go-version: 1.23.*
3838
id: go
3939

4040
# Retrieve build locations with `go env`

‎.github/workflows/linters-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.22.*
20+
go-version: 1.23.*
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/performance-comparison.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Set up Go
4242
uses: actions/setup-go@v5
4343
with:
44-
go-version: 1.22.*
44+
go-version: 1.23.*
4545
id: go
4646

4747
- name: Check out code into the Go module directory

‎.github/workflows/unit-tests-darwin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.22.*
26+
go-version: 1.23.*
2727
id: go
2828

2929
# Retrieve build locations with `go env`

‎.github/workflows/unit-tests-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.22.*
20+
go-version: 1.23.*
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/unit-tests-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@v5
2626
with:
27-
go-version: 1.22.*
27+
go-version: 1.23.*
2828
id: go
2929

3030
# Retrieve build locations with `go env`

‎.github/workflows/verify-examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.22.*
26+
go-version: 1.23.*
2727
id: go
2828

2929
# Skip changes not affecting examples or integration/examples

‎cmd/skaffold/app/cmd/inspect_config_dependencies.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func cmdConfigDependenciesAdd() *cobra.Command {
4343
WithArgs(func(cmd *cobra.Command, args []string) error {
4444
if len(args) != 1 {
4545
errMsg := "`config-dependencies add` requires exactly one file path argument"
46-
olog.Entry(context.TODO()).Errorf(errMsg)
46+
olog.Entry(context.TODO()).Error(errMsg)
4747
return errors.New(errMsg)
4848
}
4949
return nil

‎deploy/skaffold/Dockerfile.deps

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
163163
jq \
164164
apt-transport-https && \
165165
rm -rf /var/lib/apt/lists/*
166-
COPY --from=golang:1.22.4 /usr/local/go /usr/local/go
166+
COPY --from=golang:1.23.3 /usr/local/go /usr/local/go
167167
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH

‎deploy/skaffold/Dockerfile.deps.slim

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
104104
jq \
105105
apt-transport-https && \
106106
rm -rf /var/lib/apt/lists/*
107-
COPY --from=golang:1.22.4 /usr/local/go /usr/local/go
107+
COPY --from=golang:1.23.3 /usr/local/go /usr/local/go
108108
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH

‎fs/assets/credits_generated/github.com/hashicorp/hcl/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/hashicorp/hcl
22

3-
go 1.22
3+
go 1.23
44

55
require github.com/davecgh/go-spew v1.1.1

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleContainerTools/skaffold/v2
22

3-
go 1.22
3+
go 1.23
44

55
// these require code change may remove these later
66
exclude (

‎hack/golangci-lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -e -o pipefail
1818

1919
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2020
BIN=${DIR}/bin
21-
VERSION=1.57.1
21+
VERSION=1.62.0
2222

2323
function install_linter() {
2424
echo "Installing GolangCI-Lint"

‎hack/tools/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module tools
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752

‎hack/versions/pkg/diff/godiff_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ type TestStructure struct {
248248

249249
t.CheckErrorAndDeepEqual(test.shouldErr, err, test.same, diff == "")
250250
if test.same != (diff == "") {
251-
t.Errorf(diff)
251+
t.Error(diff)
252252
}
253253
})
254254
}
@@ -284,7 +284,7 @@ func TestCompareSchemas(t *testing.T) {
284284
t.CheckNoError(err)
285285
t.CheckDeepEqual(test.a == test.b, diff == "")
286286
if diff != "" && test.a == test.b {
287-
t.Errorf(diff)
287+
t.Error(diff)
288288
}
289289
})
290290
}

‎integration/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func setupGitRepo(t *testing.T, dir string) {
308308
cmd := exec.Command("git", args...)
309309
cmd.Dir = dir
310310
if buf, err := util.RunCmdOut(context.Background(), cmd); err != nil {
311-
t.Logf(string(buf))
311+
t.Log(string(buf))
312312
t.Fatal(err)
313313
}
314314
}

‎integration/skaffold/helper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func (b *RunBuilder) RunOrFailOutput(t *testing.T) []byte {
317317
out, err := cmd.Output()
318318
if err != nil {
319319
if ee, ok := err.(*exec.ExitError); ok {
320-
defer t.Errorf(string(ee.Stderr))
320+
defer t.Error(string(ee.Stderr))
321321
}
322322
t.Fatalf("skaffold %s: %v, %s", b.command, err, out)
323323
}
@@ -339,7 +339,7 @@ func (b *RunBuilder) RunWithStdoutAndStderrOrFail(t *testing.T, stdout, stderr i
339339
err := cmd.Run()
340340
if err != nil {
341341
if ee, ok := err.(*exec.ExitError); ok {
342-
defer t.Errorf(string(ee.Stderr))
342+
defer t.Error(string(ee.Stderr))
343343
}
344344
t.Fatalf("skaffold %s: %v, %s", b.command, err, stderr)
345345
}

‎pkg/diag/validator/validator.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package validator
1818

1919
import (
2020
"context"
21+
"errors"
2122
"fmt"
2223
"os/exec"
2324
"regexp"
@@ -161,7 +162,7 @@ func getPodStatus(pod *v1.Pod) (proto.StatusCode, []string, error) {
161162

162163
if c, ok := isPodStatusUnknown(pod); ok {
163164
log.Entry(context.TODO()).Debugf("Pod %q condition status of type %s is unknown", pod.Name, c.Type)
164-
return proto.StatusCode_STATUSCHECK_UNKNOWN, nil, fmt.Errorf(c.Message)
165+
return proto.StatusCode_STATUSCHECK_UNKNOWN, nil, errors.New(c.Message)
165166
}
166167

167168
log.Entry(context.TODO()).Debugf("Unable to determine current service state of pod %q", pod.Name)

‎pkg/skaffold/deploy/cloudrun/deploy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ func TestCleanupMultipleResources(tOuter *testing.T) {
712712
}
713713
for key, val := range test.expectedPath {
714714
if val > 0 {
715-
t.Fatalf("Missing expected call for path " + key)
715+
t.Fatalf("Missing expected call for path %s", key)
716716
}
717717
}
718718
})

‎pkg/skaffold/deploy/helm/helm.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"bufio"
2121
"bytes"
2222
"context"
23+
"errors"
2324
"fmt"
2425
"io"
2526
"os"
@@ -439,7 +440,7 @@ func (h *Deployer) Cleanup(ctx context.Context, out io.Writer, dryRun bool, _ ma
439440
}
440441

441442
if len(errMsgs) != 0 {
442-
return deployerr.CleanupErr(fmt.Errorf(strings.Join(errMsgs, "\n")))
443+
return deployerr.CleanupErr(errors.New(strings.Join(errMsgs, "\n")))
443444
}
444445
return nil
445446
}

‎pkg/skaffold/filemon/changes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ func sortEvents(e Events) {
117117
}
118118

119119
func logEvents(e Events) {
120-
if e.Added != nil && len(e.Added) > 0 {
120+
if len(e.Added) > 0 {
121121
log.Entry(context.TODO()).Infof("files added: %v", e.Added)
122122
}
123-
if e.Modified != nil && len(e.Modified) > 0 {
123+
if len(e.Modified) > 0 {
124124
log.Entry(context.TODO()).Infof("files modified: %v", e.Modified)
125125
}
126-
if e.Deleted != nil && len(e.Deleted) > 0 {
126+
if len(e.Deleted) > 0 {
127127
log.Entry(context.TODO()).Infof("files deleted: %v", e.Deleted)
128128
}
129129
}

‎pkg/skaffold/gcs/gsutil.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"crypto/sha256"
2222
"encoding/base64"
2323
"encoding/json"
24+
"errors"
2425
"fmt"
2526
"os"
2627
"os/exec"
@@ -122,7 +123,7 @@ func getPerSourceDir(g latest.GoogleCloudStorageInfo) (string, error) {
122123
// 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.
123124
func syncDisabledErr(g latest.GoogleCloudStorageInfo, cacheDir string) error {
124125
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)
125-
return sErrors.NewError(fmt.Errorf(msg),
126+
return sErrors.NewError(errors.New(msg),
126127
&proto.ActionableErr{
127128
Message: msg,
128129
ErrCode: proto.StatusCode_CONFIG_REMOTE_REPO_CACHE_NOT_FOUND_ERR,

‎pkg/skaffold/git/errors.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package git
1818

1919
import (
20+
"errors"
2021
"fmt"
2122

2223
sErrors "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/errors"
@@ -26,7 +27,7 @@ import (
2627
// SyncDisabledErr returns error when git repository sync is turned off by the user but the repository clone doesn't exist inside the cache directory.
2728
func SyncDisabledErr(g Config, repoCacheDir string) error {
2829
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)
29-
return sErrors.NewError(fmt.Errorf(msg),
30+
return sErrors.NewError(errors.New(msg),
3031
&proto.ActionableErr{
3132
Message: msg,
3233
ErrCode: proto.StatusCode_CONFIG_REMOTE_REPO_CACHE_NOT_FOUND_ERR,

‎pkg/skaffold/inspect/errors.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package inspect
1818

1919
import (
20+
"errors"
2021
"fmt"
2122

2223
sErrors "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/errors"
@@ -31,7 +32,7 @@ func BuildEnvAlreadyExists(b BuildEnv, filename string, profile string) error {
3132
} else {
3233
msg = fmt.Sprintf("trying to create a %q build environment definition that already exists, in profile %q in file %s", b, profile, filename)
3334
}
34-
return sErrors.NewError(fmt.Errorf(msg),
35+
return sErrors.NewError(errors.New(msg),
3536
&proto.ActionableErr{
3637
Message: msg,
3738
ErrCode: proto.StatusCode_INSPECT_BUILD_ENV_ALREADY_EXISTS_ERR,
@@ -52,7 +53,7 @@ func BuildEnvNotFound(b BuildEnv, filename string, profile string) error {
5253
} else {
5354
msg = fmt.Sprintf("trying to modify a %q build environment definition that doesn't exist, in profile %q in file %s", b, profile, filename)
5455
}
55-
return sErrors.NewError(fmt.Errorf(msg),
56+
return sErrors.NewError(errors.New(msg),
5657
&proto.ActionableErr{
5758
Message: msg,
5859
ErrCode: proto.StatusCode_INSPECT_BUILD_ENV_INCORRECT_TYPE_ERR,
@@ -68,7 +69,7 @@ func BuildEnvNotFound(b BuildEnv, filename string, profile string) error {
6869
// ProfileNotFound specifies that the target profile doesn't exist
6970
func ProfileNotFound(profile string) error {
7071
msg := fmt.Sprintf("trying to modify a profile %q that doesn't exist", profile)
71-
return sErrors.NewError(fmt.Errorf(msg),
72+
return sErrors.NewError(errors.New(msg),
7273
&proto.ActionableErr{
7374
Message: msg,
7475
ErrCode: proto.StatusCode_INSPECT_PROFILE_NOT_FOUND_ERR,

‎pkg/skaffold/kubernetes/status/resource/status.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package resource
1818

1919
import (
20-
"fmt"
20+
"errors"
2121

2222
"github.com/GoogleContainerTools/skaffold/v2/proto/v1"
2323
)
@@ -32,7 +32,7 @@ func (rs Status) Error() error {
3232
if rs.ae.ErrCode == proto.StatusCode_STATUSCHECK_SUCCESS {
3333
return nil
3434
}
35-
return fmt.Errorf(rs.ae.Message)
35+
return errors.New(rs.ae.Message)
3636
}
3737

3838
func (rs Status) ActionableError() *proto.ActionableErr {

‎pkg/skaffold/lsp/handler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func GetHandler(conn jsonrpc2.Conn, out io.Writer, opts config.SkaffoldOptions,
100100
err := recover()
101101
if err != nil {
102102
log.Entry(ctx).Errorf("recovered from panic at %s: %v\n", req.Method(), err)
103-
log.Entry(ctx).Errorf("stacktrace from panic: \n" + string(debug.Stack()))
103+
log.Entry(ctx).Errorf("stacktrace from panic: \n%s", string(debug.Stack()))
104104
}
105105
}()
106106
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,
192192
}
193193
}
194194

195+
//nolint:unparam
195196
func (h *Handler) updateDocument(ctx context.Context, documentURI, content string) error {
196197
h.documentManager.UpdateDocument(documentURI, content)
197198
log.Entry(ctx).Debugf("updated document for %q with %d chars\n", documentURI, len(content))

‎pkg/skaffold/parser/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1445,11 +1445,11 @@ func TestConfigLocationsParse(t *testing.T) {
14451445
fp := t.TempFile("skaffoldyaml-", []byte(test.skaffoldYamlText))
14461446
cfgs, err := GetConfigSet(context.TODO(), config.SkaffoldOptions{ConfigurationFile: fp, Profiles: test.profiles})
14471447
if err != nil {
1448-
t.Fatalf(err.Error())
1448+
t.Fatal(err.Error())
14491449
}
14501450
root, err := kyaml.Parse(test.skaffoldYamlText)
14511451
if err != nil {
1452-
t.Fatalf(err.Error())
1452+
t.Fatal(err.Error())
14531453
}
14541454
var seen bool
14551455
for _, filters := range test.expected {
@@ -1459,7 +1459,7 @@ func TestConfigLocationsParse(t *testing.T) {
14591459
for _, filter := range filters {
14601460
expectedNode, err = expectedNode.Pipe(filter)
14611461
if err != nil {
1462-
t.Fatalf(err.Error())
1462+
t.Fatal(err.Error())
14631463
}
14641464
}
14651465
if expectedNode == nil {
@@ -1539,7 +1539,7 @@ func TestConfigLocationsLocate(t *testing.T) {
15391539
fp := t.TempFile("skaffoldyaml-", []byte(test.skaffoldYamlText))
15401540
cfgs, err := GetConfigSet(context.TODO(), config.SkaffoldOptions{ConfigurationFile: fp, Profiles: test.profiles})
15411541
if err != nil {
1542-
t.Fatalf(err.Error())
1542+
t.Fatal(err.Error())
15431543
}
15441544
artifact0Location := cfgs.Locate(cfgs[0].SkaffoldConfig.Build.Artifacts[0])
15451545
artifact0Location.SourceFile = ""

‎pkg/skaffold/render/renderer/helm/helm.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package helm
1919
import (
2020
"bytes"
2121
"context"
22+
"errors"
2223
"fmt"
2324
"io"
2425
"os"
@@ -208,7 +209,7 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
208209
if !release.SkipBuildDependencies && release.ChartPath != "" {
209210
log.Entry(ctx).Info("Building helm dependencies...")
210211
if err := helm.ExecWithStdoutAndStderr(ctx, h, io.Discard, errBuffer, false, env, "dep", "build", release.ChartPath); err != nil {
211-
log.Entry(ctx).Infof(errBuffer.String())
212+
log.Entry(ctx).Info(errBuffer.String())
212213
return nil, helm.UserErr("building helm dependencies", err)
213214
}
214215
}
@@ -217,11 +218,11 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
217218
errorMsg := errBuffer.String()
218219

219220
if len(errorMsg) > 0 {
220-
log.Entry(ctx).Infof(errorMsg)
221+
log.Entry(ctx).Info(errorMsg)
221222
}
222223

223224
if err != nil {
224-
return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), fmt.Errorf(errorMsg)))
225+
return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), errors.New(errorMsg)))
225226
}
226227

227228
return outBuffer.Bytes(), nil

‎pkg/skaffold/render/transform/transform.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (v *Transformer) Append(ts ...latest.Transformer) error {
117117
}
118118

119119
func (v *Transformer) IsEmpty() bool {
120-
return v.config == nil || len(v.config) == 0
120+
return len(v.config) == 0
121121
}
122122

123123
func (v *Transformer) Transform(ctx context.Context, ml manifest.ManifestList) (manifest.ManifestList, error) {

0 commit comments

Comments
 (0)