Backend: Rename variables for style conformance (#29097)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/cmd/grafana-cli/commands/commandstest/fake_api_client.go

@@ -12,9 +12,9 @@ type FakeGrafanaComClient struct {
 	ListAllPluginsFunc func(repoUrl string) (models.PluginRepo, error)
 }
 
-func (client *FakeGrafanaComClient) GetPlugin(pluginId, repoUrl string) (models.Plugin, error) {
+func (client *FakeGrafanaComClient) GetPlugin(pluginID, repoUrl string) (models.Plugin, error) {
 	if client.GetPluginFunc != nil {
-		return client.GetPluginFunc(pluginId, repoUrl)
+		return client.GetPluginFunc(pluginID, repoUrl)
 	}
 
 	return models.Plugin{}, nil
@@ -28,9 +28,9 @@ func (client *FakeGrafanaComClient) DownloadFile(pluginName string, tmpFile *os.
 	return nil
 }
 
-func (client *FakeGrafanaComClient) ListAllPlugins(repoUrl string) (models.PluginRepo, error) {
+func (client *FakeGrafanaComClient) ListAllPlugins(repoURL string) (models.PluginRepo, error) {
 	if client.ListAllPluginsFunc != nil {
-		return client.ListAllPluginsFunc(repoUrl)
+		return client.ListAllPluginsFunc(repoURL)
 	}
 	return models.PluginRepo{}, nil
 }

pkg/cmd/grafana-cli/commands/install_command.go

@@ -132,11 +132,11 @@ func InstallPlugin(pluginName, version string, c utils.CommandLine, client utils
 
 	res, _ := services.ReadPlugin(pluginFolder, pluginName)
 	for _, v := range res.Dependencies.Plugins {
-		if err := InstallPlugin(v.Id, "", c, client); err != nil {
-			return errutil.Wrapf(err, "failed to install plugin '%s'", v.Id)
+		if err := InstallPlugin(v.ID, "", c, client); err != nil {
+			return errutil.Wrapf(err, "failed to install plugin '%s'", v.ID)
 		}
 
-		logger.Infof("Installed dependency: %v ✔\n", v.Id)
+		logger.Infof("Installed dependency: %v ✔\n", v.ID)
 	}
 
 	return err

pkg/cmd/grafana-cli/commands/install_command_test.go

@@ -99,12 +99,12 @@ func TestInstallPluginCommand(t *testing.T) {
 		GetPluginFunc: func(pluginId, repoUrl string) (models.Plugin, error) {
 			require.Equal(t, "test-plugin-panel", pluginId)
 			plugin := models.Plugin{
-				Id:       "test-plugin-panel",
+				ID:       "test-plugin-panel",
 				Category: "",
 				Versions: []models.Version{
 					{
 						Commit:  "commit",
-						Url:     "url",
+						URL:     "url",
 						Version: "1.0.0",
 						Arch: map[string]models.ArchMeta{
 							fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH): {
@@ -237,7 +237,7 @@ type versionArg struct {
 
 func makePluginWithVersions(versions ...versionArg) *models.Plugin {
 	plugin := &models.Plugin{
-		Id:       "",
+		ID:       "",
 		Category: "",
 		Versions: []models.Version{},
 	}
@@ -246,7 +246,7 @@ func makePluginWithVersions(versions ...versionArg) *models.Plugin {
 		ver := models.Version{
 			Version: version.Version,
 			Commit:  fmt.Sprintf("commit_%s", version.Version),
-			Url:     fmt.Sprintf("url_%s", version.Version),
+			URL:     fmt.Sprintf("url_%s", version.Version),
 		}
 		if version.Arch != nil {
 			ver.Arch = map[string]models.ArchMeta{}

pkg/cmd/grafana-cli/commands/listremote_command.go

@@ -18,7 +18,7 @@ func (cmd Command) listRemoteCommand(c utils.CommandLine) error {
 		if len(plugin.Versions) > 0 {
 			ver := latestSupportedVersion(&plugin)
 			if ver != nil {
-				logger.Infof("id: %v version: %s\n", plugin.Id, ver.Version)
+				logger.Infof("id: %v version: %s\n", plugin.ID, ver.Version)
 			}
 		}
 	}

pkg/cmd/grafana-cli/commands/ls_command.go

@@ -47,7 +47,7 @@ func (cmd Command) lsCommand(c utils.CommandLine) error {
 	}
 
 	for _, plugin := range plugins {
-		logger.Infof("%s %s %s\n", plugin.Id, color.YellowString("@"), plugin.Info.Version)
+		logger.Infof("%s %s %s\n", plugin.ID, color.YellowString("@"), plugin.Info.Version)
 	}
 
 	return nil

pkg/cmd/grafana-cli/commands/upgrade_all_command.go

@@ -37,7 +37,7 @@ func (cmd Command) upgradeAllCommand(c utils.CommandLine) error {
 	for _, localPlugin := range localPlugins {
 		for _, p := range remotePlugins.Plugins {
 			remotePlugin := p
-			if localPlugin.Id != remotePlugin.Id {
+			if localPlugin.ID != remotePlugin.ID {
 				continue
 			}
 			if shouldUpgrade(localPlugin.Info.Version, &remotePlugin) {
@@ -47,14 +47,14 @@ func (cmd Command) upgradeAllCommand(c utils.CommandLine) error {
 	}
 
 	for _, p := range pluginsToUpgrade {
-		logger.Infof("Updating %v \n", p.Id)
+		logger.Infof("Updating %v \n", p.ID)
 
-		err := services.RemoveInstalledPlugin(pluginsDir, p.Id)
+		err := services.RemoveInstalledPlugin(pluginsDir, p.ID)
 		if err != nil {
 			return err
 		}
 
-		err = InstallPlugin(p.Id, "", c, cmd.Client)
+		err = InstallPlugin(p.ID, "", c, cmd.Client)
 		if err != nil {
 			return err
 		}

pkg/cmd/grafana-cli/models/model.go

@@ -5,7 +5,7 @@ import (
 )
 
 type InstalledPlugin struct {
-	Id   string `json:"id"`
+	ID   string `json:"id"`
 	Name string `json:"name"`
 	Type string `json:"type"`
 
@@ -24,14 +24,14 @@ type PluginInfo struct {
 }
 
 type Plugin struct {
-	Id       string    `json:"id"`
+	ID       string    `json:"id"`
 	Category string    `json:"category"`
 	Versions []Version `json:"versions"`
 }
 
 type Version struct {
 	Commit  string `json:"commit"`
-	Url     string `json:"url"`
+	URL     string `json:"url"`
 	Version string `json:"version"`
 	// os-arch to md5 checksum to check when downloading the file
 	Arch map[string]ArchMeta `json:"arch"`

pkg/cmd/grafana-cli/services/services.go

@@ -84,7 +84,7 @@ func ReadPlugin(pluginDir, pluginName string) (models.InstalledPlugin, error) {
 		res.Info.Version = "0.0.0"
 	}
 
-	if res.Id == "" {
+	if res.ID == "" {
 		return models.InstalledPlugin{}, errors.New("could not find plugin " + pluginName + " in " + pluginDir)
 	}