Update the api & envoyextensions

hashicorp · Dec 23, 2024 · 1401f40 · 1401f40
1 parent 3bba4b2
commit 1401f40
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -43,8 +43,8 @@ require (
 	github.com/hashi-derek/grpc-proxy v0.0.0-20231207191910-191266484d75
 	github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706
 	github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69
-	github.com/hashicorp/consul/api v1.29.4
-	github.com/hashicorp/consul/envoyextensions v0.7.3
+	github.com/hashicorp/consul/api v1.31.0
+	github.com/hashicorp/consul/envoyextensions v0.7.7
 	github.com/hashicorp/consul/proto-public v0.6.2
 	github.com/hashicorp/consul/sdk v0.16.1
 	github.com/hashicorp/consul/troubleshoot v0.7.1

diff --git a/test-integ/go.mod b/test-integ/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.5
 
 require (
 	github.com/google/go-cmp v0.6.0
-	github.com/hashicorp/consul/api v1.29.4
+	github.com/hashicorp/consul/api v1.31.0
 	github.com/hashicorp/consul/proto-public v0.6.2
 	github.com/hashicorp/consul/sdk v0.16.1
 	github.com/hashicorp/consul/test/integration/consul-container v0.0.0-20230628201853-bdf4fad7c5a5

diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/evanphx/json-patch v4.12.0+incompatible
 	github.com/go-jose/go-jose/v3 v3.0.3
 	github.com/hashicorp/consul v1.16.1
-	github.com/hashicorp/consul/api v1.29.4
-	github.com/hashicorp/consul/envoyextensions v0.7.3
+	github.com/hashicorp/consul/api v1.31.0
+	github.com/hashicorp/consul/envoyextensions v0.7.7
 	github.com/hashicorp/consul/sdk v0.16.1
 	github.com/hashicorp/consul/testing/deployer v0.0.0-20230811171106-4a0afb5d1373
 	github.com/hashicorp/go-cleanhttp v0.5.2

diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod
@@ -2,12 +2,12 @@ module github.com/hashicorp/consul/troubleshoot
 
 go 1.19
 
-replace (
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/envoyextensions => ../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-)
+//replace (
+//	github.com/hashicorp/consul/api => ../api
+//	github.com/hashicorp/consul/envoyextensions => ../envoyextensions
+//	github.com/hashicorp/consul/proto-public => ../proto-public
+//	github.com/hashicorp/consul/sdk => ../sdk
+//)
 
 exclude (
 	github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided
@@ -23,8 +23,8 @@ retract (
 require (
 	github.com/envoyproxy/go-control-plane v0.12.0
 	github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e
-	github.com/hashicorp/consul/api v1.29.4
-	github.com/hashicorp/consul/envoyextensions v0.7.3
+	github.com/hashicorp/consul/api v1.31.0
+	github.com/hashicorp/consul/envoyextensions v0.7.7
 	github.com/hashicorp/consul/sdk v0.16.1
 	github.com/stretchr/testify v1.8.4
 	google.golang.org/protobuf v1.33.0

diff --git a/troubleshoot/go.sum b/troubleshoot/go.sum
@@ -61,6 +61,12 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/hashicorp/consul/api v1.31.0 h1:32BUNLembeSRek0G/ZAM6WNfdEwYdYo8oQ4+JoqGkNQ=
+github.com/hashicorp/consul/api v1.31.0/go.mod h1:2ZGIiXM3A610NmDULmCHd/aqBJj8CkMfOhswhOafxRg=
+github.com/hashicorp/consul/envoyextensions v0.7.7 h1:4vTkYLsmknHqtzw3Zf74FJbLeg5flIjIN77A6FBVBUA=
+github.com/hashicorp/consul/envoyextensions v0.7.7/go.mod h1:tOlLYi2UgCDg4x6qhe+O9Kz4o6SQ7E8fRFxCUKH4pkk=
+github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
+github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=