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

avoid aliased import in cli (#22566)

Browse Source
This commit is contained in:
Carl Bergquist
2020-03-04 13:18:13 +01:00
committed by GitHub
parent 3fdd2648b1
commit 766d8a5888
6 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-cli/commands/upgrade_command.go
+3 -3
View File
@@ -3,7 +3,7 @@ package commands
import (
"github.com/fatih/color"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
"github.com/grafana/grafana/pkg/util/errutil"
)
@@ -12,7 +12,7 @@ func (cmd Command) upgradeCommand(c utils.CommandLine) error {
pluginsDir := c.PluginDirectory()
pluginName := c.Args().First()
localPlugin, err := s.ReadPlugin(pluginsDir, pluginName)
localPlugin, err := services.ReadPlugin(pluginsDir, pluginName)
if err != nil {
return err
@@ -24,7 +24,7 @@ func (cmd Command) upgradeCommand(c utils.CommandLine) error {
}
if shouldUpgrade(localPlugin.Info.Version, &plugin) {
if err := s.RemoveInstalledPlugin(pluginsDir, pluginName); err != nil {
if err := services.RemoveInstalledPlugin(pluginsDir, pluginName); err != nil {
return errutil.Wrapf(err, "failed to remove plugin '%s'", pluginName)
}