Chore: Consolidate on golangci-lint (#25834)

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

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

@@ -163,7 +163,8 @@ func supportsCurrentArch(version *models.Version) bool {
 }
 
 func latestSupportedVersion(plugin *models.Plugin) *models.Version {
-	for _, ver := range plugin.Versions {
+	for _, v := range plugin.Versions {
+		ver := v
 		if supportsCurrentArch(&ver) {
 			return &ver
 		}

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

@@ -13,7 +13,8 @@ func (cmd Command) listRemoteCommand(c utils.CommandLine) error {
 		return err
 	}
 
-	for _, plugin := range plugin.Plugins {
+	for _, p := range plugin.Plugins {
+		plugin := p
 		if len(plugin.Versions) > 0 {
 			ver := latestSupportedVersion(&plugin)
 			if ver != nil {

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

@@ -35,11 +35,13 @@ func (cmd Command) upgradeAllCommand(c utils.CommandLine) error {
 	pluginsToUpgrade := make([]models.InstalledPlugin, 0)
 
 	for _, localPlugin := range localPlugins {
-		for _, remotePlugin := range remotePlugins.Plugins {
-			if localPlugin.Id == remotePlugin.Id {
-				if shouldUpgrade(localPlugin.Info.Version, &remotePlugin) {
-					pluginsToUpgrade = append(pluginsToUpgrade, localPlugin)
-				}
+		for _, p := range remotePlugins.Plugins {
+			remotePlugin := p
+			if localPlugin.Id != remotePlugin.Id {
+				continue
+			}
+			if shouldUpgrade(localPlugin.Info.Version, &remotePlugin) {
+				pluginsToUpgrade = append(pluginsToUpgrade, localPlugin)
 			}
 		}
 	}

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

@@ -21,8 +21,9 @@ func TestVersionComparison(t *testing.T) {
 		}
 
 		for k, v := range upgradeablePlugins {
+			val := v
 			t.Run(fmt.Sprintf("for %s should be true", k), func(t *testing.T) {
-				assert.True(t, shouldUpgrade(k, &v))
+				assert.True(t, shouldUpgrade(k, &val))
 			})
 		}
 	})
@@ -39,8 +40,9 @@ func TestVersionComparison(t *testing.T) {
 		}
 
 		for k, v := range shouldNotUpgrade {
+			val := v
 			t.Run(fmt.Sprintf("for %s should be false", k), func(t *testing.T) {
-				assert.False(t, shouldUpgrade(k, &v))
+				assert.False(t, shouldUpgrade(k, &val))
 			})
 		}
 	})