From 45d26bcc60bb31263b13a485cb8448fd298c15d6 Mon Sep 17 00:00:00 2001
From: D Tripp <38776199+thedtripp@users.noreply.github.com>
Date: Wed, 3 Jul 2024 05:26:39 +0000
Subject: [PATCH] 3.4: Bump Go version to 1.21.12: GO-2024-2963 fix.

Based on commit 74533d94b2ce4cb5bde19c02a652ade7fa9dc5d4 and https://github.com/etcd-io/etcd/pull/18130/

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
---
 .go-version                               | 2 +-
 functional/scripts/docker-local-agent.sh  | 2 +-
 functional/scripts/docker-local-tester.sh | 2 +-
 go.mod                                    | 2 +-
 tools/mod/go.mod                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.go-version b/.go-version
index 88863fd8e..26d7b6e75 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.11
+1.21.12
diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
index d35ab3ae6..60bf135db 100755
--- a/functional/scripts/docker-local-agent.sh
+++ b/functional/scripts/docker-local-agent.sh
@@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.11
+  GO_VERSION=1.21.12
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 
diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
index af7e07766..9d1677a4e 100755
--- a/functional/scripts/docker-local-tester.sh
+++ b/functional/scripts/docker-local-tester.sh
@@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.11
+  GO_VERSION=1.21.12
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 
diff --git a/go.mod b/go.mod
index db312b2e5..8083e9d46 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd
 
 go 1.21
 
-toolchain go1.21.11
+toolchain go1.21.12
 
 require (
 	github.com/bgentry/speakeasy v0.1.0
diff --git a/tools/mod/go.mod b/tools/mod/go.mod
index 9b76b9e85..f7cce3cf8 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.11
+toolchain go1.21.12
 
 require (
 	github.com/gogo/protobuf v1.3.2