diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index a1b249d9c81..6e13c37d3c7 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -91,14 +91,7 @@ func InstallPlugin(pluginName, version string, c CommandLine) error { } logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), pluginName) - - res, _ := s.ReadPlugin(pluginFolder, pluginName) - for _, v := range res.Dependencies.Plugins { - InstallPlugin(v.Id, version, c) - logger.Infof("Installed dependency: %v ✔\n", v.Id) - } - - return err + return nil } func SelectVersion(plugin m.Plugin, version string) (m.Version, error) { diff --git a/pkg/cmd/grafana-cli/models/model.go b/pkg/cmd/grafana-cli/models/model.go index 0700cb9a9e4..ee3e9609090 100644 --- a/pkg/cmd/grafana-cli/models/model.go +++ b/pkg/cmd/grafana-cli/models/model.go @@ -14,8 +14,7 @@ type InstalledPlugin struct { } type Dependencies struct { - GrafanaVersion string `json:"grafanaVersion"` - Plugins []Plugin `json:"plugins"` + GrafanaVersion string `json:"grafanaVersion"` } type PluginInfo struct { diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go index 541b37c8a8a..a3c49cf40f4 100644 --- a/pkg/plugins/models.go +++ b/pkg/plugins/models.go @@ -59,10 +59,6 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error { plog.Info("Registering plugin", "name", pb.Name) } - if len(pb.Dependencies.Plugins) == 0 { - pb.Dependencies.Plugins = []PluginDependencyItem{} - } - if pb.Dependencies.GrafanaVersion == "" { pb.Dependencies.GrafanaVersion = "*" } @@ -79,8 +75,7 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error { } type PluginDependencies struct { - GrafanaVersion string `json:"grafanaVersion"` - Plugins []PluginDependencyItem `json:"plugins"` + GrafanaVersion string `json:"grafanaVersion"` } type PluginInclude struct { @@ -96,13 +91,6 @@ type PluginInclude struct { Id string `json:"-"` } -type PluginDependencyItem struct { - Type string `json:"type"` - Id string `json:"id"` - Name string `json:"name"` - Version string `json:"version"` -} - type PluginInfo struct { Author PluginInfoLink `json:"author"` Description string `json:"description"`