Skip to content

Fix exec plugins on windows #3269

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.

Sign up for GitHub

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

Closed
jaysonsantos wants to merge 2 commits into from
Closed

Fix exec plugins on windows #3269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517c42a
Fix exec plugins on windows
jaysonsantos Nov 24, 2020
975fd36
Implement lookForExecutable to search fo possible executable plugins
jaysonsantos Dec 9, 2020
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
22 changes: 21 additions & 1 deletion api/internal/plugins/loader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"path/filepath"
"plugin"
"reflect"
"runtime"
"strings"

"github.com/pkg/errors"
Expand Down Expand Up @@ -177,7 +178,8 @@ func (l *Loader) loadPlugin(res *resource.Resource) (resmap.Configurable, error)

func (l *Loader) loadExecOrGoPlugin(resId resid.ResId) (resmap.Configurable, error) {
// First try to load the plugin as an executable.
p := execplugin.NewExecPlugin(l.absolutePluginPath(resId))
path, _ := lookForExecutable(l.absolutePluginPath(resId))
p := execplugin.NewExecPlugin(path)
err := p.ErrIfNotExecutable()
if err == nil {
return p, nil
Expand Down Expand Up @@ -244,3 +246,21 @@ func copyPlugin(c resmap.Configurable) resmap.Configurable {
newNamed := newIndirect.Interface()
return newNamed.(resmap.Configurable)
}

func lookForExecutable(partialPath string) (fullPath string, err error) {
if runtime.GOOS != "windows" {
return partialPath, nil
}

possibleWindowsSuffixes := []string{"exe", "bat", "ps1"}

for _, possibleWindowsSuffix := range possibleWindowsSuffixes {
fullPath := fmt.Sprintf("%s.%s", partialPath, possibleWindowsSuffix)
_, err := os.Stat(fullPath)
if err == nil {
return fullPath, nil
}
}

return "", fmt.Errorf("no possible excutable found, partial path: %v tried suffixes: %v", partialPath, possibleWindowsSuffixes)
}