From 8f974669c5901945d79b8c4d2a19462833fa8eb2 Mon Sep 17 00:00:00 2001
From: D Tripp <38776199+thedtripp@users.noreply.github.com>
Date: Wed, 3 Jul 2024 04:58:22 +0000
Subject: [PATCH] Bump Go version to 1.22.5: GO-2024-2963 fix.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
---
 .go-version                    | 2 +-
 api/go.mod                     | 2 +-
 client/internal/v2/go.mod      | 2 +-
 client/pkg/go.mod              | 2 +-
 client/v3/go.mod               | 2 +-
 etcdctl/go.mod                 | 2 +-
 etcdutl/go.mod                 | 2 +-
 go.mod                         | 2 +-
 pkg/go.mod                     | 2 +-
 server/go.mod                  | 2 +-
 tests/go.mod                   | 2 +-
 tools/mod/go.mod               | 2 +-
 tools/rw-heatmaps/go.mod       | 2 +-
 tools/testgrid-analysis/go.mod | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.go-version b/.go-version
index 2a0ba77cc5e..da9594fd66f 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git a/api/go.mod b/api/go.mod
index 080c0060e52..31166dfdd0e 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/api/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod
index b236ad74847..12538d010a8 100644
--- a/client/internal/v2/go.mod
+++ b/client/internal/v2/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v2
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
diff --git a/client/pkg/go.mod b/client/pkg/go.mod
index 94f202394bb..2709e48142b 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.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0
diff --git a/client/v3/go.mod b/client/v3/go.mod
index fcf68278d4c..9c4db332252 100644
--- a/client/v3/go.mod
+++ b/client/v3/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
index 3fb9e09bea0..30509136ce3 100644
--- a/etcdctl/go.mod
+++ b/etcdctl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdctl/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/bgentry/speakeasy v0.1.0
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
index 585d91aa8db..6c7c3811b31 100644
--- a/etcdutl/go.mod
+++ b/etcdutl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdutl/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api
diff --git a/go.mod b/go.mod
index dae768dc160..1844d97644e 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 replace (
 	go.etcd.io/etcd/api/v3 => ./api
diff --git a/pkg/go.mod b/pkg/go.mod
index d0128405623..11fc9485a2c 100644
--- a/pkg/go.mod
+++ b/pkg/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/pkg/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/creack/pty v1.1.18
diff --git a/server/go.mod b/server/go.mod
index a2f17364234..2ac40f048f2 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/server/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/coreos/go-semver v0.3.1
diff --git a/tests/go.mod b/tests/go.mod
index 8fc1d067c90..a6e4b21a227 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tests/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api
diff --git a/tools/mod/go.mod b/tools/mod/go.mod
index 79bee34ec77..9f9ebd94d7e 100644
--- a/tools/mod/go.mod
+++ b/tools/mod/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/alexfalkowski/gocovmerge v1.3.8
diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod
index af98caa9141..aef86582512 100644
--- a/tools/rw-heatmaps/go.mod
+++ b/tools/rw-heatmaps/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/rw-heatmaps/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/spf13/cobra v1.8.1
diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod
index 8b182d68662..514ab818119 100644
--- a/tools/testgrid-analysis/go.mod
+++ b/tools/testgrid-analysis/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/testgrid-analysis/v3
 
 go 1.22
 
-toolchain go1.22.4
+toolchain go1.22.5
 
 require (
 	github.com/GoogleCloudPlatform/testgrid v0.0.173