From 15aa42c2e4e6da5a9ece924e09dbfdf903f3f9ab Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 23 Dec 2024 23:51:36 +0530 Subject: [PATCH 1/5] Update api versions envoyextensions --- envoyextensions/go.mod | 2 +- envoyextensions/go.sum | 2 ++ go.mod | 2 +- test-integ/go.mod | 2 +- test/integration/consul-container/go.mod | 2 +- troubleshoot/go.mod | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index 9970e5d71f65..e7b3190af0dd 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -13,7 +13,7 @@ retract v0.7.2 // tag was mutated require ( github.com/envoyproxy/go-control-plane v0.12.0 github.com/google/go-cmp v0.5.9 - github.com/hashicorp/consul/api v1.29.4 + github.com/hashicorp/consul/api v1.31.0 github.com/hashicorp/consul/sdk v0.16.1 github.com/hashicorp/go-hclog v1.5.0 github.com/hashicorp/go-multierror v1.1.1 diff --git a/envoyextensions/go.sum b/envoyextensions/go.sum index d29e39ebe83f..d09cd7be6d38 100644 --- a/envoyextensions/go.sum +++ b/envoyextensions/go.sum @@ -60,6 +60,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= +github.com/hashicorp/consul/api v1.31.0/go.mod h1:2ZGIiXM3A610NmDULmCHd/aqBJj8CkMfOhswhOafxRg= 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= diff --git a/go.mod b/go.mod index 13d0e5b75e1c..82b72659634b 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ 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/api v1.31.0 github.com/hashicorp/consul/envoyextensions v0.7.3 github.com/hashicorp/consul/proto-public v0.6.2 github.com/hashicorp/consul/sdk v0.16.1 diff --git a/test-integ/go.mod b/test-integ/go.mod index c7b2e9907f92..e75dc6a5bcdd 100644 --- 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 index 20f5a0d0926f..17560fc011cf 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -12,7 +12,7 @@ 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/api v1.31.0 github.com/hashicorp/consul/envoyextensions v0.7.3 github.com/hashicorp/consul/sdk v0.16.1 github.com/hashicorp/consul/testing/deployer v0.0.0-20230811171106-4a0afb5d1373 diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod index 753fd9e09955..9eaba0c55b96 100644 --- a/troubleshoot/go.mod +++ b/troubleshoot/go.mod @@ -23,7 +23,7 @@ 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/api v1.31.0 github.com/hashicorp/consul/envoyextensions v0.7.3 github.com/hashicorp/consul/sdk v0.16.1 github.com/stretchr/testify v1.8.4 From 739beab4dea98f6f1284ff831d0319f16aefe443 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 24 Dec 2024 01:01:40 +0530 Subject: [PATCH 2/5] Update go.mod --- envoyextensions/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index e7b3190af0dd..b2e48adf80ea 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -3,7 +3,7 @@ module github.com/hashicorp/consul/envoyextensions go 1.20 replace ( - github.com/hashicorp/consul/api => ../api + // github.com/hashicorp/consul/api => ../api github.com/hashicorp/consul/proto-public => ../proto-public github.com/hashicorp/consul/sdk => ../sdk ) From a8f7c748519b6871145bb4fa96bb4480c6324e4d Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 24 Dec 2024 01:03:13 +0530 Subject: [PATCH 3/5] Update go.mod --- envoyextensions/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index b2e48adf80ea..e7b3190af0dd 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -3,7 +3,7 @@ module github.com/hashicorp/consul/envoyextensions go 1.20 replace ( - // github.com/hashicorp/consul/api => ../api + github.com/hashicorp/consul/api => ../api github.com/hashicorp/consul/proto-public => ../proto-public github.com/hashicorp/consul/sdk => ../sdk ) From ef79edbe09a2ef8fa9b06c1f31110df259133e3b Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 24 Dec 2024 01:15:02 +0530 Subject: [PATCH 4/5] Update go.sum --- envoyextensions/go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoyextensions/go.sum b/envoyextensions/go.sum index d09cd7be6d38..dac2b59f6dbd 100644 --- a/envoyextensions/go.sum +++ b/envoyextensions/go.sum @@ -60,7 +60,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= +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/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= From 6e7a001b42dac4cc09781f30c83091f7fe50fad6 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 24 Dec 2024 01:26:47 +0530 Subject: [PATCH 5/5] Added the missed change --- envoyextensions/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index e7b3190af0dd..b2e48adf80ea 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -3,7 +3,7 @@ module github.com/hashicorp/consul/envoyextensions go 1.20 replace ( - github.com/hashicorp/consul/api => ../api + // github.com/hashicorp/consul/api => ../api github.com/hashicorp/consul/proto-public => ../proto-public github.com/hashicorp/consul/sdk => ../sdk )