github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix failed cherry pick (#16303) 

Co-authored-by: Maliz <maliheh.monshizadeh@hashicorp.com>
pull/16384/head^2
hc-github-team-consul-core 2023-02-22 16:25:30 -05:00 committed by GitHub
parent 8ba11d7380
commit 7cd0eff857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/xds/validateupstream-test/validateupstream_test.go
View File

@ -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"
)

2
command/troubleshoot/upstreams/troubleshoot_upstreams.go
View File

@ -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)
}