[WIP] Plugins: Introduce Plugins specific config (#54854)

pkg/plugins/manager/loader/initializer/initializer.go

@@ -12,16 +12,17 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 )
 
 type Initializer struct {
-	cfg             *plugins.Cfg
+	cfg             *config.Cfg
 	license         models.Licensing
 	backendProvider plugins.BackendFactoryProvider
 	log             log.Logger
 }
 
-func New(cfg *plugins.Cfg, backendProvider plugins.BackendFactoryProvider, license models.Licensing) Initializer {
+func New(cfg *config.Cfg, backendProvider plugins.BackendFactoryProvider, license models.Licensing) Initializer {
 	return Initializer{
 		cfg:             cfg,
 		license:         license,
@@ -101,7 +102,7 @@ func (ps pluginSettings) asEnvVar(prefix string, hostEnv []string) []string {
 	return env
 }
 
-func getPluginSettings(pluginID string, cfg *plugins.Cfg) pluginSettings {
+func getPluginSettings(pluginID string, cfg *config.Cfg) pluginSettings {
 	ps := pluginSettings{}
 	for k, v := range cfg.PluginSettings[pluginID] {
 		if k == "path" || strings.ToLower(k) == "id" {

pkg/plugins/manager/loader/initializer/initializer_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
+	"github.com/grafana/grafana/pkg/plugins/config"
 )
 
 func TestInitializer_Initialize(t *testing.T) {
@@ -34,7 +35,7 @@ func TestInitializer_Initialize(t *testing.T) {
 		}
 
 		i := &Initializer{
-			cfg: plugins.NewCfg(),
+			cfg: &config.Cfg{},
 			log: log.NewNopLogger(),
 			backendProvider: &fakeBackendProvider{
 				plugin: p,
@@ -64,7 +65,7 @@ func TestInitializer_Initialize(t *testing.T) {
 		}
 
 		i := &Initializer{
-			cfg: plugins.NewCfg(),
+			cfg: &config.Cfg{},
 			log: log.NewNopLogger(),
 			backendProvider: &fakeBackendProvider{
 				plugin: p,
@@ -94,7 +95,7 @@ func TestInitializer_Initialize(t *testing.T) {
 		}
 
 		i := &Initializer{
-			cfg: plugins.NewCfg(),
+			cfg: &config.Cfg{},
 			log: log.NewNopLogger(),
 			backendProvider: &fakeBackendProvider{
 				plugin: p,
@@ -117,7 +118,7 @@ func TestInitializer_Initialize(t *testing.T) {
 		}
 
 		i := &Initializer{
-			cfg: &plugins.Cfg{},
+			cfg: &config.Cfg{},
 			log: log.NewNopLogger(),
 			backendProvider: &fakeBackendProvider{
 				plugin: p,
@@ -147,7 +148,7 @@ func TestInitializer_envVars(t *testing.T) {
 		}
 
 		i := &Initializer{
-			cfg: &plugins.Cfg{
+			cfg: &config.Cfg{
 				EnterpriseLicensePath: "/path/to/ent/license",
 				PluginSettings: map[string]map[string]string{
 					"test": {

pkg/plugins/manager/loader/loader.go

@@ -19,11 +19,11 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/initializer"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -35,7 +35,6 @@ var (
 var _ plugins.ErrorResolver = (*Loader)(nil)
 
 type Loader struct {
-	cfg                *plugins.Cfg
 	pluginFinder       finder.Finder
 	pluginInitializer  initializer.Initializer
 	signatureValidator signature.Validator
@@ -44,15 +43,14 @@ type Loader struct {
 	errs map[string]*plugins.SignatureError
 }
 
-func ProvideService(cfg *setting.Cfg, license models.Licensing, authorizer plugins.PluginLoaderAuthorizer,
+func ProvideService(cfg *config.Cfg, license models.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	backendProvider plugins.BackendFactoryProvider) (*Loader, error) {
-	return New(plugins.FromGrafanaCfg(cfg), license, authorizer, backendProvider), nil
+	return New(cfg, license, authorizer, backendProvider), nil
 }
 
-func New(cfg *plugins.Cfg, license models.Licensing, authorizer plugins.PluginLoaderAuthorizer,
+func New(cfg *config.Cfg, license models.Licensing, authorizer plugins.PluginLoaderAuthorizer,
 	backendProvider plugins.BackendFactoryProvider) *Loader {
 	return &Loader{
-		cfg:                cfg,
 		pluginFinder:       finder.New(),
 		pluginInitializer:  initializer.New(cfg, backendProvider, license),
 		signatureValidator: signature.NewValidator(authorizer),

pkg/plugins/manager/loader/loader_test.go

@@ -7,21 +7,21 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-	"github.com/grafana/grafana/pkg/services/org"
-
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/initializer"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -41,18 +41,16 @@ func TestLoader_Load(t *testing.T) {
 	tests := []struct {
 		name            string
 		class           plugins.Class
-		cfg             *plugins.Cfg
+		cfg             *config.Cfg
 		pluginPaths     []string
 		existingPlugins map[string]struct{}
 		want            []*plugins.Plugin
 		pluginErrors    map[string]*plugins.Error
 	}{
 		{
-			name:  "Load a Core plugin",
-			class: plugins.Core,
-			cfg: &plugins.Cfg{
-				PluginsPath: corePluginDir,
-			},
+			name:        "Load a Core plugin",
+			class:       plugins.Core,
+			cfg:         &config.Cfg{},
 			pluginPaths: []string{filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")},
 			want: []*plugins.Plugin{
 				{
@@ -99,11 +97,9 @@ func TestLoader_Load(t *testing.T) {
 			},
 		},
 		{
-			name:  "Load a Bundled plugin",
-			class: plugins.Bundled,
-			cfg: &plugins.Cfg{
-				PluginsPath: filepath.Join(parentDir, "testdata"),
-			},
+			name:        "Load a Bundled plugin",
+			class:       plugins.Bundled,
+			cfg:         &config.Cfg{},
 			pluginPaths: []string{"../testdata/valid-v2-signature"},
 			want: []*plugins.Plugin{
 				{
@@ -141,11 +137,9 @@ func TestLoader_Load(t *testing.T) {
 				},
 			},
 		}, {
-			name:  "Load plugin with symbolic links",
-			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath: filepath.Join(parentDir),
-			},
+			name:        "Load plugin with symbolic links",
+			class:       plugins.External,
+			cfg:         &config.Cfg{},
 			pluginPaths: []string{"../testdata/symbolic-plugin-dirs"},
 			want: []*plugins.Plugin{
 				{
@@ -221,9 +215,8 @@ func TestLoader_Load(t *testing.T) {
 		}, {
 			name:  "Load an unsigned plugin (development)",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				DevMode:     true,
-				PluginsPath: filepath.Join(parentDir),
+			cfg: &config.Cfg{
+				DevMode: true,
 			},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
 			want: []*plugins.Plugin{
@@ -258,11 +251,9 @@ func TestLoader_Load(t *testing.T) {
 				},
 			},
 		}, {
-			name:  "Load an unsigned plugin (production)",
-			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath: filepath.Join(parentDir),
-			},
+			name:        "Load an unsigned plugin (production)",
+			class:       plugins.External,
+			cfg:         &config.Cfg{},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
 			want:        []*plugins.Plugin{},
 			pluginErrors: map[string]*plugins.Error{
@@ -275,8 +266,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an unsigned plugin using PluginsAllowUnsigned config (production)",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath:          filepath.Join(parentDir),
+			cfg: &config.Cfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/unsigned-datasource"},
@@ -313,11 +303,9 @@ func TestLoader_Load(t *testing.T) {
 			},
 		},
 		{
-			name:  "Load an unsigned plugin with modified signature (production)",
-			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath: filepath.Join(parentDir),
-			},
+			name:        "Load an unsigned plugin with modified signature (production)",
+			class:       plugins.External,
+			cfg:         &config.Cfg{},
 			pluginPaths: []string{"../testdata/lacking-files"},
 			want:        []*plugins.Plugin{},
 			pluginErrors: map[string]*plugins.Error{
@@ -330,8 +318,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an unsigned plugin with modified signature using PluginsAllowUnsigned config (production) still includes a signing error",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath:          filepath.Join(parentDir),
+			cfg: &config.Cfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/lacking-files"},
@@ -346,8 +333,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with manifest which has a file not found in plugin folder",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath:          filepath.Join(parentDir),
+			cfg: &config.Cfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/invalid-v2-missing-file"},
@@ -362,8 +348,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load a plugin with file which is missing from the manifest",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath:          filepath.Join(parentDir),
+			cfg: &config.Cfg{
 				PluginsAllowUnsigned: []string{"test-datasource"},
 			},
 			pluginPaths: []string{"../testdata/invalid-v2-extra-file"},
@@ -378,8 +363,7 @@ func TestLoader_Load(t *testing.T) {
 		{
 			name:  "Load an app with includes",
 			class: plugins.External,
-			cfg: &plugins.Cfg{
-				PluginsPath:          filepath.Join(parentDir),
+			cfg: &config.Cfg{
 				PluginsAllowUnsigned: []string{"test-app"},
 			},
 			pluginPaths: []string{"../testdata/test-app-with-includes"},
@@ -509,7 +493,7 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 	t.Run("Load multiple", func(t *testing.T) {
 		tests := []struct {
 			name            string
-			cfg             *plugins.Cfg
+			cfg             *config.Cfg
 			pluginPaths     []string
 			appURL          string
 			existingPlugins map[string]struct{}
@@ -517,10 +501,8 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 			pluginErrors    map[string]*plugins.Error
 		}{
 			{
-				name: "Load multiple plugins (broken, valid, unsigned)",
-				cfg: &plugins.Cfg{
-					PluginsPath: filepath.Join(parentDir),
-				},
+				name:   "Load multiple plugins (broken, valid, unsigned)",
+				cfg:    &config.Cfg{},
 				appURL: "http://localhost:3000",
 				pluginPaths: []string{
 					"../testdata/invalid-plugin-json",    // test-app
@@ -648,7 +630,7 @@ func TestLoader_Signature_RootURL(t *testing.T) {
 			},
 		}
 
-		l := newLoader(&plugins.Cfg{PluginsPath: filepath.Join(parentDir)})
+		l := newLoader(&config.Cfg{})
 		got, err := l.Load(context.Background(), plugins.External, paths, map[string]struct{}{})
 		assert.NoError(t, err)
 
@@ -717,9 +699,7 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 			},
 		}
 
-		l := newLoader(&plugins.Cfg{
-			PluginsPath: filepath.Dir(pluginDir),
-		})
+		l := newLoader(&config.Cfg{})
 
 		got, err := l.Load(context.Background(), plugins.External, []string{pluginDir, pluginDir}, map[string]struct{}{})
 		assert.NoError(t, err)
@@ -806,9 +786,7 @@ func TestLoader_loadNestedPlugins(t *testing.T) {
 
 	t.Run("Load nested External plugins", func(t *testing.T) {
 		expected := []*plugins.Plugin{parent, child}
-		l := newLoader(&plugins.Cfg{
-			PluginsPath: rootDir,
-		})
+		l := newLoader(&config.Cfg{})
 
 		got, err := l.Load(context.Background(), plugins.External, []string{"../testdata/nested-plugins"}, map[string]struct{}{})
 		assert.NoError(t, err)
@@ -828,9 +806,7 @@ func TestLoader_loadNestedPlugins(t *testing.T) {
 		parent.Children = nil
 		expected := []*plugins.Plugin{parent}
 
-		l := newLoader(&plugins.Cfg{
-			PluginsPath: rootDir,
-		})
+		l := newLoader(&config.Cfg{})
 
 		got, err := l.Load(context.Background(), plugins.External, []string{"../testdata/nested-plugins"}, map[string]struct{}{
 			"test-panel": {},
@@ -970,9 +946,7 @@ func TestLoader_loadNestedPlugins(t *testing.T) {
 		child.Parent = parent
 
 		expected := []*plugins.Plugin{parent, child}
-		l := newLoader(&plugins.Cfg{
-			PluginsPath: rootDir,
-		})
+		l := newLoader(&config.Cfg{})
 
 		got, err := l.Load(context.Background(), plugins.External, []string{"../testdata/app-with-child"}, map[string]struct{}{})
 		assert.NoError(t, err)
@@ -1169,9 +1143,8 @@ func Test_setPathsBasedOnApp(t *testing.T) {
 	})
 }
 
-func newLoader(cfg *plugins.Cfg) *Loader {
+func newLoader(cfg *config.Cfg) *Loader {
 	return &Loader{
-		cfg:                cfg,
 		pluginFinder:       finder.New(),
 		pluginInitializer:  initializer.New(cfg, provider.ProvideService(coreplugin.NewRegistry(make(map[string]backendplugin.PluginFactoryFunc))), &fakeLicensingService{}),
 		signatureValidator: signature.NewValidator(signature.NewUnsignedAuthorizer(cfg)),

pkg/plugins/manager/manager.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/logger"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader"
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
@@ -21,7 +22,7 @@ var _ plugins.RendererManager = (*PluginManager)(nil)
 var _ plugins.SecretsPluginManager = (*PluginManager)(nil)
 
 type PluginManager struct {
-	cfg            *plugins.Cfg
+	cfg            *config.Cfg
 	pluginSources  []plugins.PluginSource
 	pluginRepo     repo.Service
 	pluginStorage  storage.Manager
@@ -31,10 +32,15 @@ type PluginManager struct {
 	log            log.Logger
 }
 
-func ProvideService(grafanaCfg *setting.Cfg, pluginRegistry registry.Service, pluginLoader loader.Service,
+func ProvideService(cfg *config.Cfg, grafCfg *setting.Cfg, pluginRegistry registry.Service, pluginLoader loader.Service,
 	pluginRepo repo.Service) (*PluginManager, error) {
-	pm := New(plugins.FromGrafanaCfg(grafanaCfg), pluginRegistry, pluginSources(grafanaCfg), pluginLoader,
-		pluginRepo, storage.FileSystem(logger.NewLogger("plugin.fs"), grafanaCfg.PluginsPath),
+	pm := New(cfg, pluginRegistry,
+		pluginSources(pathData{
+			pluginsPath:        grafCfg.PluginsPath,
+			bundledPluginsPath: grafCfg.BundledPluginsPath,
+			staticRootPath:     grafCfg.StaticRootPath,
+		}, cfg.PluginSettings),
+		pluginLoader, pluginRepo, storage.FileSystem(logger.NewLogger("plugin.fs"), grafCfg.PluginsPath),
 		process.NewManager(pluginRegistry),
 	)
 	if err := pm.Init(context.Background()); err != nil {
@@ -43,7 +49,7 @@ func ProvideService(grafanaCfg *setting.Cfg, pluginRegistry registry.Service, pl
 	return pm, nil
 }
 
-func New(cfg *plugins.Cfg, pluginRegistry registry.Service, pluginSources []plugins.PluginSource,
+func New(cfg *config.Cfg, pluginRegistry registry.Service, pluginSources []plugins.PluginSource,
 	pluginLoader loader.Service, pluginRepo repo.Service, pluginStorage storage.Manager,
 	processManager process.Service) *PluginManager {
 	return &PluginManager{
@@ -253,26 +259,30 @@ func (m *PluginManager) unregisterAndStop(ctx context.Context, p *plugins.Plugin
 	return nil
 }
 
-func pluginSources(cfg *setting.Cfg) []plugins.PluginSource {
+type pathData struct {
+	pluginsPath, bundledPluginsPath, staticRootPath string
+}
+
+func pluginSources(p pathData, ps map[string]map[string]string) []plugins.PluginSource {
 	return []plugins.PluginSource{
-		{Class: plugins.Core, Paths: corePluginPaths(cfg)},
-		{Class: plugins.Bundled, Paths: []string{cfg.BundledPluginsPath}},
-		{Class: plugins.External, Paths: append([]string{cfg.PluginsPath}, pluginSettingPaths(cfg)...)},
+		{Class: plugins.Core, Paths: corePluginPaths(p.staticRootPath)},
+		{Class: plugins.Bundled, Paths: []string{p.bundledPluginsPath}},
+		{Class: plugins.External, Paths: append([]string{p.pluginsPath}, pluginSettingPaths(ps)...)},
 	}
 }
 
 // corePluginPaths provides a list of the Core plugin paths which need to be scanned on init()
-func corePluginPaths(cfg *setting.Cfg) []string {
-	datasourcePaths := filepath.Join(cfg.StaticRootPath, "app/plugins/datasource")
-	panelsPath := filepath.Join(cfg.StaticRootPath, "app/plugins/panel")
+func corePluginPaths(staticRootPath string) []string {
+	datasourcePaths := filepath.Join(staticRootPath, "app/plugins/datasource")
+	panelsPath := filepath.Join(staticRootPath, "app/plugins/panel")
 	return []string{datasourcePaths, panelsPath}
 }
 
 // pluginSettingPaths provides a plugin paths defined in cfg.PluginSettings which need to be scanned on init()
-func pluginSettingPaths(cfg *setting.Cfg) []string {
+func pluginSettingPaths(ps map[string]map[string]string) []string {
 	var pluginSettingDirs []string
-	for _, settings := range cfg.PluginSettings {
-		path, exists := settings["path"]
+	for _, s := range ps {
+		path, exists := s["path"]
 		if !exists || path == "" {
 			continue
 		}

pkg/plugins/manager/manager_integration_test.go

@@ -9,17 +9,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace"
 	"gopkg.in/ini.v1"
 
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/client"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
@@ -57,20 +59,27 @@ func TestIntegrationPluginManager_Run(t *testing.T) {
 	require.NoError(t, err)
 
 	features := featuremgmt.WithFeatures()
+
+	// We use the raw config here as it forms the basis for the setting.Provider implementation
+	// The plugin manager also relies directly on the setting.Cfg struct to provide Grafana specific
+	// properties such as the loading paths
+	raw, err := ini.Load([]byte(`
+		app_mode = production
+
+		[plugin.test-app]
+		path=testdata/test-app
+
+		[plugin.test-panel]
+		not=included
+		`),
+	)
+	require.NoError(t, err)
+
 	cfg := &setting.Cfg{
-		Raw:                    ini.Empty(),
-		Env:                    setting.Prod,
-		StaticRootPath:         staticRootPath,
-		BundledPluginsPath:     bundledPluginsPath,
-		IsFeatureToggleEnabled: features.IsEnabled,
-		PluginSettings: map[string]map[string]string{
-			"plugin.test-app": {
-				"path": "testdata/test-app",
-			},
-			"plugin.test-panel": {
-				"not": "included",
-			},
-		},
+		Raw:                raw,
+		StaticRootPath:     staticRootPath,
+		BundledPluginsPath: bundledPluginsPath,
+		Azure:              &azsettings.AzureSettings{},
 	}
 
 	tracer := &fakeTracer{}
@@ -99,9 +108,9 @@ func TestIntegrationPluginManager_Run(t *testing.T) {
 
 	coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf)
 
-	pmCfg := plugins.FromGrafanaCfg(cfg)
+	pCfg := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
 	reg := registry.ProvideService()
-	pm, err := ProvideService(cfg, reg, loader.New(pmCfg, license, signature.NewUnsignedAuthorizer(pmCfg),
+	pm, err := ProvideService(pCfg, cfg, reg, loader.New(pCfg, license, signature.NewUnsignedAuthorizer(pCfg),
 		provider.ProvideService(coreRegistry)), nil)
 	require.NoError(t, err)
 	ps := store.ProvideService(reg)

pkg/plugins/manager/manager_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/plugins/repo"
 	"github.com/grafana/grafana/pkg/plugins/storage"
@@ -61,7 +62,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 		}
 		proc := fakes.NewFakeProcessManager()
 
-		pm := New(&plugins.Cfg{}, fakes.NewFakePluginRegistry(), []plugins.PluginSource{}, loader, pluginRepo, fs, proc)
+		pm := New(&config.Cfg{}, fakes.NewFakePluginRegistry(), []plugins.PluginSource{}, loader, pluginRepo, fs, proc)
 		err := pm.Add(context.Background(), pluginID, v1, plugins.CompatOpts{})
 		require.NoError(t, err)
 
@@ -175,7 +176,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 			}
 
 			proc := fakes.NewFakeProcessManager()
-			pm := New(&plugins.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{}, &fakes.FakePluginStorage{}, proc)
+			pm := New(&config.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{}, &fakes.FakePluginStorage{}, proc)
 			err := pm.Add(context.Background(), p.ID, "3.2.0", plugins.CompatOpts{})
 			require.ErrorIs(t, err, plugins.ErrInstallCorePlugin)
 
@@ -201,7 +202,7 @@ func TestPluginManager_Add_Remove(t *testing.T) {
 func TestPluginManager_Run(t *testing.T) {
 	t.Run("Plugin sources are loaded in order", func(t *testing.T) {
 		loader := &fakes.FakeLoader{}
-		pm := New(&plugins.Cfg{}, fakes.NewFakePluginRegistry(), []plugins.PluginSource{
+		pm := New(&config.Cfg{}, fakes.NewFakePluginRegistry(), []plugins.PluginSource{
 			{Class: plugins.Bundled, Paths: []string{"path1"}},
 			{Class: plugins.Core, Paths: []string{"path2"}},
 			{Class: plugins.External, Paths: []string{"path3"}},
@@ -227,7 +228,7 @@ func TestManager_Renderer(t *testing.T) {
 			},
 		}
 
-		pm := New(&plugins.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{},
+		pm := New(&config.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{},
 			&fakes.FakePluginStorage{}, &fakes.FakeProcessManager{})
 
 		r := pm.Renderer(context.Background())
@@ -251,7 +252,7 @@ func TestManager_SecretsManager(t *testing.T) {
 			},
 		}
 
-		pm := New(&plugins.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{},
+		pm := New(&config.Cfg{}, reg, []plugins.PluginSource{}, &fakes.FakeLoader{}, &fakes.FakePluginRepo{},
 			&fakes.FakePluginStorage{}, &fakes.FakeProcessManager{})
 
 		r := pm.SecretsManager(context.Background())

pkg/plugins/manager/signature/authorizer.go

@@ -2,21 +2,21 @@ package signature
 
 import (
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/plugins/config"
 )
 
-func NewUnsignedAuthorizer(cfg *plugins.Cfg) *UnsignedPluginAuthorizer {
+func ProvideOSSAuthorizer(cfg *config.Cfg) *UnsignedPluginAuthorizer {
+	return NewUnsignedAuthorizer(cfg)
+}
+
+func NewUnsignedAuthorizer(cfg *config.Cfg) *UnsignedPluginAuthorizer {
 	return &UnsignedPluginAuthorizer{
 		cfg: cfg,
 	}
 }
 
-func ProvideOSSAuthorizer(cfg *setting.Cfg) *UnsignedPluginAuthorizer {
-	return NewUnsignedAuthorizer(plugins.FromGrafanaCfg(cfg))
-}
-
 type UnsignedPluginAuthorizer struct {
-	cfg *plugins.Cfg
+	cfg *config.Cfg
 }
 
 func (u *UnsignedPluginAuthorizer) CanLoadPlugin(p *plugins.Plugin) bool {