PluginManager: Remove some global state (#31081)

* PluginManager: Remove global state

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

pkg/api/frontendsettings.go

@@ -224,8 +224,8 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
 			"commit":        commit,
 			"buildstamp":    buildstamp,
 			"edition":       hs.License.Edition(),
-			"latestVersion": plugins.GrafanaLatestVersion,
-			"hasUpdate":     plugins.GrafanaHasUpdate,
+			"latestVersion": hs.PluginManager.GrafanaLatestVersion,
+			"hasUpdate":     hs.PluginManager.GrafanaHasUpdate,
 			"env":           setting.Env,
 			"isEnterprise":  hs.License.HasValidLicense(),
 		},

pkg/api/frontendsettings_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/rendering"
 
 	"github.com/grafana/grafana/pkg/services/licensing"
@@ -47,8 +48,9 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg) (*macaron.Macaron, *HT
 	hs := &HTTPServer{
 		Cfg:           cfg,
 		Bus:           bus.GetBus(),
-		License:       &licensing.OSSLicensingService{},
+		License:       &licensing.OSSLicensingService{Cfg: cfg},
 		RenderService: r,
+		PluginManager: &plugins.PluginManager{Cfg: cfg},
 	}
 
 	m := macaron.New()
@@ -74,13 +76,17 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonyomus(t *testing.T) {
 	}
 
 	cfg := setting.NewCfg()
+	cfg.Env = "testing"
+	cfg.BuildVersion = "7.8.9"
+	cfg.BuildCommit = "01234567"
 	m, hs := setupTestEnvironment(t, cfg)
 
 	req := httptest.NewRequest(http.MethodGet, "/api/frontend/settings", nil)
 
-	setting.BuildVersion = "7.8.9"
-	setting.BuildCommit = "01234567"
-	setting.Env = "testing"
+	// TODO: Remove
+	setting.BuildVersion = cfg.BuildVersion
+	setting.BuildCommit = cfg.BuildCommit
+	setting.Env = cfg.Env
 
 	tests := []struct {
 		desc        string

pkg/api/index.go

@@ -408,8 +408,8 @@ func (hs *HTTPServer) setIndexViewData(c *models.ReqContext) (*dtos.IndexViewDat
 		GoogleTagManagerId:      setting.GoogleTagManagerId,
 		BuildVersion:            setting.BuildVersion,
 		BuildCommit:             setting.BuildCommit,
-		NewGrafanaVersion:       plugins.GrafanaLatestVersion,
-		NewGrafanaVersionExists: plugins.GrafanaHasUpdate,
+		NewGrafanaVersion:       hs.PluginManager.GrafanaLatestVersion,
+		NewGrafanaVersionExists: hs.PluginManager.GrafanaHasUpdate,
 		AppName:                 setting.ApplicationName,
 		AppNameBodyClass:        getAppNameBodyClass(hs.License.HasValidLicense()),
 		FavIcon:                 "public/img/fav32.png",

pkg/api/plugins.go

@@ -368,7 +368,7 @@ func (hs *HTTPServer) getCachedPluginSettings(pluginID string, user *models.Sign
 }
 
 func (hs *HTTPServer) GetPluginErrorsList(c *models.ReqContext) response.Response {
-	return response.JSON(200, plugins.ScanningErrors())
+	return response.JSON(200, hs.PluginManager.ScanningErrors())
 }
 
 func translatePluginRequestErrorToAPIError(err error) response.Response {