backport #35494 : move from Go 1.22.4 to 1.22.5 (#35496)

* move from Go 1.22.4 to 1.22.5 * add CHANGELOG entry
hashicorp · Jul 23, 2024 · 0cbc9db · 0cbc9db
1 parent 27b3984
commit 0cbc9db
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 11 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ BUG FIXES:
 * core: Terraform no longer performs an unnecessary refresh when removing an instance targeted by a `removed` block. ([#35458](https://github.com/hashicorp/terraform/pull/35458))
 * config generation: Fix validation error when using nested computed or deprecated attributes. ([#35484](https://github.com/hashicorp/terraform/pull/35484))
 * Updated to newer github.com/hashicorp/go-retryablehttp version, addressing CVE-2024-6104, and bringing in updates for several indirect dependencies. ([#35473](https://github.com/hashicorp/terraform/pull/35473))
+* Moved to building with Go 1.22.5, which addresses CVE-2024-24791 and several other non-security bugs. ([#35494](https://github.com/hashicorp/terraform/pull/35494))
 
 ## 1.9.2 (July 10, 2024)
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2

diff --git a/internal/backend/remote-state/azure/go.mod b/internal/backend/remote-state/azure/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/azure
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/Azure/azure-sdk-for-go v59.2.0+incompatible

diff --git a/internal/backend/remote-state/consul/go.mod b/internal/backend/remote-state/consul/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/consul
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/hashicorp/consul/api v1.13.0

diff --git a/internal/backend/remote-state/cos/go.mod b/internal/backend/remote-state/cos/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/cos
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/hashicorp/terraform v0.0.0-00010101000000-000000000000

diff --git a/internal/backend/remote-state/gcs/go.mod b/internal/backend/remote-state/gcs/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/gcs
 
-go 1.22.4
+go 1.22.5
 
 require (
 	cloud.google.com/go/kms v1.15.0

diff --git a/internal/backend/remote-state/kubernetes/go.mod b/internal/backend/remote-state/kubernetes/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/kubernetes
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/hashicorp/terraform v0.0.0-00010101000000-000000000000

diff --git a/internal/backend/remote-state/oss/go.mod b/internal/backend/remote-state/oss/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/oss
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1501

diff --git a/internal/backend/remote-state/pg/go.mod b/internal/backend/remote-state/pg/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/pg
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/hashicorp/go-uuid v1.0.3

diff --git a/internal/backend/remote-state/s3/go.mod b/internal/backend/remote-state/s3/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/terraform/internal/backend/remote-state/s3
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.25.3

diff --git a/internal/legacy/go.mod b/internal/legacy/go.mod
@@ -2,7 +2,7 @@ module github.com/hashicorp/terraform/internal/legacy
 
 replace github.com/hashicorp/terraform => ../..
 
-go 1.22.4
+go 1.22.5
 
 require (
 	github.com/davecgh/go-spew v1.1.1