Backport of Upgrade go version to 1.23 into release/1.21.x (#22206)

hc-github-team-consul-core · abhishek-hashicorp · web-flow · commit e334034badbb · 2025-03-06T14:18:14.000+05:30
* backport of commit bfc7c30 * backport of commit 7efe353 * backport of commit e866490 * backport of commit 8ed8c43 * backport of commit a400bad --------- Co-authored-by: Abhishek <abhishek.sahu@hashicorp.com>
diff --git a/.changelog/22204.txt b/.changelog/22204.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Upgrade Go to 1.23.6.
+```
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.12
+1.23.6
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,6 +25,9 @@ issues:
     - linters: [staticcheck]
       text: "SA9004:"
 
+    - linters: [staticcheck]
+      text: "SA1006:"
+
     - linters: [staticcheck]
       text: 'SA1019: "io/ioutil" has been deprecated since Go 1.16'
 
@@ -37,6 +40,9 @@ issues:
     - linters: [unparam]
       text: "always receives"
 
+    - linters: [ unparam ]
+      text: 'result \d+ \(bool\) is always false'
+
     # Often functions will implement an interface that returns an error without
     # needing to return an error. Sometimes the error return value is unnecessary
     # but a linter can not tell the difference.
@@ -64,13 +70,13 @@ issues:
 
 linters-settings:
   govet:
-    check-shadowing: true
     enable-all: true
     disable:
       - fieldalignment
       - nilness
       - shadow
       - unusedwrite
+      - printf
   gofmt:
     simplify: true
   forbidigo:
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ GO_MODULES := $(shell find . -name go.mod -exec dirname {} \; | grep -v "proto-g
 # These version variables can either be a valid string for "go install <module>@<version>"
 # or the string @DEV to imply use what is currently installed locally.
 ###
-GOLANGCI_LINT_VERSION='v1.56.1'
+GOLANGCI_LINT_VERSION='v1.61.0'
 MOCKERY_VERSION='v2.41.0'
 BUF_VERSION='v1.26.0'
 
diff --git a/agent/config/config.deepcopy.go b/agent/config/config.deepcopy.go
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul
 
-go 1.22.12
+go 1.23.6
 
 replace (
 	github.com/hashicorp/consul/api => ./api
diff --git a/test-integ/go.mod b/test-integ/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/test-integ
 
-go 1.22.12
+go 1.23.6
 
 require (
 	github.com/google/go-cmp v0.6.0
diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul/test/integration/consul-container
 
-go 1.22.12
+go 1.23.6
 
 require (
 	fortio.org/fortio v1.54.0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:security
	`2`	`+Upgrade Go to 1.23.6.`
	`3`	+```