[v8.3.x] Plugins: Refactor Grafana and Plugin version update checkers (#44662)

* 44529

* fix test

pkg/plugins/manager/manager.go

@@ -118,24 +118,6 @@ func (m *PluginManager) init() error {
 }
 
 func (m *PluginManager) Run(ctx context.Context) error {
-	if m.cfg.CheckForUpdates {
-		go func() {
-			m.checkForUpdates()
-
-			ticker := time.NewTicker(time.Minute * 10)
-			run := true
-
-			for run {
-				select {
-				case <-ticker.C:
-					m.checkForUpdates()
-				case <-ctx.Done():
-					run = false
-				}
-			}
-		}()
-	}
-
 	<-ctx.Done()
 	m.shutdown(ctx)
 	return ctx.Err()

pkg/plugins/manager/update_checker.go

@@ -1,84 +0,0 @@
-package manager
-
-import (
-	"context"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-version"
-)
-
-var (
-	httpClient = http.Client{Timeout: 10 * time.Second}
-)
-
-type gcomPlugin struct {
-	Slug    string `json:"slug"`
-	Version string `json:"version"`
-}
-
-func (m *PluginManager) checkForUpdates() {
-	if !m.cfg.CheckForUpdates {
-		return
-	}
-
-	m.log.Debug("Checking for updates")
-
-	pluginIDs := m.pluginsEligibleForVersionCheck()
-	resp, err := httpClient.Get("https://grafana.com/api/plugins/versioncheck?slugIn=" + strings.Join(pluginIDs, ",") + "&grafanaVersion=" + m.cfg.BuildVersion)
-	if err != nil {
-		m.log.Debug("Failed to get plugins repo from grafana.com", "error", err.Error())
-		return
-	}
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			m.log.Warn("Failed to close response body", "err", err)
-		}
-	}()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		m.log.Debug("Update check failed, reading response from grafana.com", "error", err.Error())
-		return
-	}
-
-	var gcomPlugins []gcomPlugin
-	err = json.Unmarshal(body, &gcomPlugins)
-	if err != nil {
-		m.log.Debug("Failed to unmarshal plugin repo, reading response from grafana.com", "error", err.Error())
-		return
-	}
-
-	for _, localP := range m.Plugins(context.TODO()) {
-		for _, gcomP := range gcomPlugins {
-			if gcomP.Slug == localP.ID {
-				localP.GrafanaComVersion = gcomP.Version
-
-				plugVersion, err1 := version.NewVersion(localP.Info.Version)
-				gplugVersion, err2 := version.NewVersion(gcomP.Version)
-
-				if err1 != nil || err2 != nil {
-					localP.GrafanaComHasUpdate = localP.Info.Version != localP.GrafanaComVersion
-				} else {
-					localP.GrafanaComHasUpdate = plugVersion.LessThan(gplugVersion)
-				}
-			}
-		}
-	}
-}
-
-func (m *PluginManager) pluginsEligibleForVersionCheck() []string {
-	var result []string
-	for _, p := range m.plugins() {
-		if p.IsCorePlugin() {
-			continue
-		}
-
-		result = append(result, p.ID)
-	}
-
-	return result
-}

pkg/plugins/plugins.go

@@ -32,10 +32,6 @@ type Plugin struct {
 	SignedFiles    PluginFiles
 	SignatureError *SignatureError
 
-	// GCOM update checker fields
-	GrafanaComVersion   string
-	GrafanaComHasUpdate bool
-
 	// SystemJS fields
 	Module  string
 	BaseURL string
@@ -63,10 +59,6 @@ type PluginDTO struct {
 	SignedFiles    PluginFiles
 	SignatureError *SignatureError
 
-	// GCOM update checker fields
-	GrafanaComVersion   string
-	GrafanaComHasUpdate bool
-
 	// SystemJS fields
 	Module  string
 	BaseURL string
@@ -315,22 +307,20 @@ func (p *Plugin) ToDTO() PluginDTO {
 	c, _ := p.Client()
 
 	return PluginDTO{
-		JSONData:            p.JSONData,
-		PluginDir:           p.PluginDir,
-		Class:               p.Class,
-		IncludedInAppID:     p.IncludedInAppID,
-		DefaultNavURL:       p.DefaultNavURL,
-		Pinned:              p.Pinned,
-		Signature:           p.Signature,
-		SignatureType:       p.SignatureType,
-		SignatureOrg:        p.SignatureOrg,
-		SignedFiles:         p.SignedFiles,
-		SignatureError:      p.SignatureError,
-		GrafanaComVersion:   p.GrafanaComVersion,
-		GrafanaComHasUpdate: p.GrafanaComHasUpdate,
-		Module:              p.Module,
-		BaseURL:             p.BaseURL,
-		StreamHandler:       c,
+		JSONData:        p.JSONData,
+		PluginDir:       p.PluginDir,
+		Class:           p.Class,
+		IncludedInAppID: p.IncludedInAppID,
+		DefaultNavURL:   p.DefaultNavURL,
+		Pinned:          p.Pinned,
+		Signature:       p.Signature,
+		SignatureType:   p.SignatureType,
+		SignatureOrg:    p.SignatureOrg,
+		SignedFiles:     p.SignedFiles,
+		SignatureError:  p.SignatureError,
+		Module:          p.Module,
+		BaseURL:         p.BaseURL,
+		StreamHandler:   c,
 	}
 }