public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Use plugin.pluginDir as source of truth for plugin location (#36711)

Browse Source 
* use plugin.pluginDir as source of truth for plugin location

* correct the interface
This commit is contained in:
Will Browne
2021-07-15 09:08:25 +02:00
committed by GitHub
parent e82f8dbef9
commit 94688be398
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/installer/installer.go
+4 -6
View File
@@ -177,22 +177,20 @@ func (i *Installer) Install(ctx context.Context, pluginID, version, pluginsDir,
return err
}
// Uninstall removes the specified plugin from the provided plugins directory.
func (i *Installer) Uninstall(ctx context.Context, pluginID, pluginPath string) error {
pluginDir := filepath.Join(pluginPath, pluginID)
// Uninstall removes the specified plugin from the provided plugin directory.
func (i *Installer) Uninstall(ctx context.Context, pluginDir string) error {
// verify it's a plugin directory
if _, err := os.Stat(filepath.Join(pluginDir, "plugin.json")); err != nil {
if os.IsNotExist(err) {
if _, err := os.Stat(filepath.Join(pluginDir, "dist", "plugin.json")); err != nil {
if os.IsNotExist(err) {
return fmt.Errorf("tried to remove %s, but it doesn't seem to be a plugin", pluginPath)
return fmt.Errorf("tried to remove %s, but it doesn't seem to be a plugin", pluginDir)
}
}
}
}
i.log.Infof("Uninstalling plugin %v", pluginID)
i.log.Infof("Uninstalling plugin %v", pluginDir)
return os.RemoveAll(pluginDir)
}