From b8b37c2357aabcecd81d8f49bf8680c54de366aa Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 6 Feb 2023 09:14:35 -0800 Subject: [PATCH] refactor: remove troubleshoot module dependency on consul top level module (#16162) Ensure nothing in the troubleshoot go module depends on consul's top level module. This is so we can import troubleshoot into consul-k8s and not import all of consul. * turns troubleshoot into a go module [authored by @curtbushko] * gets the envoy protos into the troubleshoot module [authored by @curtbushko] * adds a new go module `envoyextensions` which has xdscommon and extensioncommon folders that both the xds package and the troubleshoot package can import * adds testing and linting for the new go modules * moves the unit tests in `troubleshoot/validateupstream` that depend on proxycfg/xds into the xds package, with a comment describing why those tests cannot be in the troubleshoot package * fixes all the imports everywhere as a result of these changes Co-authored-by: Curt Bushko --- .circleci/config.yml | 20 ++ agent/agent_endpoint.go | 4 +- agent/agent_endpoint_test.go | 6 +- .../builtin/aws-lambda/aws_lambda.go | 2 +- .../builtin/aws-lambda/aws_lambda_test.go | 8 +- agent/envoyextensions/builtin/lua/lua.go | 2 +- agent/envoyextensions/builtin/lua/lua_test.go | 2 +- .../envoyextensions/registered_extensions.go | 2 +- agent/xds/clusters.go | 2 +- agent/xds/clusters_test.go | 7 +- agent/xds/delta.go | 2 +- agent/xds/delta_envoy_extender_oss_test.go | 7 +- agent/xds/delta_test.go | 4 +- agent/xds/endpoints.go | 2 +- agent/xds/endpoints_test.go | 7 +- agent/xds/extensionruntime/runtime_config.go | 8 +- .../runtime_config_oss_test.go | 12 +- agent/xds/listeners.go | 2 +- agent/xds/listeners_test.go | 7 +- agent/xds/resources.go | 2 +- agent/xds/resources_test.go | 7 +- agent/xds/routes_test.go | 7 +- agent/xds/server.go | 2 +- agent/xds/testing.go | 7 +- .../testdata/test-leaf-cert.golden | 0 .../testdata/test-leaf-key.golden | 0 .../testdata/test-root-cert.golden | 0 .../validateupstream_test.go | 89 ++--- agent/xds/xds_protocol_helpers_test.go | 2 +- .../scripts/envoy-library-references.sh | 24 +- command/connect/envoy/envoy.go | 12 +- command/connect/envoy/envoy_test.go | 28 +- .../troubleshoot/proxy/troubleshoot_proxy.go | 2 +- .../upstreams/troubleshoot_upstreams.go | 2 +- .../extensioncommon/basic_envoy_extender.go | 2 +- .../extensioncommon/envoy_extender.go | 2 +- .../extensioncommon/runtime_config.go | 2 +- .../extensioncommon/runtime_config_test.go | 2 +- envoyextensions/go.mod | 41 +++ envoyextensions/go.sum | 247 +++++++++++++ .../xdscommon/envoy_versioning.go | 6 +- .../xdscommon/envoy_versioning_test.go | 0 .../xdscommon}/proxysupport.go | 2 +- .../xdscommon}/proxysupport_test.go | 2 +- .../xdscommon/xdscommon.go | 0 go.mod | 8 +- go.sum | 6 +- troubleshoot/go.mod | 57 +++ troubleshoot/go.sum | 327 ++++++++++++++++++ troubleshoot/{ => proxy}/certs.go | 5 +- troubleshoot/{ => proxy}/stats.go | 0 .../testdata}/clusters.json | 0 .../testdata}/config.json | 0 troubleshoot/proxy/troubleshoot_proxy.go | 122 +++++++ troubleshoot/proxy/utils.go | 102 ++++++ .../validateupstream.go | 35 +- troubleshoot/proxy/validateupstream_test.go | 44 +++ troubleshoot/proxy/z_xds_packages.go | 312 +++++++++++++++++ troubleshoot/troubleshoot_proxy.go | 76 ---- troubleshoot/utils.go | 36 -- .../validate/validate.go | 33 +- .../validate/validate_test.go | 35 +- 62 files changed, 1483 insertions(+), 311 deletions(-) rename {troubleshoot/validateupstream => agent/xds/validateupstream-test}/testdata/test-leaf-cert.golden (100%) rename {troubleshoot/validateupstream => agent/xds/validateupstream-test}/testdata/test-leaf-key.golden (100%) rename {troubleshoot/validateupstream => agent/xds/validateupstream-test}/testdata/test-root-cert.golden (100%) rename {troubleshoot/validateupstream => agent/xds/validateupstream-test}/validateupstream_test.go (81%) rename {agent/envoyextensions => envoyextensions}/extensioncommon/basic_envoy_extender.go (99%) rename {agent/envoyextensions => envoyextensions}/extensioncommon/envoy_extender.go (93%) rename {agent/envoyextensions => envoyextensions}/extensioncommon/runtime_config.go (97%) rename {agent/envoyextensions => envoyextensions}/extensioncommon/runtime_config_test.go (95%) create mode 100644 envoyextensions/go.mod create mode 100644 envoyextensions/go.sum rename {agent/xds => envoyextensions}/xdscommon/envoy_versioning.go (91%) rename {agent/xds => envoyextensions}/xdscommon/envoy_versioning_test.go (100%) rename {agent/xds/proxysupport => envoyextensions/xdscommon}/proxysupport.go (98%) rename {agent/xds/proxysupport => envoyextensions/xdscommon}/proxysupport_test.go (97%) rename {agent/xds => envoyextensions}/xdscommon/xdscommon.go (100%) create mode 100644 troubleshoot/go.mod create mode 100644 troubleshoot/go.sum rename troubleshoot/{ => proxy}/certs.go (89%) rename troubleshoot/{ => proxy}/stats.go (100%) rename troubleshoot/{validateupstream/testdata/validateupstream => proxy/testdata}/clusters.json (100%) rename troubleshoot/{validateupstream/testdata/validateupstream => proxy/testdata}/config.json (100%) create mode 100644 troubleshoot/proxy/troubleshoot_proxy.go create mode 100644 troubleshoot/proxy/utils.go rename troubleshoot/{validateupstream => proxy}/validateupstream.go (86%) create mode 100644 troubleshoot/proxy/validateupstream_test.go create mode 100644 troubleshoot/proxy/z_xds_packages.go delete mode 100644 troubleshoot/troubleshoot_proxy.go delete mode 100644 troubleshoot/utils.go rename {agent/envoyextensions/builtin => troubleshoot}/validate/validate.go (90%) rename {agent/envoyextensions/builtin => troubleshoot}/validate/validate_test.go (91%) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7449b9013..f5cd726616 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -229,6 +229,14 @@ jobs: name: lint sdk working_directory: sdk command: *lintcmd + - run: + name: lint envoyextensions + working_directory: envoyextensions + command: *lintcmd + - run: + name: lint troubleshoot + working_directory: troubleshoot + command: *lintcmd - run: name: lint container tests working_directory: test/integration/consul-container @@ -1099,6 +1107,18 @@ workflows: - dev-build: *filter-ignore-non-go-branches - go-test: requires: [dev-build] + - go-test-lib: + name: "go-test-envoyextensions" + path: envoyextensions + go-version: "1.19" + requires: [dev-build] + <<: *filter-ignore-non-go-branches + - go-test-lib: + name: "go-test-troubleshoot" + path: troubleshoot + go-version: "1.19" + requires: [dev-build] + <<: *filter-ignore-non-go-branches - go-test-lib: name: "go-test-api go1.18" path: api diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go index fbef537c18..c8c78f7d79 100644 --- a/agent/agent_endpoint.go +++ b/agent/agent_endpoint.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" "github.com/mitchellh/hashstructure" @@ -24,7 +25,6 @@ import ( "github.com/hashicorp/consul/agent/debug" "github.com/hashicorp/consul/agent/structs" token_store "github.com/hashicorp/consul/agent/token" - "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/ipaddr" "github.com/hashicorp/consul/lib" @@ -88,7 +88,7 @@ func (s *HTTPHandlers) AgentSelf(resp http.ResponseWriter, req *http.Request) (i if s.agent.xdsServer != nil { xds = &XDSSelf{ SupportedProxies: map[string][]string{ - "envoy": proxysupport.EnvoyVersions, + "envoy": xdscommon.EnvoyVersions, }, // Prefer the TLS port. See comment on the XDSSelf struct for details. Port: s.agent.config.GRPCTLSPort, diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go index c16e815e14..d582f3ebac 100644 --- a/agent/agent_endpoint_test.go +++ b/agent/agent_endpoint_test.go @@ -18,6 +18,7 @@ import ( "time" "github.com/armon/go-metrics" + "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-uuid" "github.com/hashicorp/serf/serf" @@ -37,8 +38,7 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/token" tokenStore "github.com/hashicorp/consul/agent/token" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil/retry" @@ -1508,7 +1508,7 @@ func TestAgent_Self(t *testing.T) { if tc.expectXDS { require.NotNil(t, val.XDS, "xds component missing when gRPC is enabled") require.Equal(t, - map[string][]string{"envoy": proxysupport.EnvoyVersions}, + map[string][]string{"envoy": xdscommon.EnvoyVersions}, val.XDS.SupportedProxies, ) require.Equal(t, a.Config.GRPCTLSPort, val.XDS.Ports.TLS) diff --git a/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go b/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go index 34029759ec..bcff99a638 100644 --- a/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go +++ b/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go @@ -17,8 +17,8 @@ import ( "github.com/mitchellh/mapstructure" pstruct "google.golang.org/protobuf/types/known/structpb" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/hashicorp/go-multierror" ) diff --git a/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go b/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go index d009af646c..f0ac9c1e7c 100644 --- a/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go +++ b/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go @@ -18,8 +18,8 @@ import ( "google.golang.org/protobuf/types/known/anypb" pstruct "google.golang.org/protobuf/types/known/structpb" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/hashicorp/consul/proto/prototest" ) @@ -67,7 +67,7 @@ func TestConstructor(t *testing.T) { svc := api.CompoundServiceName{Name: "svc"} ext := extensioncommon.RuntimeConfig{ ServiceName: svc, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ svc: {OutgoingProxyKind: kind}, }, EnvoyExtension: api.EnvoyExtension{ @@ -96,7 +96,7 @@ func TestCanApply(t *testing.T) { require.False(t, a.CanApply(&extensioncommon.RuntimeConfig{ Kind: api.ServiceKindConnectProxy, ServiceName: api.CompoundServiceName{Name: "s1"}, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ {Name: "s1"}: { OutgoingProxyKind: api.ServiceKindTerminatingGateway, }, @@ -105,7 +105,7 @@ func TestCanApply(t *testing.T) { require.True(t, a.CanApply(&extensioncommon.RuntimeConfig{ Kind: api.ServiceKindConnectProxy, ServiceName: api.CompoundServiceName{Name: "s1"}, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ {Name: "s1"}: { OutgoingProxyKind: api.ServiceKindConnectProxy, }, diff --git a/agent/envoyextensions/builtin/lua/lua.go b/agent/envoyextensions/builtin/lua/lua.go index d587d120df..76c802f640 100644 --- a/agent/envoyextensions/builtin/lua/lua.go +++ b/agent/envoyextensions/builtin/lua/lua.go @@ -10,8 +10,8 @@ import ( envoy_lua_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/lua/v3" envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" envoy_resource_v3 "github.com/envoyproxy/go-control-plane/pkg/resource/v3" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/hashicorp/go-multierror" "github.com/mitchellh/mapstructure" ) diff --git a/agent/envoyextensions/builtin/lua/lua_test.go b/agent/envoyextensions/builtin/lua/lua_test.go index 665638dc52..f67de30600 100644 --- a/agent/envoyextensions/builtin/lua/lua_test.go +++ b/agent/envoyextensions/builtin/lua/lua_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" ) func TestConstructor(t *testing.T) { diff --git a/agent/envoyextensions/registered_extensions.go b/agent/envoyextensions/registered_extensions.go index b729cd4584..c765df7c83 100644 --- a/agent/envoyextensions/registered_extensions.go +++ b/agent/envoyextensions/registered_extensions.go @@ -5,8 +5,8 @@ import ( awslambda "github.com/hashicorp/consul/agent/envoyextensions/builtin/aws-lambda" "github.com/hashicorp/consul/agent/envoyextensions/builtin/lua" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/hashicorp/go-multierror" ) diff --git a/agent/xds/clusters.go b/agent/xds/clusters.go index 69d3cc7f47..35be5f5988 100644 --- a/agent/xds/clusters.go +++ b/agent/xds/clusters.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/proto/pbpeering" ) diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go index c3813c722a..e2269dc7ff 100644 --- a/agent/xds/clusters_test.go +++ b/agent/xds/clusters_test.go @@ -16,8 +16,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/types" ) @@ -768,8 +767,8 @@ func TestClustersFromSnapshot(t *testing.T) { }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/delta.go b/agent/xds/delta.go index 416fdff8b4..082fca3ccb 100644 --- a/agent/xds/delta.go +++ b/agent/xds/delta.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/extensionruntime" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/logging" "github.com/hashicorp/consul/version" ) diff --git a/agent/xds/delta_envoy_extender_oss_test.go b/agent/xds/delta_envoy_extender_oss_test.go index cd548c41df..97a610fd4c 100644 --- a/agent/xds/delta_envoy_extender_oss_test.go +++ b/agent/xds/delta_envoy_extender_oss_test.go @@ -21,9 +21,8 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/extensionruntime" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" ) @@ -211,8 +210,8 @@ end`, }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/delta_test.go b/agent/xds/delta_test.go index d9b0969d1d..23d60198bb 100644 --- a/agent/xds/delta_test.go +++ b/agent/xds/delta_test.go @@ -10,6 +10,7 @@ import ( "github.com/armon/go-metrics" envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" + "github.com/hashicorp/consul/api" "github.com/stretchr/testify/require" rpcstatus "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc/codes" @@ -20,8 +21,7 @@ import ( "github.com/hashicorp/consul/agent/grpc-external/limiter" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/xdscommon" - "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/version" ) diff --git a/agent/xds/endpoints.go b/agent/xds/endpoints.go index dd22f1c349..364f9a674f 100644 --- a/agent/xds/endpoints.go +++ b/agent/xds/endpoints.go @@ -8,7 +8,7 @@ import ( envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/go-bexpr" "google.golang.org/protobuf/proto" diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go index d87abb5b80..e43865495a 100644 --- a/agent/xds/endpoints_test.go +++ b/agent/xds/endpoints_test.go @@ -15,8 +15,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" ) @@ -499,8 +498,8 @@ func TestEndpointsFromSnapshot(t *testing.T) { }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/extensionruntime/runtime_config.go b/agent/xds/extensionruntime/runtime_config.go index 439a233fce..044cc215c6 100644 --- a/agent/xds/extensionruntime/runtime_config.go +++ b/agent/xds/extensionruntime/runtime_config.go @@ -2,15 +2,15 @@ package extensionruntime import ( "github.com/hashicorp/consul/agent/connect" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" ) func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.CompoundServiceName][]extensioncommon.RuntimeConfig { extensionsMap := make(map[api.CompoundServiceName][]api.EnvoyExtension) - upstreamMap := make(map[api.CompoundServiceName]extensioncommon.UpstreamData) + upstreamMap := make(map[api.CompoundServiceName]*extensioncommon.UpstreamData) var kind api.ServiceKind extensionConfigurationsMap := make(map[api.CompoundServiceName][]extensioncommon.RuntimeConfig) @@ -64,7 +64,7 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound outgoingKind = api.ServiceKindConnectProxy } - upstreamMap[compoundServiceName] = extensioncommon.UpstreamData{ + upstreamMap[compoundServiceName] = &extensioncommon.UpstreamData{ SNI: map[string]struct{}{sni: {}}, VIP: vipForService[compoundServiceName], EnvoyID: uid.EnvoyID(), @@ -110,7 +110,7 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound } } - upstreamMap[compoundServiceName] = extensioncommon.UpstreamData{ + upstreamMap[compoundServiceName] = &extensioncommon.UpstreamData{ SNI: snis, EnvoyID: envoyID.EnvoyID(), OutgoingProxyKind: api.ServiceKindTerminatingGateway, diff --git a/agent/xds/extensionruntime/runtime_config_oss_test.go b/agent/xds/extensionruntime/runtime_config_oss_test.go index d7bafb3b7a..62ce5f812c 100644 --- a/agent/xds/extensionruntime/runtime_config_oss_test.go +++ b/agent/xds/extensionruntime/runtime_config_oss_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" ) func TestGetRuntimeConfigurations_TerminatingGateway(t *testing.T) { @@ -52,7 +52,7 @@ func TestGetRuntimeConfigurations_TerminatingGateway(t *testing.T) { }, }, ServiceName: webService, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ apiService: { SNI: map[string]struct{}{ "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {}, @@ -156,7 +156,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) { }, }, ServiceName: dbService, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ dbService: { SNI: map[string]struct{}{ "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {}, @@ -176,7 +176,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) { }, }, ServiceName: dbService, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ dbService: { SNI: map[string]struct{}{ "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {}, @@ -204,7 +204,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) { }, }, ServiceName: dbService, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ dbService: { SNI: map[string]struct{}{ "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {}, @@ -224,7 +224,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) { }, }, ServiceName: dbService, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ dbService: { SNI: map[string]struct{}{ "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {}, diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index f6dd98edb3..a0268f0789 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -39,7 +39,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/accesslogs" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/lib" "github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/proto/pbpeering" diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go index c22e43c50e..fffe3dc342 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_test.go @@ -16,8 +16,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/types" ) @@ -889,8 +888,8 @@ func TestListenersFromSnapshot(t *testing.T) { }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/resources.go b/agent/xds/resources.go index 41b6adfe45..dd5eee7f2c 100644 --- a/agent/xds/resources.go +++ b/agent/xds/resources.go @@ -3,7 +3,7 @@ package xds import ( "fmt" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/go-hclog" "google.golang.org/protobuf/proto" diff --git a/agent/xds/resources_test.go b/agent/xds/resources_test.go index b27d3a528a..ad3c1b396c 100644 --- a/agent/xds/resources_test.go +++ b/agent/xds/resources_test.go @@ -10,14 +10,13 @@ import ( envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" "github.com/hashicorp/consul/agent/xds/testcommon" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/sdk/testutil" ) @@ -167,8 +166,8 @@ func TestAllResourcesFromSnapshot(t *testing.T) { tests = append(tests, getTrafficControlPeeringGoldenTestCases()...) tests = append(tests, getEnterpriseGoldenTestCases()...) - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go index c5e7b9ce7f..cec0f650c7 100644 --- a/agent/xds/routes_test.go +++ b/agent/xds/routes_test.go @@ -15,8 +15,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/sdk/testutil" ) @@ -189,8 +188,8 @@ func TestRoutesFromSnapshot(t *testing.T) { }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] - for _, envoyVersion := range proxysupport.EnvoyVersions { + latestEnvoyVersion := xdscommon.EnvoyVersions[0] + for _, envoyVersion := range xdscommon.EnvoyVersions { sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { diff --git a/agent/xds/server.go b/agent/xds/server.go index 6fc0f13e5b..ba1e911dbb 100644 --- a/agent/xds/server.go +++ b/agent/xds/server.go @@ -7,7 +7,7 @@ import ( "time" envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/armon/go-metrics" "github.com/armon/go-metrics/prometheus" diff --git a/agent/xds/testing.go b/agent/xds/testing.go index 90ea093c73..967a96e6ac 100644 --- a/agent/xds/testing.go +++ b/agent/xds/testing.go @@ -12,13 +12,12 @@ import ( envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/mitchellh/go-testing-interface" - status "google.golang.org/genproto/googleapis/rpc/status" + "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc" "google.golang.org/grpc/metadata" - - "github.com/hashicorp/consul/agent/xds/proxysupport" ) // TestADSDeltaStream mocks @@ -186,7 +185,7 @@ func (e *TestEnvoy) sendDeltaReq( stringVersion := e.EnvoyVersion if stringVersion == "" { - stringVersion = proxysupport.EnvoyVersions[0] + stringVersion = xdscommon.EnvoyVersions[0] } ev, valid := stringToEnvoyVersion(stringVersion) diff --git a/troubleshoot/validateupstream/testdata/test-leaf-cert.golden b/agent/xds/validateupstream-test/testdata/test-leaf-cert.golden similarity index 100% rename from troubleshoot/validateupstream/testdata/test-leaf-cert.golden rename to agent/xds/validateupstream-test/testdata/test-leaf-cert.golden diff --git a/troubleshoot/validateupstream/testdata/test-leaf-key.golden b/agent/xds/validateupstream-test/testdata/test-leaf-key.golden similarity index 100% rename from troubleshoot/validateupstream/testdata/test-leaf-key.golden rename to agent/xds/validateupstream-test/testdata/test-leaf-key.golden diff --git a/troubleshoot/validateupstream/testdata/test-root-cert.golden b/agent/xds/validateupstream-test/testdata/test-root-cert.golden similarity index 100% rename from troubleshoot/validateupstream/testdata/test-root-cert.golden rename to agent/xds/validateupstream-test/testdata/test-root-cert.golden diff --git a/troubleshoot/validateupstream/validateupstream_test.go b/agent/xds/validateupstream-test/validateupstream_test.go similarity index 81% rename from troubleshoot/validateupstream/validateupstream_test.go rename to agent/xds/validateupstream-test/validateupstream_test.go index 25cae6e486..1f27a32d3e 100644 --- a/troubleshoot/validateupstream/validateupstream_test.go +++ b/agent/xds/validateupstream-test/validateupstream_test.go @@ -1,22 +1,17 @@ -package validateupstream +package validateupstream_test import ( - "io" - "os" "testing" - envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds" "github.com/hashicorp/consul/agent/xds/testcommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/troubleshoot/proxy" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" - - "github.com/hashicorp/consul/agent/proxycfg" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/agent/xds/xdscommon" - "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/sdk/testutil" ) // TestValidateUpstreams only tests validation for listeners, routes, and clusters. Endpoints validation is done in a @@ -37,13 +32,13 @@ func TestValidateUpstreams(t *testing.T) { nodes := proxycfg.TestUpstreamNodes(t, "db") tests := []struct { - name string - create func(t testinf.T) *proxycfg.ConfigSnapshot - patcher func(*xdscommon.IndexedResources) *xdscommon.IndexedResources - err string - peer string - serviceName *api.CompoundServiceName - vip string + name string + create func(t testinf.T) *proxycfg.ConfigSnapshot + patcher func(*xdscommon.IndexedResources) *xdscommon.IndexedResources + err string + peer string + vip string + envoyID string }{ { name: "tcp-success", @@ -150,10 +145,9 @@ func TestValidateUpstreams(t *testing.T) { }, }, { - name: "non-eds", - create: proxycfg.TestConfigSnapshotPeering, - serviceName: &api.CompoundServiceName{Name: "payments"}, - peer: "cloud", + name: "non-eds", + create: proxycfg.TestConfigSnapshotPeering, + envoyID: "payments?peer=cloud", }, { name: "tproxy-success", @@ -184,9 +178,6 @@ func TestValidateUpstreams(t *testing.T) { create: func(t testinf.T) *proxycfg.ConfigSnapshot { return proxycfg.TestConfigSnapshotTransparentProxyHTTPUpstream(t, configEntriesForGoogleRedirect()...) }, - serviceName: &api.CompoundServiceName{ - Name: "google", - }, patcher: func(ir *xdscommon.IndexedResources) *xdscommon.IndexedResources { return ir }, @@ -197,16 +188,13 @@ func TestValidateUpstreams(t *testing.T) { create: func(t testinf.T) *proxycfg.ConfigSnapshot { return proxycfg.TestConfigSnapshotTransparentProxyHTTPUpstream(t, configEntriesForGoogleSplits()...) }, - serviceName: &api.CompoundServiceName{ - Name: "google", - }, patcher: func(ir *xdscommon.IndexedResources) *xdscommon.IndexedResources { return ir }, }, } - latestEnvoyVersion := proxysupport.EnvoyVersions[0] + latestEnvoyVersion := xdscommon.EnvoyVersions[0] sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(latestEnvoyVersion) require.NoError(t, err) for _, tt := range tests { @@ -229,17 +217,15 @@ func TestValidateUpstreams(t *testing.T) { if tt.patcher != nil { indexedResources = tt.patcher(indexedResources) } - serviceName := tt.serviceName - if serviceName == nil { - serviceName = &api.CompoundServiceName{ - Name: "db", - } + envoyID := tt.envoyID + vip := tt.vip + if envoyID == "" && vip == "" { + envoyID = "db" } - peer := tt.peer // This only tests validation for listeners, routes, and clusters. Endpoints validation is done in a top // level test that can parse the output of the /clusters endpoint. So for this test, we set clusters to nil. - err = Validate(indexedResources, *serviceName, peer, tt.vip, false, nil) + err = troubleshoot.Validate(indexedResources, envoyID, vip, false, nil) if len(tt.err) == 0 { require.NoError(t, err) @@ -251,39 +237,6 @@ func TestValidateUpstreams(t *testing.T) { } } -func TestValidate2(t *testing.T) { - indexedResources := getConfig(t) - clusters := getClusters(t) - err := Validate(indexedResources, service, "", "", true, clusters) - require.NoError(t, err) -} - -// TODO: Manually inspect the config and clusters files and hardcode the list of expected resource names for higher -// confidence in these functions. -func getConfig(t *testing.T) *xdscommon.IndexedResources { - file, err := os.Open("testdata/validateupstream/config.json") - require.NoError(t, err) - jsonBytes, err := io.ReadAll(file) - require.NoError(t, err) - indexedResources, err := ParseConfigDump(jsonBytes) - require.NoError(t, err) - return indexedResources -} - -func getClusters(t *testing.T) *envoy_admin_v3.Clusters { - file, err := os.Open("testdata/validateupstream/clusters.json") - require.NoError(t, err) - jsonBytes, err := io.ReadAll(file) - require.NoError(t, err) - clusters, err := ParseClusters(jsonBytes) - require.NoError(t, err) - return clusters -} - -var service = api.CompoundServiceName{ - Name: "backend", -} - func configEntriesForDBSplits() []structs.ConfigEntry { httpServiceDefaults := &structs.ServiceConfigEntry{ Kind: structs.ServiceDefaults, diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go index 36829f3e72..6b0fe4ed26 100644 --- a/agent/xds/xds_protocol_helpers_test.go +++ b/agent/xds/xds_protocol_helpers_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/grpc-external/limiter" - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" diff --git a/build-support/scripts/envoy-library-references.sh b/build-support/scripts/envoy-library-references.sh index 52f455053b..ac8f8a23e0 100644 --- a/build-support/scripts/envoy-library-references.sh +++ b/build-support/scripts/envoy-library-references.sh @@ -45,7 +45,7 @@ git checkout -b consul-temp "${LIBRARY_VERSION}" IFS=$'\n' candidates=($(find . -name *.pb.go -a -type f | sed 's@/[^/]*\.pb\.go$@@' | sort -u)) -echo "Generating a fresh ${OUTFILE} file..." +echo "Generating a fresh agent xds ${OUTFILE} file..." cat <<-EOF > "${OUTFILE}" // Code generated by envoy-library-references.sh. DO NOT EDIT. @@ -66,5 +66,27 @@ goimports -w "${OUTFILE}" mv -f "${OUTFILE}" ../../agent/xds ) +echo "Generating a fresh troubleshoot ${OUTFILE} file..." +cat <<-EOF > "${OUTFILE}" +// Code generated by envoy-library-references.sh. DO NOT EDIT. + +package troubleshoot + +import ( +EOF + +for cand in "${candidates[@]}"; do + import_name="${cand#./}" + echo " _ \"github.com/envoyproxy/go-control-plane/${import_name}\"" >> "${OUTFILE}" +done + +echo ")" >> "${OUTFILE}" + +goimports -w "${OUTFILE}" + +mv -f "${OUTFILE}" ../../troubleshoot/connect +) + + echo "tidying dependencies..." make go-mod-tidy diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 8bd27d4a86..84f2c71444 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -11,6 +11,7 @@ import ( "strings" "time" + "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-version" "github.com/mitchellh/cli" @@ -21,10 +22,9 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds" "github.com/hashicorp/consul/agent/xds/accesslogs" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/consul/api" proxyCmd "github.com/hashicorp/consul/command/connect/proxy" "github.com/hashicorp/consul/command/flags" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/hashicorp/consul/ipaddr" "github.com/hashicorp/consul/tlsutil" ) @@ -89,7 +89,7 @@ type cmd struct { const meshGatewayVal = "mesh" -var defaultEnvoyVersion = proxysupport.EnvoyVersions[0] +var defaultEnvoyVersion = xdscommon.EnvoyVersions[0] var supportedGateways = map[string]api.ServiceKind{ "mesh": api.ServiceKindMeshGateway, @@ -502,7 +502,7 @@ func (c *cmd) run(args []string) int { return 1 } - ok, err := checkEnvoyVersionCompatibility(v, proxysupport.UnsupportedEnvoyVersions) + ok, err := checkEnvoyVersionCompatibility(v, xdscommon.UnsupportedEnvoyVersions) if err != nil { c.UI.Warn("There was an error checking the compatibility of the envoy version: " + err.Error()) @@ -985,7 +985,7 @@ func checkEnvoyVersionCompatibility(envoyVersion string, unsupportedList []strin var cs strings.Builder // Add one to the max minor version so that we accept all patches - splitS := strings.Split(proxysupport.GetMaxEnvoyMinorVersion(), ".") + splitS := strings.Split(xdscommon.GetMaxEnvoyMinorVersion(), ".") minor, err := strconv.Atoi(splitS[1]) if err != nil { return false, err @@ -994,7 +994,7 @@ func checkEnvoyVersionCompatibility(envoyVersion string, unsupportedList []strin maxSupported := fmt.Sprintf("%s.%d", splitS[0], minor) // Build the constraint string, make sure that we are less than but not equal to maxSupported since we added 1 - cs.WriteString(fmt.Sprintf(">= %s, < %s", proxysupport.GetMinEnvoyMinorVersion(), maxSupported)) + cs.WriteString(fmt.Sprintf(">= %s, < %s", xdscommon.GetMinEnvoyMinorVersion(), maxSupported)) for _, s := range unsupportedList { cs.WriteString(fmt.Sprintf(", != %s", s)) } diff --git a/command/connect/envoy/envoy_test.go b/command/connect/envoy/envoy_test.go index bc2ba0fbb8..223eb2e130 100644 --- a/command/connect/envoy/envoy_test.go +++ b/command/connect/envoy/envoy_test.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/hashicorp/consul/envoyextensions/xdscommon" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -20,7 +21,6 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/agent/xds" - "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/sdk/testutil" ) @@ -1701,44 +1701,44 @@ func TestCheckEnvoyVersionCompatibility(t *testing.T) { }{ { name: "supported-using-proxy-support-defined", - envoyVersion: proxysupport.EnvoyVersions[1], - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + envoyVersion: xdscommon.EnvoyVersions[1], + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: true, }, { name: "supported-at-max", - envoyVersion: proxysupport.GetMaxEnvoyMinorVersion(), - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + envoyVersion: xdscommon.GetMaxEnvoyMinorVersion(), + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: true, }, { name: "supported-patch-higher", - envoyVersion: addNPatchVersion(proxysupport.EnvoyVersions[0], 1), - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + envoyVersion: addNPatchVersion(xdscommon.EnvoyVersions[0], 1), + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: true, }, { name: "not-supported-minor-higher", - envoyVersion: addNMinorVersion(proxysupport.EnvoyVersions[0], 1), - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + envoyVersion: addNMinorVersion(xdscommon.EnvoyVersions[0], 1), + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: false, }, { name: "not-supported-minor-lower", - envoyVersion: addNMinorVersion(proxysupport.EnvoyVersions[len(proxysupport.EnvoyVersions)-1], -1), - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + envoyVersion: addNMinorVersion(xdscommon.EnvoyVersions[len(xdscommon.EnvoyVersions)-1], -1), + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: false, }, { name: "not-supported-explicitly-unsupported-version", - envoyVersion: addNPatchVersion(proxysupport.EnvoyVersions[0], 1), - unsupportedList: []string{"1.23.1", addNPatchVersion(proxysupport.EnvoyVersions[0], 1)}, + envoyVersion: addNPatchVersion(xdscommon.EnvoyVersions[0], 1), + unsupportedList: []string{"1.23.1", addNPatchVersion(xdscommon.EnvoyVersions[0], 1)}, expectedSupport: false, }, { name: "error-bad-input", envoyVersion: "1.abc.3", - unsupportedList: proxysupport.UnsupportedEnvoyVersions, + unsupportedList: xdscommon.UnsupportedEnvoyVersions, expectedSupport: false, isErrorExpected: true, }, diff --git a/command/troubleshoot/proxy/troubleshoot_proxy.go b/command/troubleshoot/proxy/troubleshoot_proxy.go index 986a5d14c4..7986a4925e 100644 --- a/command/troubleshoot/proxy/troubleshoot_proxy.go +++ b/command/troubleshoot/proxy/troubleshoot_proxy.go @@ -7,7 +7,7 @@ import ( "os" "github.com/hashicorp/consul/command/flags" - troubleshoot "github.com/hashicorp/consul/troubleshoot" + troubleshoot "github.com/hashicorp/consul/troubleshoot/proxy" "github.com/mitchellh/cli" ) diff --git a/command/troubleshoot/upstreams/troubleshoot_upstreams.go b/command/troubleshoot/upstreams/troubleshoot_upstreams.go index 46b26135c7..65571b1fb6 100644 --- a/command/troubleshoot/upstreams/troubleshoot_upstreams.go +++ b/command/troubleshoot/upstreams/troubleshoot_upstreams.go @@ -7,7 +7,7 @@ import ( "os" "github.com/hashicorp/consul/command/flags" - troubleshoot "github.com/hashicorp/consul/troubleshoot" + troubleshoot "github.com/hashicorp/consul/troubleshoot/proxy" "github.com/mitchellh/cli" ) diff --git a/agent/envoyextensions/extensioncommon/basic_envoy_extender.go b/envoyextensions/extensioncommon/basic_envoy_extender.go similarity index 99% rename from agent/envoyextensions/extensioncommon/basic_envoy_extender.go rename to envoyextensions/extensioncommon/basic_envoy_extender.go index 82fc81e808..8c4726a4ef 100644 --- a/agent/envoyextensions/extensioncommon/basic_envoy_extender.go +++ b/envoyextensions/extensioncommon/basic_envoy_extender.go @@ -13,8 +13,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/hashicorp/consul/agent/xds/xdscommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/xdscommon" ) // BasicExtension is the interface that each user of BasicEnvoyExtender must implement. It diff --git a/agent/envoyextensions/extensioncommon/envoy_extender.go b/envoyextensions/extensioncommon/envoy_extender.go similarity index 93% rename from agent/envoyextensions/extensioncommon/envoy_extender.go rename to envoyextensions/extensioncommon/envoy_extender.go index ad40e82755..6345a7dc6e 100644 --- a/agent/envoyextensions/extensioncommon/envoy_extender.go +++ b/envoyextensions/extensioncommon/envoy_extender.go @@ -1,7 +1,7 @@ package extensioncommon import ( - "github.com/hashicorp/consul/agent/xds/xdscommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" ) // EnvoyExtender is the interface that all Envoy extensions must implement in order diff --git a/agent/envoyextensions/extensioncommon/runtime_config.go b/envoyextensions/extensioncommon/runtime_config.go similarity index 97% rename from agent/envoyextensions/extensioncommon/runtime_config.go rename to envoyextensions/extensioncommon/runtime_config.go index d52fb47345..564d450978 100644 --- a/agent/envoyextensions/extensioncommon/runtime_config.go +++ b/envoyextensions/extensioncommon/runtime_config.go @@ -34,7 +34,7 @@ type RuntimeConfig struct { // Upstreams will only be configured if the EnvoyExtension is being applied to an upstream. // If there are no Upstreams, then EnvoyExtension is being applied to the local service's resources. - Upstreams map[api.CompoundServiceName]UpstreamData + Upstreams map[api.CompoundServiceName]*UpstreamData // Kind is mode the local Envoy proxy is running in. For now, only connect proxy and // terminating gateways are supported. diff --git a/agent/envoyextensions/extensioncommon/runtime_config_test.go b/envoyextensions/extensioncommon/runtime_config_test.go similarity index 95% rename from agent/envoyextensions/extensioncommon/runtime_config_test.go rename to envoyextensions/extensioncommon/runtime_config_test.go index 3c66c35093..ef6dc3ca75 100644 --- a/agent/envoyextensions/extensioncommon/runtime_config_test.go +++ b/envoyextensions/extensioncommon/runtime_config_test.go @@ -13,7 +13,7 @@ func makeTestRuntimeConfig() RuntimeConfig { rc := RuntimeConfig{ Kind: api.ServiceKindConnectProxy, ServiceName: sn, - Upstreams: map[api.CompoundServiceName]UpstreamData{ + Upstreams: map[api.CompoundServiceName]*UpstreamData{ sn: { EnvoyID: "eid", OutgoingProxyKind: api.ServiceKindTerminatingGateway, diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod new file mode 100644 index 0000000000..4e46d1211d --- /dev/null +++ b/envoyextensions/go.mod @@ -0,0 +1,41 @@ +module github.com/hashicorp/consul/envoyextensions + +go 1.19 + +replace github.com/hashicorp/consul/api => ../api + +require ( + github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 + github.com/hashicorp/consul/api v1.18.0 + github.com/hashicorp/consul/sdk v0.13.0 + github.com/hashicorp/go-hclog v1.2.1 + github.com/hashicorp/go-multierror v1.1.1 + github.com/hashicorp/go-version v1.2.1 + github.com/stretchr/testify v1.7.2 + google.golang.org/protobuf v1.27.1 +) + +require ( + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect + github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect + github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/golang/protobuf v1.5.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/go-immutable-radix v1.0.0 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/serf v0.10.1 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/envoyextensions/go.sum b/envoyextensions/go.sum new file mode 100644 index 0000000000..bf542e8f1d --- /dev/null +++ b/envoyextensions/go.sum @@ -0,0 +1,247 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe h1:QJDJubh0OEcpeGjC7/8uF9tt4e39U/Ya1uyK+itnNPQ= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/sdk v0.13.0 h1:lce3nFlpv8humJL8rNrrGHYSKc3q+Kxfeg3Ii1m6ZWU= +github.com/hashicorp/consul/sdk v0.13.0/go.mod h1:0hs/l5fOVhJy/VdcoaNqUSi2AUs95eF5WKtv+EYIQqE= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw= +github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= +github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/agent/xds/xdscommon/envoy_versioning.go b/envoyextensions/xdscommon/envoy_versioning.go similarity index 91% rename from agent/xds/xdscommon/envoy_versioning.go rename to envoyextensions/xdscommon/envoy_versioning.go index d43e7267dc..3f9e9d2c6e 100644 --- a/agent/xds/xdscommon/envoy_versioning.go +++ b/envoyextensions/xdscommon/envoy_versioning.go @@ -4,15 +4,13 @@ import ( "fmt" envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - "github.com/hashicorp/consul/agent/xds/proxysupport" - "github.com/hashicorp/go-version" ) var ( // minSupportedVersion is the oldest mainline version we support. This should always be - // the zero'th point release of the last element of proxysupport.EnvoyVersions. - minSupportedVersion = version.Must(version.NewVersion(proxysupport.GetMinEnvoyMinorVersion())) + // the zero'th point release of the last element of xdscommon.EnvoyVersions. + minSupportedVersion = version.Must(version.NewVersion(GetMinEnvoyMinorVersion())) specificUnsupportedVersions = []unsupportedVersion{} ) diff --git a/agent/xds/xdscommon/envoy_versioning_test.go b/envoyextensions/xdscommon/envoy_versioning_test.go similarity index 100% rename from agent/xds/xdscommon/envoy_versioning_test.go rename to envoyextensions/xdscommon/envoy_versioning_test.go diff --git a/agent/xds/proxysupport/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go similarity index 98% rename from agent/xds/proxysupport/proxysupport.go rename to envoyextensions/xdscommon/proxysupport.go index 8f01eb7f0b..963e0dba0c 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/envoyextensions/xdscommon/proxysupport.go @@ -1,4 +1,4 @@ -package proxysupport +package xdscommon import "strings" diff --git a/agent/xds/proxysupport/proxysupport_test.go b/envoyextensions/xdscommon/proxysupport_test.go similarity index 97% rename from agent/xds/proxysupport/proxysupport_test.go rename to envoyextensions/xdscommon/proxysupport_test.go index 77b49fdb80..61f793c4df 100644 --- a/agent/xds/proxysupport/proxysupport_test.go +++ b/envoyextensions/xdscommon/proxysupport_test.go @@ -1,4 +1,4 @@ -package proxysupport +package xdscommon import ( "sort" diff --git a/agent/xds/xdscommon/xdscommon.go b/envoyextensions/xdscommon/xdscommon.go similarity index 100% rename from agent/xds/xdscommon/xdscommon.go rename to envoyextensions/xdscommon/xdscommon.go diff --git a/go.mod b/go.mod index 1292dbad27..0d9c26102c 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,10 @@ 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 + github.com/hashicorp/consul/troubleshoot => ./troubleshoot ) exclude ( @@ -34,8 +36,10 @@ require ( 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.18.0 + github.com/hashicorp/consul/envoyextensions v0.0.0-00010101000000-000000000000 github.com/hashicorp/consul/proto-public v0.2.1 github.com/hashicorp/consul/sdk v0.13.0 + github.com/hashicorp/consul/troubleshoot v0.0.0-00010101000000-000000000000 github.com/hashicorp/go-bexpr v0.1.2 github.com/hashicorp/go-checkpoint v0.5.0 github.com/hashicorp/go-cleanhttp v0.5.2 @@ -128,7 +132,7 @@ require ( github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect github.com/circonus-labs/circonusllhist v0.1.3 // indirect github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 // indirect github.com/digitalocean/godo v1.10.0 // indirect github.com/dimchansky/utfbom v1.1.0 // indirect @@ -188,7 +192,7 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect github.com/pierrec/lz4 v2.5.2+incompatible // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/posener/complete v1.2.3 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect diff --git a/go.sum b/go.sum index 1b9c518454..48af9ea61a 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,9 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decker502/dnspod-go v0.2.0/go.mod h1:qsurYu1FgxcDwfSwXJdLt4kRsBLZeosEb9uq4Sy+08g= github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 h1:lrWnAyy/F72MbxIxFUzKmcMCdt9Oi8RzpAxzTNQHD7o= github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= @@ -826,8 +827,9 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod new file mode 100644 index 0000000000..ebc0cb829b --- /dev/null +++ b/troubleshoot/go.mod @@ -0,0 +1,57 @@ +module github.com/hashicorp/consul/troubleshoot + +go 1.19 + +replace github.com/hashicorp/consul/api => ../api + +replace github.com/hashicorp/consul/envoyextensions => ../envoyextensions + +exclude ( + github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided + github.com/hashicorp/go-msgpack v1.1.6 // contains retractions but same as v1.1.5 +) + +require ( + github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 + github.com/hashicorp/consul/api v1.18.0 + github.com/hashicorp/consul/envoyextensions v0.0.0-00010101000000-000000000000 + github.com/hashicorp/go-multierror v1.1.1 + github.com/stretchr/testify v1.8.0 + google.golang.org/protobuf v1.28.1 +) + +require ( + github.com/armon/go-metrics v0.3.10 // indirect + github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect + github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.0 // indirect + github.com/google/go-cmp v0.5.8 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-hclog v1.2.1 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-msgpack v0.5.5 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-version v1.2.1 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/serf v0.10.1 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + go.opentelemetry.io/proto/otlp v0.7.0 // indirect + golang.org/x/net v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect + google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 // indirect + google.golang.org/grpc v1.49.0 // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/troubleshoot/go.sum b/troubleshoot/go.sum new file mode 100644 index 0000000000..d2e1e9a2b5 --- /dev/null +++ b/troubleshoot/go.sum @@ -0,0 +1,327 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/sdk v0.13.0 h1:lce3nFlpv8humJL8rNrrGHYSKc3q+Kxfeg3Ii1m6ZWU= +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= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw= +github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= +github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= +github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ= +google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/troubleshoot/certs.go b/troubleshoot/proxy/certs.go similarity index 89% rename from troubleshoot/certs.go rename to troubleshoot/proxy/certs.go index 1056fd69fc..0002587898 100644 --- a/troubleshoot/certs.go +++ b/troubleshoot/proxy/certs.go @@ -6,7 +6,6 @@ import ( envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" "google.golang.org/protobuf/encoding/protojson" ) @@ -19,13 +18,13 @@ func (t *Troubleshoot) validateCerts(certs *envoy_admin_v3.Certificates) error { for _, cert := range certs.GetCertificates() { for _, cacert := range cert.GetCaCert() { if now.After(cacert.GetExpirationTime().AsTime()) { - resultErr = multierror.Append(resultErr, errors.New("Ca cert is expired")) + resultErr = multierror.Append(resultErr, fmt.Errorf("Ca cert is expired")) } } for _, cc := range cert.GetCertChain() { if now.After(cc.GetExpirationTime().AsTime()) { - resultErr = multierror.Append(resultErr, errors.New("cert chain is expired")) + resultErr = multierror.Append(resultErr, fmt.Errorf("cert chain is expired")) } } } diff --git a/troubleshoot/stats.go b/troubleshoot/proxy/stats.go similarity index 100% rename from troubleshoot/stats.go rename to troubleshoot/proxy/stats.go diff --git a/troubleshoot/validateupstream/testdata/validateupstream/clusters.json b/troubleshoot/proxy/testdata/clusters.json similarity index 100% rename from troubleshoot/validateupstream/testdata/validateupstream/clusters.json rename to troubleshoot/proxy/testdata/clusters.json diff --git a/troubleshoot/validateupstream/testdata/validateupstream/config.json b/troubleshoot/proxy/testdata/config.json similarity index 100% rename from troubleshoot/validateupstream/testdata/validateupstream/config.json rename to troubleshoot/proxy/testdata/config.json diff --git a/troubleshoot/proxy/troubleshoot_proxy.go b/troubleshoot/proxy/troubleshoot_proxy.go new file mode 100644 index 0000000000..30f62c9af7 --- /dev/null +++ b/troubleshoot/proxy/troubleshoot_proxy.go @@ -0,0 +1,122 @@ +package troubleshoot + +import ( + "fmt" + "net" + + envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + "github.com/hashicorp/consul/api" + "github.com/hashicorp/go-multierror" + "google.golang.org/protobuf/proto" +) + +const ( + listeners string = "type.googleapis.com/envoy.admin.v3.ListenersConfigDump" + clusters string = "type.googleapis.com/envoy.admin.v3.ClustersConfigDump" + routes string = "type.googleapis.com/envoy.admin.v3.RoutesConfigDump" + endpoints string = "type.googleapis.com/envoy.admin.v3.EndpointsConfigDump" + bootstrap string = "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump" +) + +type Troubleshoot struct { + client *api.Client + envoyAddr net.IPAddr + envoyAdminPort string + + TroubleshootInfo +} + +type TroubleshootInfo struct { + envoyClusters *envoy_admin_v3.Clusters + envoyConfigDump *envoy_admin_v3.ConfigDump + envoyCerts *envoy_admin_v3.Certificates + envoyStats []*envoy_admin_v3.SimpleMetric +} + +func NewTroubleshoot(envoyIP *net.IPAddr, envoyPort string) (*Troubleshoot, error) { + cfg := api.DefaultConfig() + c, err := api.NewClient(cfg) + if err != nil { + return nil, err + } + return &Troubleshoot{ + client: c, + envoyAddr: *envoyIP, + envoyAdminPort: envoyPort, + }, nil +} + +func (t *Troubleshoot) RunAllTests(envoyID string) ([]string, error) { + var resultErr error + var output []string + + // Validate certs + certs, err := t.getEnvoyCerts() + if err != nil { + resultErr = multierror.Append(resultErr, fmt.Errorf("unable to get certs: %w", err)) + } + + if certs != nil && len(certs.GetCertificates()) != 0 { + err = t.validateCerts(certs) + if err != nil { + resultErr = multierror.Append(resultErr, fmt.Errorf("unable to validate certs: %w", err)) + } else { + output = append(output, "certs are valid") + } + + } else { + resultErr = multierror.Append(resultErr, fmt.Errorf("no certificate found")) + + } + + // getStats usage example + // rejectionStats, err := t.getEnvoyStats("update_rejected") + // if err != nil { + // resultErr = multierror.Append(resultErr, err) + // } + + // Validate listeners, routes, clusters, endpoints + t.GetEnvoyConfigDump() + t.getEnvoyClusters() + + indexedResources, err := ProxyConfigDumpToIndexedResources(t.envoyConfigDump) + if err != nil { + resultErr = multierror.Append(resultErr, fmt.Errorf("unable to index resources: %v", err)) + } + + err = Validate(indexedResources, envoyID, "", true, t.envoyClusters) + if err != nil { + resultErr = multierror.Append(resultErr, fmt.Errorf("unable to validate proxy config: %v", err)) + } + return output, resultErr +} + +func (t *Troubleshoot) GetUpstreams() ([]string, error) { + + upstreams := []string{} + + err := t.GetEnvoyConfigDump() + if err != nil { + return nil, err + } + + for _, cfg := range t.envoyConfigDump.Configs { + switch cfg.TypeUrl { + case listeners: + lcd := &envoy_admin_v3.ListenersConfigDump{} + + err := proto.Unmarshal(cfg.GetValue(), lcd) + if err != nil { + return nil, err + } + + for _, listener := range lcd.GetDynamicListeners() { + upstream := envoyID(listener.Name) + if upstream != "" && upstream != "public_listener" { + upstreams = append(upstreams, upstream) + } + } + } + } + return upstreams, nil +} diff --git a/troubleshoot/proxy/utils.go b/troubleshoot/proxy/utils.go new file mode 100644 index 0000000000..fa13db53a8 --- /dev/null +++ b/troubleshoot/proxy/utils.go @@ -0,0 +1,102 @@ +package troubleshoot + +import ( + "context" + "fmt" + "io" + "net/http" + "strings" + + envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + "google.golang.org/protobuf/encoding/protojson" +) + +func (t *Troubleshoot) request(path string) ([]byte, error) { + client := &http.Client{} + url := fmt.Sprintf("http://%v:%s/%s", t.envoyAddr.IP, t.envoyAdminPort, path) + req, err := http.NewRequest("GET", url, nil) + if err != nil { + return nil, err + } + + resp, err := client.Do(req.WithContext(context.Background())) + if err != nil { + return nil, err + } + + if resp != nil { + defer resp.Body.Close() + } + if resp != nil && resp.StatusCode == http.StatusNotFound { + return nil, fmt.Errorf("ErrBackendNotMounted") + } + + rawConfig, err := io.ReadAll(resp.Body) + if err != nil { + return nil, err + } + + return rawConfig, nil +} + +func (t *Troubleshoot) GetEnvoyConfigDump() error { + configDumpRaw, err := t.request("config_dump") + if err != nil { + return err + } + + config := &envoy_admin_v3.ConfigDump{} + + unmarshal := &protojson.UnmarshalOptions{ + DiscardUnknown: true, + } + err = unmarshal.Unmarshal(configDumpRaw, config) + if err != nil { + return err + } + // TODO: validate here + t.envoyConfigDump = config + return nil +} + +func envoyID(listenerName string) string { + + parts := strings.Split(listenerName, ":") + if parts != nil || len(parts) > 0 { + return parts[0] + } + return "" +} + +func (t *Troubleshoot) parseClusters(clusters *envoy_admin_v3.Clusters) ([]string, error) { + upstreams := []string{} + + for _, cs := range clusters.GetClusterStatuses() { + if cs.Name == "local_app" || cs.Name == "local_agent" { + continue + } + upstreams = append(upstreams, cs.GetName()) + } + + return upstreams, nil +} + +func (t *Troubleshoot) getEnvoyClusters() (*envoy_admin_v3.Clusters, error) { + clustersRaw, err := t.request("clusters?format=json") + if err != nil { + return nil, err + } + clusters := &envoy_admin_v3.Clusters{} + + unmarshal := &protojson.UnmarshalOptions{ + DiscardUnknown: true, + } + err = unmarshal.Unmarshal(clustersRaw, clusters) + if err != nil { + return nil, err + } + + // TODO: validate here + t.envoyClusters = clusters + return clusters, nil +} diff --git a/troubleshoot/validateupstream/validateupstream.go b/troubleshoot/proxy/validateupstream.go similarity index 86% rename from troubleshoot/validateupstream/validateupstream.go rename to troubleshoot/proxy/validateupstream.go index a7ad976fc0..6b86c8ab69 100644 --- a/troubleshoot/validateupstream/validateupstream.go +++ b/troubleshoot/proxy/validateupstream.go @@ -1,13 +1,10 @@ -package validateupstream +package troubleshoot import ( - "github.com/hashicorp/consul/acl" - "github.com/hashicorp/consul/agent/envoyextensions/builtin/validate" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" - "github.com/hashicorp/consul/agent/proxycfg" - "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/agent/xds/xdscommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" + "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/hashicorp/consul/troubleshoot/validate" envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" @@ -54,19 +51,7 @@ func ParseClusters(rawClusters []byte) (*envoy_admin_v3.Clusters, error) { // Validate validates the Envoy resources (indexedResources) for a given upstream service, peer, and vip. The peer // should be "" for an upstream not on a remote peer. The vip is required for a transparent proxy upstream. -func Validate(indexedResources *xdscommon.IndexedResources, service api.CompoundServiceName, peer string, vip string, validateEndpoints bool, clusters *envoy_admin_v3.Clusters) error { - em := acl.NewEnterpriseMetaWithPartition(service.Partition, service.Namespace) - svc := structs.NewServiceName(service.Name, &em) - - // The envoyID is used to identify which listener and filter matches the upstream service. - var envoyID string - psn := structs.PeeredServiceName{ - ServiceName: svc, - Peer: peer, - } - uid := proxycfg.NewUpstreamIDFromPeeredServiceName(psn) - envoyID = uid.EnvoyID() - +func Validate(indexedResources *xdscommon.IndexedResources, envoyID string, vip string, validateEndpoints bool, clusters *envoy_admin_v3.Clusters) error { // Get all SNIs from the clusters in the configuration. Not all SNIs will need to be validated, but this ensures we // capture SNIs which aren't directly identical to the upstream service name, but are still used for that upstream // service. For example, in the case of having a splitter/redirect or another L7 config entry, the upstream service @@ -78,6 +63,10 @@ func Validate(indexedResources *xdscommon.IndexedResources, service api.Compound snis[s] = struct{}{} } + // For this extension runtime configuration, we are only validating one upstream service, so the map key doesn't + // need the full service name. + emptyServiceKey := api.CompoundServiceName{} + // Build an ExtensionConfiguration for Validate plugin. extConfig := extensioncommon.RuntimeConfig{ EnvoyExtension: api.EnvoyExtension{ @@ -86,9 +75,9 @@ func Validate(indexedResources *xdscommon.IndexedResources, service api.Compound "envoyID": envoyID, }, }, - ServiceName: service, - Upstreams: map[api.CompoundServiceName]extensioncommon.UpstreamData{ - service: { + ServiceName: emptyServiceKey, + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ + emptyServiceKey: { VIP: vip, // Even though snis are under the upstream service name we're validating, it actually contains all // the cluster SNIs configured on this proxy, not just the upstream being validated. This means the diff --git a/troubleshoot/proxy/validateupstream_test.go b/troubleshoot/proxy/validateupstream_test.go new file mode 100644 index 0000000000..fbd4dd53cb --- /dev/null +++ b/troubleshoot/proxy/validateupstream_test.go @@ -0,0 +1,44 @@ +package troubleshoot + +import ( + "io" + "os" + "testing" + + envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + "github.com/hashicorp/consul/envoyextensions/xdscommon" + "github.com/stretchr/testify/require" +) + +// A majority of unit tests for validateupstream.go are in the agent/xds/validateupstream-test package due to internal +// Consul dependencies that shouldn't be imported into the troubleshoot module. The tests that are here don't require +// internal consul packages. + +func TestValidateFromJSON(t *testing.T) { + indexedResources := getConfig(t) + clusters := getClusters(t) + err := Validate(indexedResources, "backend", "", true, clusters) + require.NoError(t, err) +} + +// TODO: Manually inspect the config and clusters files and hardcode the list of expected resource names for higher +// confidence in these functions. +func getConfig(t *testing.T) *xdscommon.IndexedResources { + file, err := os.Open("testdata/config.json") + require.NoError(t, err) + jsonBytes, err := io.ReadAll(file) + require.NoError(t, err) + indexedResources, err := ParseConfigDump(jsonBytes) + require.NoError(t, err) + return indexedResources +} + +func getClusters(t *testing.T) *envoy_admin_v3.Clusters { + file, err := os.Open("testdata/clusters.json") + require.NoError(t, err) + jsonBytes, err := io.ReadAll(file) + require.NoError(t, err) + clusters, err := ParseClusters(jsonBytes) + require.NoError(t, err) + return clusters +} diff --git a/troubleshoot/proxy/z_xds_packages.go b/troubleshoot/proxy/z_xds_packages.go new file mode 100644 index 0000000000..081f945359 --- /dev/null +++ b/troubleshoot/proxy/z_xds_packages.go @@ -0,0 +1,312 @@ +// Code generated by envoy-library-references.sh. DO NOT EDIT. + +package troubleshoot + +import ( + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/squash/v3" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/sxg/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_broker/v3" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/mysql_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha" + _ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/vcl/v3alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/admin/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/annotations" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit" + _ "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" + _ "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/aggregate/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/dynamic_forward_proxy/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/redis" + _ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/common/dynamic_forward_proxy/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/common/key_value/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/common/tap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/dubbo/router/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/adaptive_concurrency/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/aws_lambda/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/aws_request_signing/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/buffer/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/cache/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/compressor/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/cors/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/csrf/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/dynamic_forward_proxy/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/dynamo/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_http1_bridge/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_web/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/gzip/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/header_to_metadata/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ip_tagging/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/lua/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/on_demand/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/original_src/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rate_limit/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/router/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/squash/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/tap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/transcoder/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/http_inspector/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/original_dst/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/original_src/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/proxy_protocol/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/tls_inspector/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/client_ssl_auth/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/direct_response/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/dubbo_proxy/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/echo/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/ext_authz/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/kafka_broker/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/local_rate_limit/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mysql_proxy/v1alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rate_limit/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/sni_cluster/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/thrift_proxy/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/zookeeper_proxy/v1alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/thrift/rate_limit/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/thrift/router/v2alpha1" + _ "github.com/envoyproxy/go-control-plane/envoy/config/filter/udp/udp_proxy/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/health_checker/redis/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/listener/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/overload/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/resource_monitor/fixed_heap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/resource_monitor/injected_resource/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/retry/omit_canary_hosts/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/retry/omit_host_metadata/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/retry/previous_hosts/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/retry/previous_priorities" + _ "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/alts/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/raw_buffer/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/tap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/data/cluster/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/data/cluster/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/data/core/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/data/core/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/data/dns/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/data/dns/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/wasm/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/cache/simple_http_cache/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/dynamic_forward_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/redis/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/matching/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/compressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/decompressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/compressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/decompressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/dependency/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/matcher/action/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/adaptive_concurrency/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/admission_control/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/alternate_protocols_cache/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/aws_lambda/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/aws_request_signing/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/bandwidth_limit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/buffer/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cache/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cdn_loop/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/composite/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/csrf/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/decompressor/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamic_forward_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamo/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_proc/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_bridge/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_json_transcoder/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_web/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/gzip/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/header_to_metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/health_check/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ip_tagging/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/kill_request/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/local_ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/lua/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/set_metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_dst/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_src/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/proxy_protocol/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/client_ssl_auth/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/connection_limit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/direct_response/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/router/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/echo/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/local_ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/mongo_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rbac/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/redis_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_cluster/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/router/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/wasm/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/zookeeper_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/udp/dns_filter/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/udp/udp_proxy/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/req_without_query/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/redis/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/custom_header/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/xff/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/allow_listed_routes/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/previous_routes/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/safe_cross_scheme/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/key_value/file_based/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/environment_variable/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/consistent_hashing/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/ip/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/apple/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/cares/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/socket_interface/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/crypto_stream/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/proof_source/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/injected_resource/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_canary_hosts/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_host_metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/previous_hosts/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/priority/previous_priorities/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/graphite_statsd/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/proxy_protocol/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/quic/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/raw_buffer/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/s2a/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/starttls/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tcp_stats/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/generic/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/http/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/tcp/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/generic/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/extensions/watchdog/profile_action/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/extension/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/health/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/route/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/status/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/status/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha" + _ "github.com/envoyproxy/go-control-plane/envoy/service/tap/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/type" + _ "github.com/envoyproxy/go-control-plane/envoy/type/http/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/type/matcher" + _ "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2" + _ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/type/v3" + _ "github.com/envoyproxy/go-control-plane/envoy/watchdog/v3" +) diff --git a/troubleshoot/troubleshoot_proxy.go b/troubleshoot/troubleshoot_proxy.go deleted file mode 100644 index 68101e98f0..0000000000 --- a/troubleshoot/troubleshoot_proxy.go +++ /dev/null @@ -1,76 +0,0 @@ -package troubleshoot - -import ( - "fmt" - "net" - - envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" - "github.com/pkg/errors" - - "github.com/hashicorp/consul/api" - "github.com/hashicorp/go-multierror" -) - -type Troubleshoot struct { - client *api.Client - envoyAddr net.IPAddr - envoyAdminPort string - - TroubleshootInfo -} - -type TroubleshootInfo struct { - envoyClusters *envoy_admin_v3.Clusters - envoyConfigDump *envoy_admin_v3.ConfigDump - envoyCerts *envoy_admin_v3.Certificates - envoyStats []*envoy_admin_v3.SimpleMetric -} - -func NewTroubleshoot(envoyIP *net.IPAddr, envoyPort string) (*Troubleshoot, error) { - cfg := api.DefaultConfig() - c, err := api.NewClient(cfg) - if err != nil { - return nil, err - } - return &Troubleshoot{ - client: c, - envoyAddr: *envoyIP, - envoyAdminPort: envoyPort, - }, nil -} - -func (t *Troubleshoot) RunAllTests(upstreamEnvoyID string) ([]string, error) { - var resultErr error - var output []string - - certs, err := t.getEnvoyCerts() - if err != nil { - resultErr = multierror.Append(resultErr, fmt.Errorf("unable to get certs: %w", err)) - } - - if certs != nil && len(certs.GetCertificates()) != 0 { - err = t.validateCerts(certs) - if err != nil { - resultErr = multierror.Append(resultErr, fmt.Errorf("unable to validate certs: %w", err)) - } else { - output = append(output, "certs are valid") - } - - } else { - resultErr = multierror.Append(resultErr, errors.New("no certificate found")) - - } - - // getStats usage example - // rejectionStats, err := t.getEnvoyStats("update_rejected") - // if err != nil { - // resultErr = multierror.Append(resultErr, err) - // } - - return output, resultErr -} - -func (t *Troubleshoot) GetUpstreams() ([]string, error) { - - return nil, fmt.Errorf("not implemented") -} diff --git a/troubleshoot/utils.go b/troubleshoot/utils.go deleted file mode 100644 index 767d70ae4b..0000000000 --- a/troubleshoot/utils.go +++ /dev/null @@ -1,36 +0,0 @@ -package troubleshoot - -import ( - "context" - "fmt" - "io" - "net/http" -) - -func (t *Troubleshoot) request(path string) ([]byte, error) { - client := &http.Client{} - url := fmt.Sprintf("http://%v:%s/%s", t.envoyAddr.IP, t.envoyAdminPort, path) - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return nil, err - } - - resp, err := client.Do(req.WithContext(context.Background())) - if err != nil { - return nil, err - } - - if resp != nil { - defer resp.Body.Close() - } - if resp != nil && resp.StatusCode == http.StatusNotFound { - return nil, fmt.Errorf("ErrBackendNotMounted") - } - - rawConfig, err := io.ReadAll(resp.Body) - if err != nil { - return nil, err - } - - return rawConfig, nil -} diff --git a/agent/envoyextensions/builtin/validate/validate.go b/troubleshoot/validate/validate.go similarity index 90% rename from agent/envoyextensions/builtin/validate/validate.go rename to troubleshoot/validate/validate.go index ec7893ae5d..c99484bae7 100644 --- a/agent/envoyextensions/builtin/validate/validate.go +++ b/troubleshoot/validate/validate.go @@ -10,11 +10,12 @@ import ( envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" envoy_aggregate_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3" envoy_resource_v3 "github.com/envoyproxy/go-control-plane/pkg/resource/v3" + "github.com/hashicorp/consul/api" "github.com/hashicorp/go-multierror" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" ) const builtinValidateExtension = "builtin/proxy/validate" @@ -79,11 +80,21 @@ func MakeValidate(ext extensioncommon.RuntimeConfig) (extensioncommon.BasicExten envoyID, _ := ext.EnvoyExtension.Arguments["envoyID"] mainEnvoyID, _ := envoyID.(string) - if len(mainEnvoyID) == 0 { - return nil, fmt.Errorf("envoyID is required") + vip := "" + snis := map[string]struct{}{} + upstream, ok := ext.Upstreams[ext.ServiceName] + if ok { + vip = upstream.VIP + if upstream.SNI == nil || len(upstream.SNI) == 0 { + return nil, fmt.Errorf("no SNIs were set, unable to validate Envoy clusters") + } + snis = upstream.SNI + } + if mainEnvoyID == "" && vip == "" { + return nil, fmt.Errorf("envoyID or virtual IP is required") } plugin.envoyID = mainEnvoyID - plugin.snis = ext.Upstreams[ext.ServiceName].SNI + plugin.snis = snis plugin.resources = make(map[string]*resource) return &plugin, resultErr @@ -256,11 +267,21 @@ func (p *Validate) PatchFilter(config *extensioncommon.RuntimeConfig, filter *en // If a single filter exists for a listener we say it exists. p.listener = true - if config := envoy_resource_v3.GetHTTPConnectionManager(filter); config != nil { + if httpConfig := envoy_resource_v3.GetHTTPConnectionManager(filter); httpConfig != nil { // If the http filter uses RDS, then the clusters we need to validate exist in the route, and there's nothing // else we need to do with the filter. - if config.GetRds() != nil { + if httpConfig.GetRds() != nil { p.usesRDS = true + + // Edit the runtime configuration to add an envoy ID based on the route name in the filter. This is because + // routes are matched by envoyID and in the transparent proxy case, we only have the VIP set in the + // RuntimeConfig. + p.envoyID = httpConfig.GetRds().RouteConfigName + emptyServiceKey := api.CompoundServiceName{} + upstream, ok := config.Upstreams[emptyServiceKey] + if ok { + upstream.EnvoyID = p.envoyID + } return filter, true, nil } } diff --git a/agent/envoyextensions/builtin/validate/validate_test.go b/troubleshoot/validate/validate_test.go similarity index 91% rename from agent/envoyextensions/builtin/validate/validate_test.go rename to troubleshoot/validate/validate_test.go index bddc20c122..e6040b4413 100644 --- a/agent/envoyextensions/builtin/validate/validate_test.go +++ b/troubleshoot/validate/validate_test.go @@ -6,8 +6,8 @@ import ( envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_aggregate_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3" - "github.com/hashicorp/consul/agent/envoyextensions/extensioncommon" "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/envoyextensions/extensioncommon" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/anypb" ) @@ -251,12 +251,34 @@ func TestMakeValidate(t *testing.T) { arguments: map[string]interface{}{ "envoyID": "id", }, + snis: map[string]struct{}{ + "sni1": {}, + "sni2": {}, + }, extensionName: "bad", ok: false, }, "empty envoy ID": { arguments: map[string]interface{}{"envoyID": ""}, - ok: false, + snis: map[string]struct{}{ + "sni1": {}, + "sni2": {}, + }, + ok: false, + }, + "missing snis": { + arguments: map[string]interface{}{ + "envoyID": "id", + }, + expected: &Validate{ + envoyID: "id", + resources: map[string]*resource{}, + snis: map[string]struct{}{ + "sni1": {}, + "sni2": {}, + }, + }, + ok: false, }, "valid everything": { arguments: map[string]interface{}{ @@ -269,6 +291,10 @@ func TestMakeValidate(t *testing.T) { expected: &Validate{ envoyID: "id", resources: map[string]*resource{}, + snis: map[string]struct{}{ + "sni1": {}, + "sni2": {}, + }, }, ok: true, }, @@ -289,6 +315,11 @@ func TestMakeValidate(t *testing.T) { Name: extensionName, Arguments: tc.arguments, }, + Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{ + svc: { + SNI: tc.snis, + }, + }, } patcher, err := MakeValidate(ext)