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

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

8
pkg/cmd/grafana-cli/commands/ls_command.go
View File

@@ -5,12 +5,12 @@ import (
"github.com/fatih/color"
"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"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
)
var ls_getPlugins func(path string) []m.InstalledPlugin = s.GetLocalPlugins
var ls_getPlugins func(path string) []models.InstalledPlugin = services.GetLocalPlugins
var validateLsCommand = func(pluginDir string) error {
if pluginDir == "" {
@@ -18,7 +18,7 @@ var validateLsCommand = func(pluginDir string) error {
}
logger.Debug("plugindir: " + pluginDir + "\n")
pluginDirInfo, err := s.IoHelper.Stat(pluginDir)
pluginDirInfo, err := services.IoHelper.Stat(pluginDir)
if err != nil {
return err
}