From 7cd0eff8571721f35c434fb08fe4cd7539e0b6b3 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 22 Feb 2023 16:25:30 -0500 Subject: [PATCH] fix failed cherry pick (#16303) Co-authored-by: Maliz --- agent/xds/validateupstream-test/validateupstream_test.go | 2 +- command/troubleshoot/upstreams/troubleshoot_upstreams.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/xds/validateupstream-test/validateupstream_test.go b/agent/xds/validateupstream-test/validateupstream_test.go index 250b6acdec..6b758f8538 100644 --- a/agent/xds/validateupstream-test/validateupstream_test.go +++ b/agent/xds/validateupstream-test/validateupstream_test.go @@ -9,7 +9,7 @@ import ( "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" + troubleshoot "github.com/hashicorp/consul/troubleshoot/proxy" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" ) diff --git a/command/troubleshoot/upstreams/troubleshoot_upstreams.go b/command/troubleshoot/upstreams/troubleshoot_upstreams.go index 435630cdc9..8f941699ce 100644 --- a/command/troubleshoot/upstreams/troubleshoot_upstreams.go +++ b/command/troubleshoot/upstreams/troubleshoot_upstreams.go @@ -77,7 +77,7 @@ func (c *cmd) Run(args []string) int { return 1 } - c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)\n", len(envoyIDs))) + c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)", len(envoyIDs))) for _, u := range envoyIDs { c.UI.UnchangedOutput(u) }