Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable printing flags warning message for the ssh command #20502

Merged
merged 5 commits into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions command/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -588,16 +588,25 @@ func (f *FlagSets) Completions() complete.Flags {
type (
ParseOptions interface{}
ParseOptionAllowRawFormat bool
DisableDisplayFlagWarning bool
)

// Parse parses the given flags, returning any errors.
// Warnings, if any, regarding the arguments format are sent to stdout
func (f *FlagSets) Parse(args []string, opts ...ParseOptions) error {
err := f.mainSet.Parse(args)

warnings := generateFlagWarnings(f.Args())
if warnings != "" && Format(f.ui) == "table" {
f.ui.Warn(warnings)
displayFlagWarningsDisabled := false
for _, opt := range opts {
if value, ok := opt.(DisableDisplayFlagWarning); ok {
displayFlagWarningsDisabled = bool(value)
}
}
if !displayFlagWarningsDisabled {
warnings := generateFlagWarnings(f.Args())
if warnings != "" && Format(f.ui) == "table" {
f.ui.Warn(warnings)
}
}

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion command/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ type SSHCredentialResp struct {
func (c *SSHCommand) Run(args []string) int {
f := c.Flags()

if err := f.Parse(args); err != nil {
if err := f.Parse(args, DisableDisplayFlagWarning(true)); err != nil {
c.UI.Error(err.Error())
return 1
}
Expand Down
17 changes: 17 additions & 0 deletions command/ssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package command

import (
"strings"
"testing"

"github.com/mitchellh/cli"
Expand Down Expand Up @@ -217,3 +218,19 @@ func TestIsSingleSSHArg(t *testing.T) {
})
}
}

func TestSSHCommandOmitFlagWarning(t *testing.T) {
t.Parallel()

ui, cmd := testSSHCommand(t)

code := cmd.Run([]string{"-mode", "ca", "-role", "otp_key_role", "user@1.2.3.4", "-extraFlag", "bug"})
if code != 2 {
t.Fatalf("expected %d to be %d", code, 2)
}

combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
if strings.Contains(combined, "Command flags must be provided before positional arguments. The following arguments will not be parsed as flags") {
t.Fatalf("ssh command displayed flag warnings")
}
}