From 3c966caa23ce33054e3a79825ec6edf9a05114f4 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 15 Sep 2016 14:34:58 +0200 Subject: [PATCH] feat(cli): download all plugin dependencies --- pkg/cmd/grafana-cli/commands/install_command.go | 6 +++--- pkg/cmd/grafana-cli/models/model.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index 401606e5ec8..451b61a2de3 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -14,6 +14,7 @@ import ( "strings" "github.com/fatih/color" + "github.com/grafana/grafana-cli/pkg/log" "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models" s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services" @@ -90,13 +91,12 @@ func InstallPlugin(pluginName, version string, c CommandLine) error { logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id) - /* Enable once we need support for downloading depedencies res, _ := s.ReadPlugin(pluginFolder, pluginName) - for _, v := range res.Dependency.Plugins { + for _, v := range res.Dependencies.Plugins { InstallPlugin(v.Id, version, c) log.Infof("Installed dependency: %v ✔\n", v.Id) } - */ + return err } diff --git a/pkg/cmd/grafana-cli/models/model.go b/pkg/cmd/grafana-cli/models/model.go index 3a39c5fbe65..0700cb9a9e4 100644 --- a/pkg/cmd/grafana-cli/models/model.go +++ b/pkg/cmd/grafana-cli/models/model.go @@ -9,11 +9,11 @@ type InstalledPlugin struct { Name string `json:"name"` Type string `json:"type"` - Info PluginInfo `json:"info"` - Dependency Dependency `json:"dependencies"` + Info PluginInfo `json:"info"` + Dependencies Dependencies `json:"dependencies"` } -type Dependency struct { +type Dependencies struct { GrafanaVersion string `json:"grafanaVersion"` Plugins []Plugin `json:"plugins"` }