From 899ab31fff9b34bc125faf75b79a89e390deb2cf Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 1 Sep 2017 09:00:27 -0400 Subject: Implement experimental REST API endpoints for plugins (#7279) * Implement experimental REST API endpoints for plugins * Updates per feedback and rebase * Update tests * Further updates * Update extraction of plugins * Use OS temp dir for plugins instead of search path * Fail extraction on paths that attempt to traverse upward * Update pluginenv ActivePlugins() --- plugin/pluginenv/search_path.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugin/pluginenv/search_path.go') diff --git a/plugin/pluginenv/search_path.go b/plugin/pluginenv/search_path.go index daebdb0d3..b50c7019c 100644 --- a/plugin/pluginenv/search_path.go +++ b/plugin/pluginenv/search_path.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/mattermost/platform/plugin" + "github.com/mattermost/platform/model" ) // Performs a full scan of the given path. @@ -14,17 +14,17 @@ import ( // parsed). // // Plugins are found non-recursively and paths beginning with a dot are always ignored. -func ScanSearchPath(path string) ([]*plugin.BundleInfo, error) { +func ScanSearchPath(path string) ([]*model.BundleInfo, error) { files, err := ioutil.ReadDir(path) if err != nil { return nil, err } - var ret []*plugin.BundleInfo + var ret []*model.BundleInfo for _, file := range files { if !file.IsDir() || file.Name()[0] == '.' { continue } - if info := plugin.BundleInfoForPath(filepath.Join(path, file.Name())); info.ManifestPath != "" { + if info := model.BundleInfoForPath(filepath.Join(path, file.Name())); info.ManifestPath != "" { ret = append(ret, info) } } -- cgit v1.2.3-1-g7c22