diff --git a/.changelog/23029.txt b/.changelog/23029.txt new file mode 100644 index 000000000000..f6a5e6cda24e --- /dev/null +++ b/.changelog/23029.txt @@ -0,0 +1,3 @@ +```release-note:security +security: Upgrade golang to 1.25.4. +``` \ No newline at end of file diff --git a/.go-version b/.go-version index 5bb76b575e1f..26a9e99b38be 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.25.3 +1.25.4 diff --git a/api/go.mod b/api/go.mod index bae77bc3df1e..efcaf9885645 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/api -go 1.25.3 +go 1.25.4 replace github.com/hashicorp/consul/sdk => ../sdk diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index 144a2f3cc28c..9c6267dc9eb8 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/envoyextensions -go 1.25.3 +go 1.25.4 replace ( github.com/hashicorp/consul/api => ../api diff --git a/go.mod b/go.mod index ff78d2d1eba6..880f05ef16cd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul -go 1.25.3 +go 1.25.4 replace ( github.com/hashicorp/consul/api => ./api diff --git a/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod b/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod index 5278bc3e18e8..43a7dc2ac2ba 100644 --- a/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod +++ b/internal/tools/proto-gen-rpc-glue/e2e/consul/go.mod @@ -1,5 +1,5 @@ module github.com/hashicorp/consul -go 1.25.3 +go 1.25.4 require google.golang.org/protobuf v1.28.1 diff --git a/internal/tools/proto-gen-rpc-glue/e2e/go.mod b/internal/tools/proto-gen-rpc-glue/e2e/go.mod index c05b8bc0c161..c2a605a3de2a 100644 --- a/internal/tools/proto-gen-rpc-glue/e2e/go.mod +++ b/internal/tools/proto-gen-rpc-glue/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue/e2e -go 1.25.3 +go 1.25.4 replace github.com/hashicorp/consul => ./consul diff --git a/internal/tools/proto-gen-rpc-glue/go.mod b/internal/tools/proto-gen-rpc-glue/go.mod index dbd1d8390372..c7310cc62cee 100644 --- a/internal/tools/proto-gen-rpc-glue/go.mod +++ b/internal/tools/proto-gen-rpc-glue/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue -go 1.25.3 +go 1.25.4 require github.com/stretchr/testify v1.8.4 diff --git a/internal/tools/protoc-gen-consul-rate-limit/go.mod b/internal/tools/protoc-gen-consul-rate-limit/go.mod index cfa722fffd88..f6578e8adbb9 100644 --- a/internal/tools/protoc-gen-consul-rate-limit/go.mod +++ b/internal/tools/protoc-gen-consul-rate-limit/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/internal/tools/protoc-gen-consul-rate-limit -go 1.25.3 +go 1.25.4 replace github.com/hashicorp/consul/proto-public => ../../../proto-public diff --git a/proto-public/go.mod b/proto-public/go.mod index 93de490a6e59..24cd78461025 100644 --- a/proto-public/go.mod +++ b/proto-public/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/proto-public -go 1.25.3 +go 1.25.4 require ( google.golang.org/grpc v1.75.0 diff --git a/sdk/go.mod b/sdk/go.mod index a017e5fd90f9..36b29f139b7f 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/sdk -go 1.25.3 +go 1.25.4 require ( github.com/hashicorp/go-cleanhttp v0.5.2 diff --git a/test-integ/go.mod b/test-integ/go.mod index ec405ab573f0..233c0957db86 100644 --- a/test-integ/go.mod +++ b/test-integ/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/test-integ -go 1.25.3 +go 1.25.4 require ( github.com/google/go-cmp v0.7.0 diff --git a/test/integration/connect/envoy/test-sds-server/go.mod b/test/integration/connect/envoy/test-sds-server/go.mod index c21b38e483dc..54d654a34208 100644 --- a/test/integration/connect/envoy/test-sds-server/go.mod +++ b/test/integration/connect/envoy/test-sds-server/go.mod @@ -1,6 +1,6 @@ module test-sds-server -go 1.25.3 +go 1.25.4 require ( github.com/envoyproxy/go-control-plane v0.13.4 diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 9fd00bc8b8e2..8ca8d241a5c0 100644 --- 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.25.3 +go 1.25.4 require ( fortio.org/fortio v1.54.0 diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod index fa5c261c2132..d1e6bb1b91df 100644 --- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod +++ b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.3 +go 1.25.4 require github.com/tetratelabs/proxy-wasm-go-sdk v0.21.0 diff --git a/testing/deployer/go.mod b/testing/deployer/go.mod index 725b9a5b7e7f..31a398472bbc 100644 --- a/testing/deployer/go.mod +++ b/testing/deployer/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/testing/deployer -go 1.25.3 +go 1.25.4 require ( github.com/avast/retry-go v3.0.0+incompatible diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod index 0d86d4a2ea10..0abfa2743bda 100644 --- a/troubleshoot/go.mod +++ b/troubleshoot/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/troubleshoot -go 1.25.3 +go 1.25.4 replace ( github.com/hashicorp/consul/api => ../api