github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

fix(kubectl): warn users that flags cannot be placed before plugin

Browse Source 
Signed-off-by: knight42 <anonymousknight96@gmail.com>
This commit is contained in:
knight42 2020-06-20 22:32:28 +08:00
parent c2b7aa0353
commit 7a2e5af11d
No known key found for this signature in database
GPG Key ID: 1040B69865E7D86C
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubectl/cmd/cmd.go
View File

@ -318,7 +318,7 @@ func NewDefaultKubectlCommandWithArgs(pluginHandler PluginHandler, args []string
// the specified command does not already exist // the specified command does not already exist
if _, _, err := cmd.Find(cmdPathPieces); err != nil { if _, _, err := cmd.Find(cmdPathPieces); err != nil {
if err := HandlePluginCommand(pluginHandler, cmdPathPieces); err != nil { if err := HandlePluginCommand(pluginHandler, cmdPathPieces); err != nil {
fmt.Fprintf(errout, "%v\n", err) fmt.Fprintf(errout, "Error: %v\n", err)
os.Exit(1) os.Exit(1)
} }
} }
@ -393,13 +393,17 @@ func (h *DefaultPluginHandler) Execute(executablePath string, cmdArgs, environme
// HandlePluginCommand receives a pluginHandler and command-line arguments and attempts to find // HandlePluginCommand receives a pluginHandler and command-line arguments and attempts to find
// a plugin executable on the PATH that satisfies the given arguments. // a plugin executable on the PATH that satisfies the given arguments.
func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error { func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error {
remainingArgs := []string{} // all "non-flag" arguments var remainingArgs []string // all "non-flag" arguments
for _, arg := range cmdArgs {
for idx := range cmdArgs { if strings.HasPrefix(arg, "-") {
if strings.HasPrefix(cmdArgs[idx], "-") {
break break
} }
remainingArgs = append(remainingArgs, strings.Replace(cmdArgs[idx], "-", "_", -1)) remainingArgs = append(remainingArgs, strings.Replace(arg, "-", "_", -1))
}
if len(remainingArgs) == 0 {
// the length of cmdArgs is at least 1
return fmt.Errorf("flags cannot be placed before plugin name: %s", cmdArgs[0])
} }
foundBinaryPath := "" foundBinaryPath := ""