From 9c7c8c6b3ff0f79c21623565e3d510bd4f509b1c Mon Sep 17 00:00:00 2001 From: James Blair Date: Fri, 11 Aug 2023 21:16:01 +1200 Subject: [PATCH 1/2] Backport update to golang 1.20 minor release. Signed-off-by: James Blair --- .go-version | 2 +- Makefile | 2 +- api/go.mod | 2 +- client/pkg/go.mod | 2 +- client/v2/go.mod | 2 +- client/v3/go.mod | 2 +- etcdctl/go.mod | 2 +- etcdutl/go.mod | 2 +- go.mod | 2 +- pkg/go.mod | 2 +- raft/go.mod | 2 +- server/go.mod | 2 +- tests/go.mod | 2 +- tools/mod/go.mod | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.go-version b/.go-version index e54f3135a7d..8909929f6e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.19.12 +1.20.7 diff --git a/Makefile b/Makefile index 20fc75155b8..c881983f0d4 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ docker-remove: -GO_VERSION ?= 1.19.9 +GO_VERSION ?= 1.20.7 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) diff --git a/api/go.mod b/api/go.mod index 902d4c46d15..c3ed9b34c3a 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/api/v3 -go 1.19 +go 1.20 require ( github.com/coreos/go-semver v0.3.0 diff --git a/client/pkg/go.mod b/client/pkg/go.mod index 2e41fc4cef8..3eb8c511c7d 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/pkg/v3 -go 1.19 +go 1.20 require ( github.com/coreos/go-systemd/v22 v22.3.2 diff --git a/client/v2/go.mod b/client/v2/go.mod index e7225be61b9..3c4b3be80a5 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v2 -go 1.19 +go 1.20 require ( github.com/json-iterator/go v1.1.11 diff --git a/client/v3/go.mod b/client/v3/go.mod index d1c898ea706..ff9a429823a 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v3 -go 1.19 +go 1.20 require ( github.com/dustin/go-humanize v1.0.0 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index 7c8b3596e06..39ae167a4c3 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/etcdctl/v3 -go 1.19 +go 1.20 require ( github.com/bgentry/speakeasy v0.1.0 diff --git a/etcdutl/go.mod b/etcdutl/go.mod index f404270da40..7cb42a0352e 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/etcdutl/v3 -go 1.19 +go 1.20 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/go.mod b/go.mod index 16d0c51b0ea..971d050a6ca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/v3 -go 1.19 +go 1.20 replace ( go.etcd.io/etcd/api/v3 => ./api diff --git a/pkg/go.mod b/pkg/go.mod index d0365fdd6c7..250bf3ef715 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/pkg/v3 -go 1.19 +go 1.20 require ( github.com/creack/pty v1.1.11 diff --git a/raft/go.mod b/raft/go.mod index 9132e2a5e53..9b3a1922420 100644 --- a/raft/go.mod +++ b/raft/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/raft/v3 -go 1.19 +go 1.20 require ( github.com/cockroachdb/datadriven v1.0.2 diff --git a/server/go.mod b/server/go.mod index 40132b7e1d1..6261a6eec3f 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/server/v3 -go 1.19 +go 1.20 require ( github.com/coreos/go-semver v0.3.0 diff --git a/tests/go.mod b/tests/go.mod index 19b27aef7de..6020fa56491 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/tests/v3 -go 1.19 +go 1.20 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/tools/mod/go.mod b/tools/mod/go.mod index ca2b302c88e..47a74e7e9aa 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/tools/v3 -go 1.19 +go 1.20 require ( github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect From f62a894ae77b6c24bce4535819595cd3e679bc67 Mon Sep 17 00:00:00 2001 From: James Blair Date: Fri, 11 Aug 2023 21:47:30 +1200 Subject: [PATCH 2/2] Fix goword failure in rafthttp/transport.go. Signed-off-by: James Blair --- server/etcdserver/api/rafthttp/transport.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/etcdserver/api/rafthttp/transport.go b/server/etcdserver/api/rafthttp/transport.go index 940e8473bc1..a1969549a92 100644 --- a/server/etcdserver/api/rafthttp/transport.go +++ b/server/etcdserver/api/rafthttp/transport.go @@ -110,7 +110,7 @@ type Transport struct { Raft Raft // raft state machine, to which the Transport forwards received messages and reports status Snapshotter *snap.Snapshotter ServerStats *stats.ServerStats // used to record general transportation statistics - // used to record transportation statistics with followers when + // LeaderStats is used to record transportation statistics with followers when // performing as leader in raft protocol LeaderStats *stats.LeaderStats // ErrorC is used to report detected critical errors, e.g.,