Added windows executable extensions to Kubectl plugins

Currently, the kubectl plugins system - when running under Windows - will determine that a plugin is executable by looking at its extension, comparing it to '.exe'. I think we should allow plugins w/ a few more known extensions (.bat, .com, .cmd; for example) - This would give more of a similar experience to plugins under *nix, where shell scripts are often used. Moreover, there were two windows-specific behaviors that were redundant, which I've removed: 1. In plugin.go - There's no need to differentiate between windows and under OS-es when looking at the PATH variable; It can be refered as 'PATH' in Windows as well 2. In cmd.go - There's no need to append a suffix when looking up plugins on windows; One can safely use 'exec.LookPath' without a suffix on Windows - and get automatic resolving for known executable types

Added windows executable extensions to Kubectl plugins
aae1944a · Danny Shemesh · dashemes · 3fbdc8c3 · aae1944a · aae1944a
Commit aae1944a authored Jan 29, 2019 by Danny Shemesh Committed by dashemes Jan 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 13 deletions

cmd.go pkg/kubectl/cmd/cmd.go +0 -7

plugin.go pkg/kubectl/cmd/plugin/plugin.go +5 -6

No files found.
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -22,7 +22,6 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"runtime"
 	"strings"
 	"syscall"

@@ -339,12 +338,6 @@ type defaultPluginHandler struct{}

 // Lookup implements PluginHandler
 func (h *defaultPluginHandler) Lookup(filename string) (string, error) {
-	// if on Windows, append the "exe" extension
-	// to the filename that we are looking up.
-	if runtime.GOOS == "windows" {
-		filename = filename + ".exe"
-	}
-
 	return exec.LookPath(filename)
 }


--- a/pkg/kubectl/cmd/plugin/plugin.go
+++ b/pkg/kubectl/cmd/plugin/plugin.go
@@ -100,11 +100,7 @@ func (o *PluginListOptions) Complete(cmd *cobra.Command) error {
 		seenPlugins: make(map[string]string, 0),
 	}

-	path := "PATH"
-	if runtime.GOOS == "windows" {
-		path = "path"
-	}
-	o.PluginPaths = filepath.SplitList(os.Getenv(path))
+	o.PluginPaths = filepath.SplitList(os.Getenv("PATH"))
 	return nil
 }

@@ -230,7 +226,10 @@ func isExecutable(fullPath string) (bool, error) {
 	}

 	if runtime.GOOS == "windows" {
-		if strings.HasSuffix(info.Name(), ".exe") {
+		fileExt := strings.ToLower(filepath.Ext(fullPath))
+
+		switch fileExt {
+		case ".bat", ".cmd", ".com", ".exe":
 			return true, nil
 		}
 		return false, nil