Merge pull request #19440 from ivanvc/bump-go-to-1.24.0

ahrtr · web-flow · commit 8e4de789e5a2 · 2025-03-06T07:51:04.000Z
Bump go toolchain to 1.24.1
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.6
+1.24.1
diff --git a/api/go.mod b/api/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/api/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/client/v2
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/stretchr/testify v1.10.0
diff --git a/client/pkg/go.mod b/client/pkg/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/client/pkg/v3
 
-go 1.23
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0
diff --git a/client/v3/go.mod b/client/v3/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/client/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/etcdctl/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/bgentry/speakeasy v0.2.0
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/etcdutl/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api
diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 replace (
 	go.etcd.io/etcd/api/v3 => ./api
diff --git a/pkg/go.mod b/pkg/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/pkg/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/creack/pty v1.1.18
diff --git a/server/embed/config_test.go b/server/embed/config_test.go
@@ -843,7 +843,7 @@ func TestLogRotation(t *testing.T) {
 			logOutputs:        []string{"/tmp/path"},
 			logRotationConfig: `{"maxsize": true}`,
 			wantErr:           true,
-			wantErrMsg:        errors.New("invalid log rotation config: json: cannot unmarshal bool into Go struct field logRotationConfig.maxsize of type int"),
+			wantErrMsg:        errors.New("invalid log rotation config: json: cannot unmarshal bool into Go struct field logRotationConfig.Logger.maxsize of type int"),
 		},
 		{
 			name:              "improperly formatted logger config",
diff --git a/server/go.mod b/server/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/server/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/tests/go.mod b/tests/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/tests/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api
diff --git a/tools/.golangci.yaml b/tools/.golangci.yaml
@@ -35,7 +35,8 @@ linters:
     - unparam
     - unused
     - usestdlibvars
-    - usetesting
+    # Disabled in the meanwhile, it raises several issues with new Go 1.24 functions
+    # - usetesting
     - whitespace
 linters-settings: # please keep this alphabetized
   goimports:
diff --git a/tools/mod/go.mod b/tools/mod/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/tools/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/alexfalkowski/gocovmerge v1.4.0
diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/tools/rw-heatmaps/v3
 
-go 1.23
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/spf13/cobra v1.9.1
diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod
@@ -1,8 +1,8 @@
 module go.etcd.io/etcd/tools/testgrid-analysis/v3
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.6
+toolchain go1.24.1
 
 require (
 	github.com/GoogleCloudPlatform/testgrid v0.0.173

Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ func TestLogRotation(t *testing.T) {`
`843`	`843`	`logOutputs: []string{"/tmp/path"},`
`844`	`844`	logRotationConfig: `{"maxsize": true}`,
`845`	`845`	`wantErr: true,`
`846`		`- wantErrMsg: errors.New("invalid log rotation config: json: cannot unmarshal bool into Go struct field logRotationConfig.maxsize of type int"),`
	`846`	`+ wantErrMsg: errors.New("invalid log rotation config: json: cannot unmarshal bool into Go struct field logRotationConfig.Logger.maxsize of type int"),`
`847`	`847`	`},`
`848`	`848`	`{`
`849`	`849`	`name: "improperly formatted logger config",`