use new plugin-specific repo route when installing or updating a single plugin (grafana#4992)

DanCech · torkelo · commit 9f9f4e7fef93 · 2016-05-12T10:43:31.000+02:00
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -1,6 +1,8 @@
 package commands
 
 import (
+	"github.com/fatih/color"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 )
 
@@ -14,20 +16,17 @@ func upgradeCommand(c CommandLine) error {
 		return err
 	}
 
-	remotePlugins, err2 := s.ListAllPlugins(c.GlobalString("repo"))
+	v, err2 := s.GetPlugin(localPlugin.Id, c.GlobalString("repo"))
 
 	if err2 != nil {
 		return err2
 	}
 
-	for _, v := range remotePlugins.Plugins {
-		if localPlugin.Id == v.Id {
-			if ShouldUpgrade(localPlugin.Info.Version, v) {
-				s.RemoveInstalledPlugin(pluginsDir, pluginName)
-				return InstallPlugin(localPlugin.Id, "", c)
-			}
-		}
+	if ShouldUpgrade(localPlugin.Info.Version, v) {
+		s.RemoveInstalledPlugin(pluginsDir, pluginName)
+		return InstallPlugin(localPlugin.Id, "", c)
 	}
 
+	log.Infof("%s %s is up to date \n", color.GreenString("✔"), localPlugin.Id)
 	return nil
 }
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
@@ -44,7 +44,7 @@ func ReadPlugin(pluginDir, pluginName string) (m.InstalledPlugin, error) {
 	}
 
 	if res.Id == "" {
-		return m.InstalledPlugin{}, errors.New("could not read find plugin " + pluginName)
+		return m.InstalledPlugin{}, errors.New("could not find plugin " + pluginName + " in " + pluginDir)
 	}
 
 	return res, nil
@@ -69,13 +69,21 @@ func RemoveInstalledPlugin(pluginPath, id string) error {
 }
 
 func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
-	resp, _ := ListAllPlugins(repoUrl)
+	fullUrl := repoUrl + "/repo/" + pluginId
 
-	for _, i := range resp.Plugins {
-		if i.Id == pluginId {
-			return i, nil
-		}
+	res, err := goreq.Request{Uri: fullUrl, MaxRedirects: 3}.Do()
+	if err != nil {
+		return m.Plugin{}, err
+	}
+	if res.StatusCode != 200 {
+		return m.Plugin{}, fmt.Errorf("Could not access %s statuscode %v", fullUrl, res.StatusCode)
 	}
 
-	return m.Plugin{}, errors.New("could not find plugin named \"" + pluginId + "\"")
+	var resp m.Plugin
+	err = res.Body.FromJsonTo(&resp)
+	if err != nil {
+		return m.Plugin{}, errors.New("Could not load plugin data")
+	}
+
+	return resp, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package commands`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "github.com/fatih/color"`
	`5`	`+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"`
`4`	`6`	`s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"`
`5`	`7`	`)`
`6`	`8`
`@@ -14,20 +16,17 @@ func upgradeCommand(c CommandLine) error {`
`14`	`16`	`return err`
`15`	`17`	`}`
`16`	`18`
`17`		`- remotePlugins, err2 := s.ListAllPlugins(c.GlobalString("repo"))`
	`19`	`+ v, err2 := s.GetPlugin(localPlugin.Id, c.GlobalString("repo"))`
`18`	`20`
`19`	`21`	`if err2 != nil {`
`20`	`22`	`return err2`
`21`	`23`	`}`
`22`	`24`
`23`		`- for _, v := range remotePlugins.Plugins {`
`24`		`- if localPlugin.Id == v.Id {`
`25`		`- if ShouldUpgrade(localPlugin.Info.Version, v) {`
`26`		`- s.RemoveInstalledPlugin(pluginsDir, pluginName)`
`27`		`- return InstallPlugin(localPlugin.Id, "", c)`
`28`		`- }`
`29`		`- }`
	`25`	`+ if ShouldUpgrade(localPlugin.Info.Version, v) {`
	`26`	`+ s.RemoveInstalledPlugin(pluginsDir, pluginName)`
	`27`	`+ return InstallPlugin(localPlugin.Id, "", c)`
`30`	`28`	`}`
`31`	`29`
	`30`	`+ log.Infof("%s %s is up to date \n", color.GreenString("✔"), localPlugin.Id)`
`32`	`31`	`return nil`
`33`	`32`	`}`