IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Datasources: Add wireset for datasource.DataSourceAPIBuilder (#80914)

Browse Source 
tidy up
This commit is contained in:
Will Browne 2024-01-22 15:21:27 +01:00 committed by GitHub
parent f3c64a7337
commit 2a0f1900d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/grafana/apiserver/server.go
View File

@ -12,9 +12,9 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
netutils "k8s.io/utils/net" netutils "k8s.io/utils/net"
"github.com/grafana/grafana/pkg/registry/apis/datasource"
"github.com/grafana/grafana/pkg/registry/apis/example" "github.com/grafana/grafana/pkg/registry/apis/example"
"github.com/grafana/grafana/pkg/registry/apis/featuretoggle" "github.com/grafana/grafana/pkg/registry/apis/featuretoggle"
"github.com/grafana/grafana/pkg/server"
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
grafanaAPIServer "github.com/grafana/grafana/pkg/services/grafana-apiserver" grafanaAPIServer "github.com/grafana/grafana/pkg/services/grafana-apiserver"
"github.com/grafana/grafana/pkg/services/grafana-apiserver/utils" "github.com/grafana/grafana/pkg/services/grafana-apiserver/utils"
@ -58,7 +58,7 @@ func (o *APIServerOptions) loadAPIGroupBuilders(args []string) error {
} }
o.builders = append(o.builders, featuretoggle.NewFeatureFlagAPIBuilder(features)) o.builders = append(o.builders, featuretoggle.NewFeatureFlagAPIBuilder(features))
case "testdata.datasource.grafana.app": case "testdata.datasource.grafana.app":
ds, err := datasource.NewStandaloneDatasource(g) ds, err := server.InitializeDataSourceAPIServer(g)
if err != nil { if err != nil {
return err return err
} }

13
pkg/registry/apis/datasource/standalone.go
View File

@ -8,16 +8,13 @@ import (
common "github.com/grafana/grafana/pkg/apis/common/v0alpha1" common "github.com/grafana/grafana/pkg/apis/common/v0alpha1"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
) )
// NewStandaloneDatasource is a helper function to create a new datasource API server for a group. // NewTestDataAPIServer is a helper function to create a new datasource API server for a group.
// This currently has no dependencies and only works for testdata. In future iterations // This currently builds its dependencies manually and only works for testdata.
// this will include here (or elsewhere) versions that can load config from HG api or func NewTestDataAPIServer(group string) (*DataSourceAPIBuilder, error) {
// the remote SQL directly.
func NewStandaloneDatasource(group string) (*DataSourceAPIBuilder, error) {
pluginID := "grafana-testdata-datasource" pluginID := "grafana-testdata-datasource"
if group != "testdata.datasource.grafana.app" { if group != "testdata.datasource.grafana.app" {
@ -31,7 +28,7 @@ func NewStandaloneDatasource(group string) (*DataSourceAPIBuilder, error) {
return nil, err return nil, err
} }
_, pluginStore, dsService, dsCache, err := apiBuilderServices(cfg, pluginID) accessControl, pluginStore, dsService, dsCache, err := apiBuilderServices(cfg, pluginID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -49,7 +46,7 @@ func NewStandaloneDatasource(group string) (*DataSourceAPIBuilder, error) {
td.JSONData, td.JSONData,
NewQuerierProvider(testsDataQuerierFactory), NewQuerierProvider(testsDataQuerierFactory),
&TestDataPluginContextProvider{}, &TestDataPluginContextProvider{},
acimpl.ProvideAccessControl(cfg), accessControl,
) )
} }

6
pkg/server/wire.go
View File

@ -35,6 +35,7 @@ import (
"github.com/grafana/grafana/pkg/middleware/csrf" "github.com/grafana/grafana/pkg/middleware/csrf"
"github.com/grafana/grafana/pkg/middleware/loggermw" "github.com/grafana/grafana/pkg/middleware/loggermw"
apiregistry "github.com/grafana/grafana/pkg/registry/apis" apiregistry "github.com/grafana/grafana/pkg/registry/apis"
"github.com/grafana/grafana/pkg/registry/apis/datasource"
"github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl" "github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
@ -459,3 +460,8 @@ func InitializeModuleServer(cfg *setting.Cfg, opts Options, apiOpts api.ServerOp
wire.Build(wireExtsModuleServerSet) wire.Build(wireExtsModuleServerSet)
return &ModuleServer{}, nil return &ModuleServer{}, nil
} }
func InitializeDataSourceAPIServer(group string) (*datasource.DataSourceAPIBuilder, error) {
wire.Build(wireExtsDataSourceApiServerSet)
return &datasource.DataSourceAPIBuilder{}, nil
}

5
pkg/server/wireexts_oss.go
View File

@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/manager" "github.com/grafana/grafana/pkg/plugins/manager"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/registry/apis/datasource"
"github.com/grafana/grafana/pkg/registry/backgroundsvcs" "github.com/grafana/grafana/pkg/registry/backgroundsvcs"
"github.com/grafana/grafana/pkg/registry/usagestatssvcs" "github.com/grafana/grafana/pkg/registry/usagestatssvcs"
"github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol"
@ -137,3 +138,7 @@ var wireExtsModuleServerSet = wire.NewSet(
NewModule, NewModule,
wireExtsBaseCLISet, wireExtsBaseCLISet,
) )
var wireExtsDataSourceApiServerSet = wire.NewSet(
datasource.NewTestDataAPIServer,
)