From 1a4d3183412ecaa26380f17b679fc2474be2c8ed Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Thu, 4 Jun 2026 02:21:51 +0530 Subject: [PATCH] Backport of chore: Bump go version to 1.26.4 into release/0.21.x (#6751) * backport of commit ce81832486c91376b82432859c3aac0809c0c7b5 * backport of commit c5a80705a8a4bdd011d629d25b49942c6805b318 * backport of commit fc73ed78832096b52c8cd3ece5c4b6409c3b9b45 --------- Co-authored-by: Michael Li --- .go-version | 2 +- Makefile | 2 +- api/go.mod | 2 +- go.mod | 2 +- internal/cmd/base/dev.go | 3 ++- plugins/boundary/mains/aws/go.mod | 2 +- plugins/boundary/mains/azure/go.mod | 2 +- plugins/boundary/mains/gcp/go.mod | 2 +- plugins/boundary/mains/minio/go.mod | 2 +- plugins/kms/mains/alicloudkms/go.mod | 2 +- plugins/kms/mains/awskms/go.mod | 2 +- plugins/kms/mains/azurekeyvault/go.mod | 2 +- plugins/kms/mains/gcpckms/go.mod | 2 +- plugins/kms/mains/ibmkp/go.mod | 2 +- plugins/kms/mains/ocikms/go.mod | 2 +- plugins/kms/mains/transit/go.mod | 2 +- sdk/go.mod | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.go-version b/.go-version index f1968aa881..ea0928cedf 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.25.7 +1.26.4 diff --git a/Makefile b/Makefile index ca0f887057..c3aa53ad69 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ golangci-lint: if [ "$(GOLINT_INSTALLED)" = "" ]; then \ curl -sSfL \ - https://raw.githubusercontent.com/golangci/golangci-lint/3f6f9043a8d0048ec075d2ace970b256cdf37a96/install.sh | sh -s -- -b $(GO_PATH)/bin v2.4.0; \ + https://raw.githubusercontent.com/golangci/golangci-lint/c0d3ddc9cf3faa61a4e378e879ece580256d76e5/install.sh | sh -s -- -b $(GO_PATH)/bin v2.12.2; \ fi; .PHONY: cleangen diff --git a/api/go.mod b/api/go.mod index 2cdcc2b96f..752f75941e 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/api -go 1.25.7 +go 1.26.4 require ( github.com/coder/websocket v1.8.14 diff --git a/go.mod b/go.mod index f0f952f1f4..f97885a2ed 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary -go 1.25.7 +go 1.26.4 replace github.com/hashicorp/boundary/api => ./api diff --git a/internal/cmd/base/dev.go b/internal/cmd/base/dev.go index d4f4e2435e..94819b5449 100644 --- a/internal/cmd/base/dev.go +++ b/internal/cmd/base/dev.go @@ -11,6 +11,7 @@ import ( "net" "net/url" "runtime" + "strconv" "strings" "github.com/hashicorp/boundary/globals" @@ -584,7 +585,7 @@ func (b *Server) createInitialOidcAuthMethod(ctx context.Context) (*oidc.AuthMet return nil, fmt.Errorf("error adding config keys to kms: %w", err) } - discoveryUrl, err := url.Parse(fmt.Sprintf("http://%s:%d", b.DevOidcSetup.hostAddr, b.DevOidcSetup.oidcPort)) + discoveryUrl, err := url.Parse(fmt.Sprintf("http://%s", net.JoinHostPort(b.DevOidcSetup.hostAddr, strconv.Itoa(b.DevOidcSetup.oidcPort)))) if err != nil { return nil, fmt.Errorf("error parsing oidc test provider address: %w", err) } diff --git a/plugins/boundary/mains/aws/go.mod b/plugins/boundary/mains/aws/go.mod index 27071dad0e..613701b0cf 100644 --- a/plugins/boundary/mains/aws/go.mod +++ b/plugins/boundary/mains/aws/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/boundary/mains/aws -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/boundary-plugin-aws v0.5.2 diff --git a/plugins/boundary/mains/azure/go.mod b/plugins/boundary/mains/azure/go.mod index b98c793bb5..1a47291605 100644 --- a/plugins/boundary/mains/azure/go.mod +++ b/plugins/boundary/mains/azure/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/boundary/mains/azure -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/boundary-plugin-azure v0.2.0 diff --git a/plugins/boundary/mains/gcp/go.mod b/plugins/boundary/mains/gcp/go.mod index 6d0116de88..ca7f1d83f8 100644 --- a/plugins/boundary/mains/gcp/go.mod +++ b/plugins/boundary/mains/gcp/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/boundary/mains/gcp -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/boundary-plugin-gcp v0.1.0 diff --git a/plugins/boundary/mains/minio/go.mod b/plugins/boundary/mains/minio/go.mod index a0ff753583..e45ef9c3f0 100644 --- a/plugins/boundary/mains/minio/go.mod +++ b/plugins/boundary/mains/minio/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/boundary/mains/minio -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/boundary-plugin-minio v0.1.7 diff --git a/plugins/kms/mains/alicloudkms/go.mod b/plugins/kms/mains/alicloudkms/go.mod index 87d7d69d7f..f9b72df045 100644 --- a/plugins/kms/mains/alicloudkms/go.mod +++ b/plugins/kms/mains/alicloudkms/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/alicloudkms -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/awskms/go.mod b/plugins/kms/mains/awskms/go.mod index a502306756..2226480515 100644 --- a/plugins/kms/mains/awskms/go.mod +++ b/plugins/kms/mains/awskms/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/awskms -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/azurekeyvault/go.mod b/plugins/kms/mains/azurekeyvault/go.mod index e3b028bd00..86cd558ab1 100644 --- a/plugins/kms/mains/azurekeyvault/go.mod +++ b/plugins/kms/mains/azurekeyvault/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/azurekeyvault -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/gcpckms/go.mod b/plugins/kms/mains/gcpckms/go.mod index 3496df3113..1511326690 100644 --- a/plugins/kms/mains/gcpckms/go.mod +++ b/plugins/kms/mains/gcpckms/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/gcpckms -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/ibmkp/go.mod b/plugins/kms/mains/ibmkp/go.mod index 5780c151b9..959ca0f6de 100644 --- a/plugins/kms/mains/ibmkp/go.mod +++ b/plugins/kms/mains/ibmkp/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/ibmkp -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/ocikms/go.mod b/plugins/kms/mains/ocikms/go.mod index b692b6376d..0f92ba6138 100644 --- a/plugins/kms/mains/ocikms/go.mod +++ b/plugins/kms/mains/ocikms/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/ocikms -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/plugins/kms/mains/transit/go.mod b/plugins/kms/mains/transit/go.mod index e3cf2a55ec..ad575e798c 100644 --- a/plugins/kms/mains/transit/go.mod +++ b/plugins/kms/mains/transit/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/plugins/kms/mains/transit -go 1.25.7 +go 1.26.4 require ( github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.9 diff --git a/sdk/go.mod b/sdk/go.mod index ff741dbba8..c6607d359c 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/boundary/sdk -go 1.25.7 +go 1.26.4 require ( github.com/coder/websocket v1.8.14