From 74a4aac0712ce7526f00c2ca586dd6a4c63dae01 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 19 Jul 2023 20:35:24 -0500 Subject: [PATCH] Backport of Update submodules to latest following 1.16.0 into release/1.16.x (#18198) Update submodules to latest following 1.16.0 Align all our internal use of submodules on the latest versions. Manual backport of 235d9c5ca5bccdad2e853f0ac052e25efdef1ca5. --- api/go.mod | 2 +- envoyextensions/go.mod | 4 ++-- envoyextensions/go.sum | 4 ++-- go.mod | 10 +++++----- test/integration/consul-container/go.mod | 6 +++--- troubleshoot/go.mod | 4 ++-- troubleshoot/go.sum | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/go.mod b/api/go.mod index 8a84a99b8..deff04e5f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -6,7 +6,7 @@ replace github.com/hashicorp/consul/sdk => ../sdk require ( github.com/google/go-cmp v0.5.9 - github.com/hashicorp/consul/sdk v0.14.0-rc1 + github.com/hashicorp/consul/sdk v0.14.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-hclog v1.5.0 github.com/hashicorp/go-rootcerts v1.0.2 diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod index 91141d48b..2f28501f0 100644 --- a/envoyextensions/go.mod +++ b/envoyextensions/go.mod @@ -6,8 +6,8 @@ replace github.com/hashicorp/consul/api => ../api require ( github.com/envoyproxy/go-control-plane v0.11.0 - github.com/hashicorp/consul/api v1.22.0-rc1 - github.com/hashicorp/consul/sdk v0.14.0-rc1 + github.com/hashicorp/consul/api v1.22.0 + github.com/hashicorp/consul/sdk v0.14.0 github.com/hashicorp/go-hclog v1.5.0 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-version v1.2.1 diff --git a/envoyextensions/go.sum b/envoyextensions/go.sum index 7eb7093a4..d299b764a 100644 --- a/envoyextensions/go.sum +++ b/envoyextensions/go.sum @@ -61,8 +61,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/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/sdk v0.14.0-rc1 h1:PuETOfN0uxl28i0Pq6rK7TBCrIl7psMbL0YTSje4KvM= -github.com/hashicorp/consul/sdk v0.14.0-rc1/go.mod h1:gHYeuDa0+0qRAD6Wwr6yznMBvBwHKoxSBoW5l73+saE= +github.com/hashicorp/consul/sdk v0.14.0 h1:Hly+BMNMssVzoWddbBnBFi3W+Fzytvm0haSkihhj3GU= +github.com/hashicorp/consul/sdk v0.14.0/go.mod h1:gHYeuDa0+0qRAD6Wwr6yznMBvBwHKoxSBoW5l73+saE= 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 2e391e27e..9663a2a9f 100644 --- a/go.mod +++ b/go.mod @@ -38,11 +38,11 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 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.22.0-rc1 - github.com/hashicorp/consul/envoyextensions v0.3.0-rc1 - github.com/hashicorp/consul/proto-public v0.4.0-rc1 - github.com/hashicorp/consul/sdk v0.14.0-rc1 - github.com/hashicorp/consul/troubleshoot v0.3.0-rc1 + github.com/hashicorp/consul/api v1.22.0 + github.com/hashicorp/consul/envoyextensions v0.3.0 + github.com/hashicorp/consul/proto-public v0.4.0 + github.com/hashicorp/consul/sdk v0.14.0 + github.com/hashicorp/consul/troubleshoot v0.3.0 github.com/hashicorp/go-bexpr v0.1.2 github.com/hashicorp/go-checkpoint v0.5.0 github.com/hashicorp/go-cleanhttp v0.5.2 diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 6b9432f35..a76769b43 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -8,9 +8,9 @@ require ( github.com/docker/docker v23.0.6+incompatible github.com/docker/go-connections v0.4.0 github.com/go-jose/go-jose/v3 v3.0.0 - github.com/hashicorp/consul/api v1.22.0-rc1 - github.com/hashicorp/consul/envoyextensions v0.3.0-rc1 - github.com/hashicorp/consul/sdk v0.14.0-rc1 + github.com/hashicorp/consul/api v1.22.0 + github.com/hashicorp/consul/envoyextensions v0.3.0 + github.com/hashicorp/consul/sdk v0.14.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-uuid v1.0.3 diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod index fc3792932..cd97de4e1 100644 --- a/troubleshoot/go.mod +++ b/troubleshoot/go.mod @@ -14,8 +14,8 @@ exclude ( require ( github.com/envoyproxy/go-control-plane v0.11.0 github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e - github.com/hashicorp/consul/api v1.22.0-rc1 - github.com/hashicorp/consul/envoyextensions v0.3.0-rc1 + github.com/hashicorp/consul/api v1.22.0 + github.com/hashicorp/consul/envoyextensions v0.3.0 github.com/stretchr/testify v1.8.3 google.golang.org/protobuf v1.30.0 ) diff --git a/troubleshoot/go.sum b/troubleshoot/go.sum index e454fbd37..490e0f892 100644 --- a/troubleshoot/go.sum +++ b/troubleshoot/go.sum @@ -161,7 +161,7 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= -github.com/hashicorp/consul/sdk v0.14.0-rc1 h1:PuETOfN0uxl28i0Pq6rK7TBCrIl7psMbL0YTSje4KvM= +github.com/hashicorp/consul/sdk v0.14.0 h1:Hly+BMNMssVzoWddbBnBFi3W+Fzytvm0haSkihhj3GU= 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=