Merge pull request #642 from wwitzel3/issue-580

Fix plugins not loading on Windows

changelogs/unreleased/580-wwitzel3

@@ -0,0 +1 @@
+Fixed issue where plugins would not load on Windows.

pkg/plugin/loader.go

@@ -27,6 +27,8 @@ type Config interface {
 	Home() string
 	// Fs is the afero filesystem
 	Fs() afero.Fs
+	// OS is the opertating system
+	OS() string
 }
 
 type defaultConfig struct {
@@ -42,6 +44,11 @@ var (
 
 var _ Config = (*defaultConfig)(nil)
 
+// OS returns the plugin config operating system
+func (c *defaultConfig) OS() string {
+	return c.os
+}
+
 // PluginDirs returns the plugin directories. Current only works on macOS and Linux
 // and not in a container.
 func (c *defaultConfig) PluginDirs(home string) ([]string, error) {
@@ -106,7 +113,6 @@ func AvailablePlugins(config Config) ([]string, error) {
 	}
 
 	var list []string
-
 	for _, dir := range dirs {
 		_, err = config.Fs().Stat(dir)
 		if err != nil {
@@ -124,8 +130,8 @@ func AvailablePlugins(config Config) ([]string, error) {
 
 		for _, fi := range fis {
 			mode := fi.Mode()
-
-			if mode|64 == mode {
+			// Windows does not have unix style executable bits.
+			if mode|64 == mode || config.OS() == "windows" {
 				pluginPath := filepath.Join(dir, fi.Name())
 				list = append(list, pluginPath)
 			}

pkg/plugin/loader_test.go

@@ -86,6 +86,10 @@ func Test_AvailablePlugins(t *testing.T) {
 			homePath: filepath.Join("/home", "xdg_config_path"),
 			key:      "xdg-config-home",
 		},
+		{
+			homePath: filepath.Join("/windows", "test"),
+			key:      "windows-test",
+		},
 	}
 
 	for _, test := range tests {
@@ -104,6 +108,30 @@ func Test_AvailablePlugins(t *testing.T) {
 		}
 
 		switch test.key {
+		case "windows-test":
+			c.os = "windows"
+			configPath := filepath.Join(test.homePath, configDir, "plugins")
+			err := fs.MkdirAll(configPath, 0700)
+			require.NoError(t, err, "unable to create test home directory")
+
+			stagePlugin := func(t *testing.T, path string, name string, mode os.FileMode) {
+				p := filepath.Join(path, name)
+				err = afero.WriteFile(fs, p, []byte("guts"), mode)
+				require.NoError(t, err)
+			}
+
+			// Non-executable UNIX permissions but OS is Windows
+			stagePlugin(t, configPath, "a-plugin", 0600)
+			stagePlugin(t, configPath, "e-plugin", 0755)
+
+			got, err := AvailablePlugins(c)
+			require.NoError(t, err)
+
+			expected := []string{
+				filepath.Join(configPath, "a-plugin"),
+				filepath.Join(configPath, "e-plugin"),
+			}
+			assert.Equal(t, expected, got)
 		case "plugin-path":
 			c.os = "unix"
 			customPath := filepath.Join("/example", "test")