From 9df1fad7d0af87aebace341cdbdd1d9099229263 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Wed, 3 Jun 2026 16:09:39 -0400 Subject: [PATCH] chore: Bump go version to 1.26.4 (#6750) * chore: Bump to go version 1.26.4 * chore: Bump golangci-lint version * fix: Update URL to be ipv6 safe --- .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 f1968aa88..ea0928ced 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.25.7 +1.26.4 diff --git a/Makefile b/Makefile index 6db2a701e..6ccd19dff 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 55e40feec..68abf7856 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 434427003..4c638661a 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 55341ba47..d14f4cdb4 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 a82c692d3..4daca82ca 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 23a4ae581..82de46014 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 5a77849e9..d539c64e1 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 6baadd0a0..4b76a2bb2 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 7a8f395b6..7ede1a3f4 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 5096e897d..2eca9b460 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 05a557728..9502e53e5 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 1b6903256..e86bd94bf 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 b129cb26e..a7f80b710 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 25c8e8dac..c8bd82bb1 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 c9be00677..52d60138e 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 31a786f5c..c78a3c696 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