From a64ddefe004994d237a0fbcfa58d99f33c56e45b Mon Sep 17 00:00:00 2001 From: ArkaSaha30 Date: Wed, 5 Jun 2024 13:47:20 +0530 Subject: [PATCH] Bump Go version to 1.21.11: CVE 2024-24790 fix Signed-off-by: ArkaSaha30 --- .go-version | 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 +- tools/mod/go.sum | 2 ++ 14 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.go-version b/.go-version index ae7bbdf047a..88863fd8e36 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.10 +1.21.11 diff --git a/api/go.mod b/api/go.mod index 8bdab35a904..2f7d26118cd 100644 --- a/api/go.mod +++ b/api/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/api/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/coreos/go-semver v0.3.0 diff --git a/client/pkg/go.mod b/client/pkg/go.mod index b51579ca19a..214f43c3ed1 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/pkg/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/coreos/go-systemd/v22 v22.3.2 diff --git a/client/v2/go.mod b/client/v2/go.mod index 0549b697459..0c1e34bbb3a 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v2 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/json-iterator/go v1.1.11 diff --git a/client/v3/go.mod b/client/v3/go.mod index 07d71abaee6..583a4d40652 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/dustin/go-humanize v1.0.0 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index d856ca64b5c..d9bfe2546a7 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdctl/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/bgentry/speakeasy v0.1.0 diff --git a/etcdutl/go.mod b/etcdutl/go.mod index 70c8d703529..e4f52d79b5c 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdutl/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/go.mod b/go.mod index ba251914b0c..356ad3485a9 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 replace ( go.etcd.io/etcd/api/v3 => ./api diff --git a/pkg/go.mod b/pkg/go.mod index bf37444d626..39d9e791538 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/pkg/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/creack/pty v1.1.11 diff --git a/raft/go.mod b/raft/go.mod index d73c484309f..1e386eda8db 100644 --- a/raft/go.mod +++ b/raft/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/raft/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/cockroachdb/datadriven v1.0.2 diff --git a/server/go.mod b/server/go.mod index b3212ba2451..24e682b0f79 100644 --- a/server/go.mod +++ b/server/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/server/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/coreos/go-semver v0.3.0 diff --git a/tests/go.mod b/tests/go.mod index 910b748f787..e54dd6f6f42 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/tests/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/tools/mod/go.mod b/tools/mod/go.mod index dcd20c77cf6..b95d48dbbe6 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/alexkohler/nakedret v1.0.0 diff --git a/tools/mod/go.sum b/tools/mod/go.sum index 6d72f65e918..4859de53c17 100644 --- a/tools/mod/go.sum +++ b/tools/mod/go.sum @@ -138,6 +138,7 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -409,6 +410,7 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=