IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

use pluginName consistently when upgrading plugins

Browse Source
This commit is contained in:
Dan Cech
2018-09-13 17:19:51 -04:00
parent 06855d2bc3
commit 124b21a6aa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cmd/grafana-cli/commands/upgrade_command.go
View File

@@ -16,7 +16,7 @@ func upgradeCommand(c CommandLine) error {
return err return err
} }
v, err2 := s.GetPlugin(localPlugin.Id, c.RepoDirectory()) v, err2 := s.GetPlugin(pluginName, c.RepoDirectory())
if err2 != nil { if err2 != nil {
return err2 return err2
@@ -24,9 +24,9 @@ func upgradeCommand(c CommandLine) error {
if ShouldUpgrade(localPlugin.Info.Version, v) { if ShouldUpgrade(localPlugin.Info.Version, v) {
s.RemoveInstalledPlugin(pluginsDir, pluginName) s.RemoveInstalledPlugin(pluginsDir, pluginName)
return InstallPlugin(localPlugin.Id, "", c) return InstallPlugin(pluginName, "", c)
} }
logger.Infof("%s %s is up to date \n", color.GreenString("✔"), localPlugin.Id) logger.Infof("%s %s is up to date \n", color.GreenString("✔"), pluginName)
return nil return nil
} }

4
pkg/cmd/grafana-cli/services/services.go
View File

@@ -63,7 +63,7 @@ func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
var data m.PluginRepo var data m.PluginRepo
err = json.Unmarshal(body, &data) err = json.Unmarshal(body, &data)
if err != nil { if err != nil {
logger.Info("Failed to unmarshal graphite response error:", err) logger.Info("Failed to unmarshal plugin repo response error:", err)
return m.PluginRepo{}, err return m.PluginRepo{}, err
} }
@@ -140,7 +140,7 @@ func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
var data m.Plugin var data m.Plugin
err = json.Unmarshal(body, &data) err = json.Unmarshal(body, &data)
if err != nil { if err != nil {
logger.Info("Failed to unmarshal graphite response error:", err) logger.Info("Failed to unmarshal plugin repo response error:", err)
return m.Plugin{}, err return m.Plugin{}, err
} }