Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 3 .changelog/22926.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
security: Upgrade golang to 1.25.2.
```
2 changes: 1 addition & 1 deletion 2 .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.1
1.25.2
12 changes: 10 additions & 2 deletions 12 agent/connect/testing_ca.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import (
"sync/atomic"
"time"

"github.com/hashicorp/go-uuid"
"github.com/mitchellh/go-testing-interface"

"github.com/hashicorp/go-uuid"

"github.com/hashicorp/consul/acl"
"github.com/hashicorp/consul/agent/structs"
)
Expand Down Expand Up @@ -222,6 +223,9 @@ func testLeafWithID(t testing.T, spiffeId CertURI, dnsSAN string, root *structs.
if err != nil {
return "", "", fmt.Errorf("error getting CA key type: %s", err)
}
if dnsSAN == "" {
dnsSAN = "localhost"
}

// Cert template for generation
template := x509.Certificate{
Expand All @@ -241,7 +245,11 @@ func testLeafWithID(t testing.T, spiffeId CertURI, dnsSAN string, root *structs.
NotBefore: time.Now(),
AuthorityKeyId: testKeyID(t, caSigner.Public()),
SubjectKeyId: testKeyID(t, pkSigner.Public()),
DNSNames: []string{dnsSAN},
}

// Only add DNS SANs if dnsSAN is not empty to avoid malformed SAN errors in Go 1.25.2+
if dnsSAN != "" {
template.DNSNames = []string{dnsSAN}
}

// Create the certificate, PEM encode it and return that value.
Expand Down
2 changes: 1 addition & 1 deletion 2 api/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/api

go 1.25.1
go 1.25.2

replace github.com/hashicorp/consul/sdk => ../sdk

Expand Down
2 changes: 1 addition & 1 deletion 2 envoyextensions/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/envoyextensions

go 1.25.1
go 1.25.2

replace (
github.com/hashicorp/consul/api => ../api
Expand Down
2 changes: 1 addition & 1 deletion 2 go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul

go 1.25.1
go 1.25.2

replace (
github.com/hashicorp/consul/api => ./api
Expand Down
2 changes: 1 addition & 1 deletion 2 internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/hashicorp/consul

go 1.25.1
go 1.25.2

require google.golang.org/protobuf v1.28.1
2 changes: 1 addition & 1 deletion 2 internal/tools/proto-gen-rpc-glue/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue/e2e

go 1.25.1
go 1.25.2

replace github.com/hashicorp/consul => ./consul

Expand Down
2 changes: 1 addition & 1 deletion 2 internal/tools/proto-gen-rpc-glue/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue

go 1.25.1
go 1.25.2

require github.com/stretchr/testify v1.8.4

Expand Down
2 changes: 1 addition & 1 deletion 2 internal/tools/protoc-gen-consul-rate-limit/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/internal/tools/protoc-gen-consul-rate-limit

go 1.25.1
go 1.25.2

replace github.com/hashicorp/consul/proto-public => ../../../proto-public

Expand Down
2 changes: 1 addition & 1 deletion 2 proto-public/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/proto-public

go 1.25.1
go 1.25.2

require (
google.golang.org/grpc v1.75.0
Expand Down
2 changes: 1 addition & 1 deletion 2 sdk/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/sdk

go 1.25.1
go 1.25.2

require (
github.com/hashicorp/go-cleanhttp v0.5.2
Expand Down
2 changes: 1 addition & 1 deletion 2 test-integ/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/test-integ

go 1.25.1
go 1.25.2

require (
github.com/google/go-cmp v0.7.0
Expand Down
2 changes: 1 addition & 1 deletion 2 test/integration/connect/envoy/test-sds-server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module test-sds-server

go 1.25.1
go 1.25.2

require (
github.com/envoyproxy/go-control-plane v0.13.4
Expand Down
2 changes: 1 addition & 1 deletion 2 test/integration/consul-container/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/test/integration/consul-container

go 1.25.1
go 1.25.2

require (
fortio.org/fortio v1.54.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module main

go 1.25.1
go 1.25.2

require github.com/tetratelabs/proxy-wasm-go-sdk v0.21.0

Expand Down
2 changes: 1 addition & 1 deletion 2 testing/deployer/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/testing/deployer

go 1.25.1
go 1.25.2

require (
github.com/avast/retry-go v3.0.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion 2 troubleshoot/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/consul/troubleshoot

go 1.25.1
go 1.25.2

replace (
github.com/hashicorp/consul/api => ../api
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.