From 1c27dcc0894bb0eff40c141b85bf76b421e8eb87 Mon Sep 17 00:00:00 2001
From: NiniOak <anita.akaeze@hashicorp.com>
Date: Tue, 10 Sep 2024 19:14:47 +0000
Subject: [PATCH 1/2] backport of commit
 c2876022563029ec36e428fb48a513fbd11a7ee6

---
 .go-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.go-version b/.go-version
index 054c858fbf36..5d287e490a76 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.5
\ No newline at end of file
+1.22.7
\ No newline at end of file

From 267bb6784bd727b167fe2145fc1f48ec1690cf1e Mon Sep 17 00:00:00 2001
From: NiniOak <anita.akaeze@hashicorp.com>
Date: Tue, 10 Sep 2024 19:26:04 +0000
Subject: [PATCH 2/2] backport of commit
 4b1111aa2f1dbaae01a3ce7585556c5066d3f337

---
 .changelog/21705.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .changelog/21705.txt

diff --git a/.changelog/21705.txt b/.changelog/21705.txt
new file mode 100644
index 000000000000..e6ab5ba8118a
--- /dev/null
+++ b/.changelog/21705.txt
@@ -0,0 +1,4 @@
+```release-note:security
+Upgrade Go to use 1.22.7. This addresses CVE 
+[CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155)
+```
\ No newline at end of file