Plugins: Refactor creation of plugin context to dedicated service (#66451)

* first pass

* fix tests

* return errs

* change signature

* tidy

* delete unnecessary fields from test

* tidy

* fix tests

* simplify

* separate error check in API

* apply nits

pkg/tsdb/legacydata/service/service.go

@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/adapters"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata"
 )
 
@@ -17,25 +17,22 @@ type Service struct {
 	pluginsClient      plugins.Client
 	oAuthTokenService  oauthtoken.OAuthTokenService
 	dataSourcesService datasources.DataSourceService
+	pCtxProvider       *plugincontext.Provider
 }
 
 func ProvideService(pluginsClient plugins.Client, oAuthTokenService oauthtoken.OAuthTokenService,
-	dataSourcesService datasources.DataSourceService) *Service {
+	dataSourcesService datasources.DataSourceService, pCtxProvider *plugincontext.Provider) *Service {
 	return &Service{
 		pluginsClient:      pluginsClient,
 		oAuthTokenService:  oAuthTokenService,
 		dataSourcesService: dataSourcesService,
+		pCtxProvider:       pCtxProvider,
 	}
 }
 
 //nolint:staticcheck // legacydata.DataResponse deprecated
 func (h *Service) HandleRequest(ctx context.Context, ds *datasources.DataSource, query legacydata.DataQuery) (legacydata.DataResponse, error) {
-	decryptedJsonData, err := h.dataSourcesService.DecryptedValues(ctx, ds)
-	if err != nil {
-		return legacydata.DataResponse{}, err
-	}
-
-	req, err := generateRequest(ctx, ds, decryptedJsonData, query)
+	req, err := h.generateRequest(ctx, ds, query)
 	if err != nil {
 		return legacydata.DataResponse{}, err
 	}
@@ -72,39 +69,20 @@ func (h *Service) HandleRequest(ctx context.Context, ds *datasources.DataSource,
 	return tR, nil
 }
 
-func generateRequest(ctx context.Context, ds *datasources.DataSource, decryptedJsonData map[string]string, query legacydata.DataQuery) (*backend.QueryDataRequest, error) {
-	jsonDataBytes, err := ds.JsonData.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-
-	instanceSettings := &backend.DataSourceInstanceSettings{
-		ID:                      ds.ID,
-		Name:                    ds.Name,
-		URL:                     ds.URL,
-		Database:                ds.Database,
-		User:                    ds.User,
-		BasicAuthEnabled:        ds.BasicAuth,
-		BasicAuthUser:           ds.BasicAuthUser,
-		JSONData:                jsonDataBytes,
-		DecryptedSecureJSONData: decryptedJsonData,
-		Updated:                 ds.Updated,
-		UID:                     ds.UID,
-	}
-
+func (h *Service) generateRequest(ctx context.Context, ds *datasources.DataSource, query legacydata.DataQuery) (*backend.QueryDataRequest, error) {
 	if query.Headers == nil {
 		query.Headers = make(map[string]string)
 	}
 
+	pCtx, err := h.pCtxProvider.GetWithDataSource(ctx, ds.Type, query.User, ds)
+	if err != nil {
+		return nil, err
+	}
+
 	req := &backend.QueryDataRequest{
-		PluginContext: backend.PluginContext{
-			OrgID:                      ds.OrgID,
-			PluginID:                   ds.Type,
-			User:                       adapters.BackendUserFromSignedInUser(query.User),
-			DataSourceInstanceSettings: instanceSettings,
-		},
-		Queries: []backend.DataQuery{},
-		Headers: query.Headers,
+		PluginContext: pCtx,
+		Queries:       []backend.DataQuery{},
+		Headers:       query.Headers,
 	}
 
 	for _, q := range query.Queries {

pkg/tsdb/legacydata/service/service_test.go

@@ -9,16 +9,20 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	datasourceservice "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
+	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	secretskvs "github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tsdb/legacydata"
 )
 
@@ -38,15 +42,19 @@ func TestHandleRequest(t *testing.T) {
 		dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), datasourcePermissions, quotaService)
 		require.NoError(t, err)
 
-		s := ProvideService(client, nil, dsService)
+		pCtxProvider := plugincontext.ProvideService(localcache.ProvideService(), &plugins.FakePluginStore{
+			PluginList: []plugins.PluginDTO{{JSONData: plugins.JSONData{ID: "test"}}},
+		}, dsService, pluginSettings.ProvideService(sqlStore, secretsService))
+		s := ProvideService(client, nil, dsService, pCtxProvider)
 
-		ds := &datasources.DataSource{ID: 12, Type: "unregisteredType", JsonData: simplejson.New()}
+		ds := &datasources.DataSource{ID: 12, Type: "test", JsonData: simplejson.New()}
 		req := legacydata.DataQuery{
 			TimeRange: &legacydata.DataTimeRange{},
 			Queries: []legacydata.DataSubQuery{
-				{RefID: "A", DataSource: &datasources.DataSource{ID: 1, Type: "test"}, Model: simplejson.New()},
-				{RefID: "B", DataSource: &datasources.DataSource{ID: 1, Type: "test"}, Model: simplejson.New()},
+				{RefID: "A", Model: simplejson.New()},
+				{RefID: "B", Model: simplejson.New()},
 			},
+			User: &user.SignedInUser{},
 		}
 		res, err := s.HandleRequest(context.Background(), ds, req)
 		require.NoError(t, err)