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

FeatureFlags: Avoid using cfg.IsFeatureToggleEnabled (#81407)

Browse Source
This commit is contained in:
Ryan McKinley
2024-01-28 15:22:45 -08:00
committed by GitHub
parent 1a1531ca5e
commit 1fab107e79
21 changed files with 248 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import (
"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
"github.com/grafana/grafana/pkg/setting"
testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
@@ -19,6 +20,7 @@ import (
// This currently builds its dependencies manually and only works for testdata.
func NewTestDataAPIServer(group string) (*DataSourceAPIBuilder, error) {
pluginID := "grafana-testdata-datasource"
features := featuremgmt.WithFeatures() // None for now!
if group != "testdata.datasource.grafana.app" {
return nil, fmt.Errorf("only %s is currently supported", pluginID)
@@ -47,7 +49,7 @@ func NewTestDataAPIServer(group string) (*DataSourceAPIBuilder, error) {
return nil, err
}
accessControl, pluginStore, dsService, dsCache, err := apiBuilderServices(cfg, pluginID)
accessControl, pluginStore, dsService, dsCache, err := apiBuilderServices(cfg, features, pluginID)
if err != nil {
return nil, err
}

12
pkg/registry/apis/datasource/standalone_services.go
View File

@@ -28,9 +28,7 @@ import (
"github.com/grafana/grafana/pkg/services/encryption/provider"
encryptionService "github.com/grafana/grafana/pkg/services/encryption/service"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/hooks"
"github.com/grafana/grafana/pkg/services/kmsproviders/osskmsproviders"
"github.com/grafana/grafana/pkg/services/licensing"
"github.com/grafana/grafana/pkg/services/org/orgimpl"
"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -46,7 +44,7 @@ import (
"github.com/grafana/grafana/pkg/setting"
)
func apiBuilderServices(cfg *setting.Cfg, pluginID string) (
func apiBuilderServices(cfg *setting.Cfg, features featuremgmt.FeatureToggles, pluginID string) (
*acimpl.AccessControl,
*pluginstore.Service,
*datasourceService.Service,
@@ -60,16 +58,14 @@ func apiBuilderServices(cfg *setting.Cfg, pluginID string) (
return nil, nil, nil, nil, err
}
routeRegisterImpl := routing.ProvideRegister()
hooksService := hooks.ProvideService()
ossLicensingService := licensing.ProvideService(cfg, hooksService)
featureManager, err := featuremgmt.ProvideManagerService(cfg, ossLicensingService)
featureManager, err := featuremgmt.ProvideManagerService(cfg)
if err != nil {
return nil, nil, nil, nil, err
}
inProcBus := bus.ProvideBus(tracingService)
ossMigrations := migrations.ProvideOSSMigrations()
sqlStore, err := sqlstore.ProvideService(cfg, ossMigrations, inProcBus, tracingService)
ossMigrations := migrations.ProvideOSSMigrations(features)
sqlStore, err := sqlstore.ProvideService(cfg, features, ossMigrations, inProcBus, tracingService)
if err != nil {
return nil, nil, nil, nil, err
}