Plugins: Refactor plugin config into separate env var and request scoped services (#83261)

* seperate services for env + req

* merge with main

* fix tests

* undo changes to golden file

* fix linter

* remove unused fields

* split out new config struct

* provide config

* undo go mod changes

* more renaming

* fix tests

* undo bra.toml changes

* update go.work.sum

* undo changes

* trigger

* apply PR feedback

pkg/services/pluginsintegration/plugincontext/plugincontext.go

@@ -15,11 +15,10 @@ import (
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"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/envvars"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/adapters"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/setting"
@@ -32,28 +31,28 @@ const (
 
 func ProvideService(cfg *setting.Cfg, cacheService *localcache.CacheService, pluginStore pluginstore.Store,
 	dataSourceCache datasources.CacheService, dataSourceService datasources.DataSourceService,
-	pluginSettingsService pluginsettings.Service, licensing plugins.Licensing, pCfg *config.Cfg) *Provider {
+	pluginSettingsService pluginsettings.Service, pluginRequestConfigProvider pluginconfig.PluginRequestConfigProvider) *Provider {
 	return &Provider{
-		cfg:                   cfg,
-		cacheService:          cacheService,
-		pluginStore:           pluginStore,
-		dataSourceCache:       dataSourceCache,
-		dataSourceService:     dataSourceService,
-		pluginSettingsService: pluginSettingsService,
-		pluginEnvVars:         envvars.NewProvider(pCfg, licensing),
-		logger:                log.New("plugin.context"),
+		cfg:                         cfg,
+		cacheService:                cacheService,
+		pluginStore:                 pluginStore,
+		dataSourceCache:             dataSourceCache,
+		dataSourceService:           dataSourceService,
+		pluginSettingsService:       pluginSettingsService,
+		pluginRequestConfigProvider: pluginRequestConfigProvider,
+		logger:                      log.New("plugin.context"),
 	}
 }
 
 type Provider struct {
-	cfg                   *setting.Cfg
-	pluginEnvVars         *envvars.Service
-	cacheService          *localcache.CacheService
-	pluginStore           pluginstore.Store
-	dataSourceCache       datasources.CacheService
-	dataSourceService     datasources.DataSourceService
-	pluginSettingsService pluginsettings.Service
-	logger                log.Logger
+	cfg                         *setting.Cfg
+	pluginRequestConfigProvider pluginconfig.PluginRequestConfigProvider
+	cacheService                *localcache.CacheService
+	pluginStore                 pluginstore.Store
+	dataSourceCache             datasources.CacheService
+	dataSourceService           datasources.DataSourceService
+	pluginSettingsService       pluginsettings.Service
+	logger                      log.Logger
 }
 
 // Get will retrieve plugin context by the provided pluginID and orgID.
@@ -83,7 +82,7 @@ func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Reque
 		pCtx.AppInstanceSettings = appSettings
 	}
 
-	settings := p.pluginEnvVars.GetConfigMap(ctx, pluginID, plugin.ExternalService)
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
 	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
 
 	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)
@@ -120,7 +119,7 @@ func (p *Provider) GetWithDataSource(ctx context.Context, pluginID string, user
 	}
 	pCtx.DataSourceInstanceSettings = datasourceSettings
 
-	settings := p.pluginEnvVars.GetConfigMap(ctx, pluginID, plugin.ExternalService)
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
 	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
 
 	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)
@@ -168,7 +167,7 @@ func (p *Provider) PluginContextForDataSource(ctx context.Context, datasourceSet
 
 	pCtx.DataSourceInstanceSettings = datasourceSettings
 
-	settings := p.pluginEnvVars.GetConfigMap(ctx, pluginID, plugin.ExternalService)
+	settings := p.pluginRequestConfigProvider.PluginRequestConfig(ctx, pluginID)
 	pCtx.GrafanaConfig = backend.NewGrafanaCfg(settings)
 
 	ua, err := useragent.New(p.cfg.BuildVersion, runtime.GOOS, runtime.GOARCH)

pkg/services/pluginsintegration/plugincontext/plugincontext_test.go

@@ -10,11 +10,11 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db/dbtest"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/plugins/config"
 	pluginFakes "github.com/grafana/grafana/pkg/plugins/manager/fakes"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
@@ -43,7 +43,7 @@ func TestGet(t *testing.T) {
 	db := &dbtest.FakeDB{ExpectedError: pluginsettings.ErrPluginSettingNotFound}
 	pcp := plugincontext.ProvideService(cfg, localcache.ProvideService(),
 		pluginstore.New(preg, &pluginFakes.FakeLoader{}), &fakeDatasources.FakeCacheService{},
-		ds, pluginSettings.ProvideService(db, secretstest.NewFakeSecretsService()), pluginFakes.NewFakeLicensingService(), &config.Cfg{},
+		ds, pluginSettings.ProvideService(db, secretstest.NewFakeSecretsService()), pluginconfig.NewFakePluginRequestConfigProvider(),
 	)
 	identity := &user.SignedInUser{OrgID: int64(1), Login: "admin"}