diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go index fa8b32e12a1..ed6db916c04 100644 --- a/pkg/api/plugin_resource_test.go +++ b/pkg/api/plugin_resource_test.go @@ -171,7 +171,7 @@ func TestCallResource(t *testing.T) { Backend: true, }, })) - middlewares := pluginsintegration.CreateMiddlewares(cfg, &oauthtokentest.Service{}, tracing.InitializeTracerForTest(), &caching.OSSCachingService{}, &featuremgmt.FeatureManager{}, prometheus.DefaultRegisterer, pluginRegistry) + middlewares := pluginsintegration.CreateMiddlewares(cfg, &oauthtokentest.Service{}, tracing.InitializeTracerForTest(), &caching.OSSCachingService{}, featuremgmt.WithFeatures(), prometheus.DefaultRegisterer, pluginRegistry) pc, err := pluginClient.NewDecorator(&fakes.FakePluginClient{ CallResourceHandlerFunc: backend.CallResourceHandlerFunc(func(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error { diff --git a/pkg/cmd/grafana-cli/commands/conflict_user_command.go b/pkg/cmd/grafana-cli/commands/conflict_user_command.go index b947f88f24b..5e188f6b797 100644 --- a/pkg/cmd/grafana-cli/commands/conflict_user_command.go +++ b/pkg/cmd/grafana-cli/commands/conflict_user_command.go @@ -33,7 +33,7 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -func initConflictCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, *featuremgmt.FeatureManager, error) { +func initConflictCfg(cmd *utils.ContextCommandLine) (*setting.Cfg, featuremgmt.FeatureToggles, error) { configOptions := strings.Split(cmd.String("configOverrides"), " ") configOptions = append(configOptions, cmd.Args().Slice()...) cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{ diff --git a/pkg/expr/converter_test.go b/pkg/expr/converter_test.go index 2a484ea9673..c2a8a445247 100644 --- a/pkg/expr/converter_test.go +++ b/pkg/expr/converter_test.go @@ -19,7 +19,7 @@ import ( func TestConvertDataFramesToResults(t *testing.T) { s := &Service{ cfg: setting.NewCfg(), - features: &featuremgmt.FeatureManager{}, + features: featuremgmt.WithFeatures(), tracer: tracing.InitializeTracerForTest(), metrics: newMetrics(nil), } diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go index 2ee7ff5d357..5ff1e9fd4af 100644 --- a/pkg/expr/service_test.go +++ b/pkg/expr/service_test.go @@ -138,7 +138,7 @@ func TestDSQueryError(t *testing.T) { cfg: setting.NewCfg(), dataService: me, pCtxProvider: pCtxProvider, - features: &featuremgmt.FeatureManager{}, + features: featuremgmt.WithFeatures(), tracer: tracing.InitializeTracerForTest(), metrics: newMetrics(nil), } diff --git a/pkg/registry/apis/folders/register.go b/pkg/registry/apis/folders/register.go index 19cb2d71f48..4caaa232b30 100644 --- a/pkg/registry/apis/folders/register.go +++ b/pkg/registry/apis/folders/register.go @@ -35,14 +35,14 @@ var resourceInfo = v0alpha1.FolderResourceInfo // This is used just so wire has something unique to return type FolderAPIBuilder struct { gv schema.GroupVersion - features *featuremgmt.FeatureManager + features featuremgmt.FeatureToggles namespacer request.NamespaceMapper folderSvc folder.Service accessControl accesscontrol.AccessControl } func RegisterAPIService(cfg *setting.Cfg, - features *featuremgmt.FeatureManager, + features featuremgmt.FeatureToggles, apiregistration builder.APIRegistrar, folderSvc folder.Service, accessControl accesscontrol.AccessControl, diff --git a/pkg/services/folder/folderimpl/folder_test.go b/pkg/services/folder/folderimpl/folder_test.go index 1f1c6753b4f..608047fa4d7 100644 --- a/pkg/services/folder/folderimpl/folder_test.go +++ b/pkg/services/folder/folderimpl/folder_test.go @@ -59,7 +59,7 @@ func TestIntegrationProvideFolderService(t *testing.T) { cfg := setting.NewCfg() ac := acmock.New() db := sqlstore.InitTestDB(t) - ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, db, &featuremgmt.FeatureManager{}, supportbundlestest.NewFakeBundleService(), nil) + ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, db, featuremgmt.WithFeatures(), supportbundlestest.NewFakeBundleService(), nil) require.Len(t, ac.Calls.RegisterAttributeScopeResolver, 3) }) diff --git a/pkg/services/ngalert/api/api_ruler_test.go b/pkg/services/ngalert/api/api_ruler_test.go index 7de00b82bf5..7856e858088 100644 --- a/pkg/services/ngalert/api/api_ruler_test.go +++ b/pkg/services/ngalert/api/api_ruler_test.go @@ -634,7 +634,7 @@ func createService(store *fakes.RuleStore) *RulerSrv { authz: accesscontrol.NewRuleService(acimpl.ProvideAccessControl(setting.NewCfg())), amConfigStore: &fakeAMRefresher{}, amRefresher: &fakeAMRefresher{}, - featureManager: &featuremgmt.FeatureManager{}, + featureManager: featuremgmt.WithFeatures(), } } diff --git a/pkg/services/ngalert/api/api_testing_test.go b/pkg/services/ngalert/api/api_testing_test.go index 7a571244b0e..becad5a73cc 100644 --- a/pkg/services/ngalert/api/api_testing_test.go +++ b/pkg/services/ngalert/api/api_testing_test.go @@ -160,7 +160,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) { return nil } - srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), &featuremgmt.FeatureManager{}, ruleStore) + srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), featuremgmt.WithFeatures(), ruleStore) rule := validRule() @@ -184,7 +184,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) { f := randFolder() ruleStore := fakes2.NewRuleStore(t) ruleStore.Folders[rc.OrgID] = []*folder.Folder{f} - srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), &featuremgmt.FeatureManager{}, ruleStore) + srv := createTestingApiSrv(t, nil, ac, eval_mocks.NewEvaluatorFactory(&eval_mocks.ConditionEvaluatorMock{}), featuremgmt.WithFeatures(), ruleStore) rule := validRule() rule.GrafanaManagedAlert.Data = ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2}) @@ -222,7 +222,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) { ruleStore := fakes2.NewRuleStore(t) ruleStore.Folders[rc.OrgID] = []*folder.Folder{f} - srv := createTestingApiSrv(t, ds, ac, evalFactory, &featuremgmt.FeatureManager{}, ruleStore) + srv := createTestingApiSrv(t, ds, ac, evalFactory, featuremgmt.WithFeatures(), ruleStore) rule := validRule() rule.GrafanaManagedAlert.Data = ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2}) @@ -299,7 +299,7 @@ func TestRouteEvalQueries(t *testing.T) { ruleStore := fakes2.NewRuleStore(t) - srv := createTestingApiSrv(t, ds, ac, eval_mocks.NewEvaluatorFactory(evaluator), &featuremgmt.FeatureManager{}, ruleStore) + srv := createTestingApiSrv(t, ds, ac, eval_mocks.NewEvaluatorFactory(evaluator), featuremgmt.WithFeatures(), ruleStore) response := srv.RouteEvalQueries(rc, definitions.EvalQueriesPayload{ Data: ApiAlertQueriesFromAlertQueries([]models.AlertQuery{data1, data2}), @@ -387,7 +387,7 @@ func TestRouteEvalQueries(t *testing.T) { }) } -func createTestingApiSrv(t *testing.T, ds *fakes.FakeCacheService, ac *acMock.Mock, evaluator eval.EvaluatorFactory, featureManager *featuremgmt.FeatureManager, ruleStore RuleStore) *TestingApiSrv { +func createTestingApiSrv(t *testing.T, ds *fakes.FakeCacheService, ac *acMock.Mock, evaluator eval.EvaluatorFactory, featureManager featuremgmt.FeatureToggles, ruleStore RuleStore) *TestingApiSrv { if ac == nil { ac = acMock.New() } diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go index 1a7615ef5dc..70b5c7ba8d0 100644 --- a/pkg/services/ngalert/eval/eval_test.go +++ b/pkg/services/ngalert/eval/eval_test.go @@ -590,7 +590,7 @@ func TestValidate(t *testing.T) { pluginsStore: store, }) - evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), store) + evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, featuremgmt.WithFeatures(), nil, tracing.InitializeTracerForTest()), store) evalCtx := NewContext(context.Background(), u) err := evaluator.Validate(evalCtx, condition) diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go index 7502bc85408..4e9196e6594 100644 --- a/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go +++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go @@ -98,7 +98,7 @@ func TestMultiorgAlertmanager_RemoteSecondaryMode(t *testing.T) { nil, nopLogger, secretsService, - &featuremgmt.FeatureManager{}, + featuremgmt.WithFeatures(), override, ) require.NoError(t, err) diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go index b0af44fe8fa..d053210eb3a 100644 --- a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go +++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go @@ -42,7 +42,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgs(t *testing.T) { DisabledOrgs: map[int64]struct{}{5: {}}, }, // do not poll in tests. } - mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{}) + mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithFeatures()) require.NoError(t, err) ctx := context.Background() @@ -150,7 +150,7 @@ func TestMultiOrgAlertmanager_SyncAlertmanagersForOrgsWithFailures(t *testing.T) DefaultConfiguration: setting.GetAlertmanagerDefaultConfiguration(), }, // do not poll in tests. } - mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{}) + mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithFeatures()) require.NoError(t, err) ctx := context.Background() @@ -237,7 +237,7 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) { decryptFn := secretsService.GetDecryptedValue reg := prometheus.NewPedanticRegistry() m := metrics.NewNGAlert(reg) - mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{}) + mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithFeatures()) require.NoError(t, err) ctx := context.Background() @@ -289,7 +289,7 @@ func TestMultiOrgAlertmanager_ActivateHistoricalConfiguration(t *testing.T) { decryptFn := secretsService.GetDecryptedValue reg := prometheus.NewPedanticRegistry() m := metrics.NewNGAlert(reg) - mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{}) + mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithFeatures()) require.NoError(t, err) ctx := context.Background() diff --git a/pkg/services/ngalert/schedule/schedule_unit_test.go b/pkg/services/ngalert/schedule/schedule_unit_test.go index c30b54d3901..4808f8312b8 100644 --- a/pkg/services/ngalert/schedule/schedule_unit_test.go +++ b/pkg/services/ngalert/schedule/schedule_unit_test.go @@ -63,7 +63,7 @@ func TestProcessTicks(t *testing.T) { } cacheServ := &datasources.FakeCacheService{} - evaluator := eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheServ, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), &pluginstore.FakePluginStore{}) + evaluator := eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheServ, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, featuremgmt.WithFeatures(), nil, tracing.InitializeTracerForTest()), &pluginstore.FakePluginStore{}) schedCfg := SchedulerCfg{ BaseInterval: cfg.BaseInterval, @@ -394,7 +394,7 @@ func setupScheduler(t *testing.T, rs *fakeRulesStore, is *state.FakeInstanceStor var evaluator = evalMock if evalMock == nil { - evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()), &pluginstore.FakePluginStore{}) + evaluator = eval.NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, nil, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil, featuremgmt.WithFeatures(), nil, tracing.InitializeTracerForTest()), &pluginstore.FakePluginStore{}) } if registry == nil { diff --git a/pkg/services/ngalert/sender/router_test.go b/pkg/services/ngalert/sender/router_test.go index 7fa5a9ae76d..361d738191f 100644 --- a/pkg/services/ngalert/sender/router_test.go +++ b/pkg/services/ngalert/sender/router_test.go @@ -411,7 +411,7 @@ func createMultiOrgAlertmanager(t *testing.T, orgs []int64) *notifier.MultiOrgAl m := metrics.NewNGAlert(registry) secretsService := secretsManager.SetupTestService(t, fake_secrets.NewFakeSecretsStore()) decryptFn := secretsService.GetDecryptedValue - moa, err := notifier.NewMultiOrgAlertmanager(cfg, cfgStore, orgStore, kvStore, fakes.NewFakeProvisioningStore(), decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, &featuremgmt.FeatureManager{}) + moa, err := notifier.NewMultiOrgAlertmanager(cfg, cfgStore, orgStore, kvStore, fakes.NewFakeProvisioningStore(), decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService, featuremgmt.WithFeatures()) require.NoError(t, err) require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(context.Background())) require.Eventually(t, func() bool { diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go index 5c67ebf1eab..58fa082f156 100644 --- a/pkg/services/pluginsintegration/pluginsintegration.go +++ b/pkg/services/pluginsintegration/pluginsintegration.go @@ -141,7 +141,7 @@ func ProvideClientDecorator( oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, - features *featuremgmt.FeatureManager, + features featuremgmt.FeatureToggles, promRegisterer prometheus.Registerer, ) (*client.Decorator, error) { return NewClientDecorator(cfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features, promRegisterer, pluginRegistry) @@ -150,7 +150,7 @@ func ProvideClientDecorator( func NewClientDecorator( cfg *setting.Cfg, pluginRegistry registry.Service, oAuthTokenService oauthtoken.OAuthTokenService, - tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager, + tracer tracing.Tracer, cachingService caching.CachingService, features featuremgmt.FeatureToggles, promRegisterer prometheus.Registerer, registry registry.Service, ) (*client.Decorator, error) { c := client.ProvideService(pluginRegistry) @@ -158,7 +158,7 @@ func NewClientDecorator( return client.NewDecorator(c, middlewares...) } -func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager, promRegisterer prometheus.Registerer, registry registry.Service) []plugins.ClientMiddleware { +func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features featuremgmt.FeatureToggles, promRegisterer prometheus.Registerer, registry registry.Service) []plugins.ClientMiddleware { middlewares := []plugins.ClientMiddleware{ clientmiddleware.NewPluginRequestMetaMiddleware(), clientmiddleware.NewTracingMiddleware(tracer), diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go index 486529466f2..fdaf22fbcd4 100644 --- a/pkg/services/query/query_test.go +++ b/pkg/services/query/query_test.go @@ -484,7 +484,7 @@ func setup(t *testing.T) *testContext { pluginSettings.ProvideService(sqlStore, secretsService), pluginconfig.NewFakePluginRequestConfigProvider(), ) exprService := expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, pc, pCtxProvider, - &featuremgmt.FeatureManager{}, nil, tracing.InitializeTracerForTest()) + featuremgmt.WithFeatures(), nil, tracing.InitializeTracerForTest()) queryService := ProvideService(setting.NewCfg(), dc, exprService, rv, pc, pCtxProvider) // provider belonging to this package return &testContext{ pluginContext: pc, diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go index 5918b013fec..a99f37b34b9 100644 --- a/pkg/services/rendering/rendering.go +++ b/pkg/services/rendering/rendering.go @@ -42,7 +42,7 @@ type RenderingService struct { perRequestRenderKeyProvider renderKeyProvider Cfg *setting.Cfg - features *featuremgmt.FeatureManager + features featuremgmt.FeatureToggles RemoteCacheService *remotecache.RemoteCache RendererPluginManager PluginManager } @@ -57,7 +57,7 @@ type Plugin interface { Version() string } -func ProvideService(cfg *setting.Cfg, features *featuremgmt.FeatureManager, remoteCache *remotecache.RemoteCache, rm PluginManager) (*RenderingService, error) { +func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, remoteCache *remotecache.RemoteCache, rm PluginManager) (*RenderingService, error) { folders := []string{ cfg.ImagesDir, cfg.CSVsDir, diff --git a/pkg/services/serviceaccounts/api/api.go b/pkg/services/serviceaccounts/api/api.go index e76a5c29ca2..8759e8af99a 100644 --- a/pkg/services/serviceaccounts/api/api.go +++ b/pkg/services/serviceaccounts/api/api.go @@ -38,7 +38,7 @@ func NewServiceAccountsAPI( accesscontrolService accesscontrol.Service, routerRegister routing.RouteRegister, permissionService accesscontrol.ServiceAccountPermissionsService, - features *featuremgmt.FeatureManager, + features featuremgmt.FeatureToggles, ) *ServiceAccountsAPI { return &ServiceAccountsAPI{ cfg: cfg, diff --git a/pkg/services/serviceaccounts/extsvcaccounts/service.go b/pkg/services/serviceaccounts/extsvcaccounts/service.go index bb3e17126f4..3c722a8c19f 100644 --- a/pkg/services/serviceaccounts/extsvcaccounts/service.go +++ b/pkg/services/serviceaccounts/extsvcaccounts/service.go @@ -34,7 +34,7 @@ type ExtSvcAccountsService struct { tracer tracing.Tracer } -func ProvideExtSvcAccountsService(acSvc ac.Service, bus bus.Bus, db db.DB, features *featuremgmt.FeatureManager, reg prometheus.Registerer, saSvc *manager.ServiceAccountsService, secretsSvc secrets.Service, tracer tracing.Tracer) *ExtSvcAccountsService { +func ProvideExtSvcAccountsService(acSvc ac.Service, bus bus.Bus, db db.DB, features featuremgmt.FeatureToggles, reg prometheus.Registerer, saSvc *manager.ServiceAccountsService, secretsSvc secrets.Service, tracer tracing.Tracer) *ExtSvcAccountsService { logger := log.New("serviceauth.extsvcaccounts") esa := &ExtSvcAccountsService{ acSvc: acSvc, diff --git a/pkg/services/serviceaccounts/proxy/service.go b/pkg/services/serviceaccounts/proxy/service.go index 10f2a601dcd..40ab982d68b 100644 --- a/pkg/services/serviceaccounts/proxy/service.go +++ b/pkg/services/serviceaccounts/proxy/service.go @@ -30,7 +30,7 @@ func ProvideServiceAccountsProxy( cfg *setting.Cfg, ac accesscontrol.AccessControl, accesscontrolService accesscontrol.Service, - features *featuremgmt.FeatureManager, + features featuremgmt.FeatureToggles, permissionService accesscontrol.ServiceAccountPermissionsService, proxiedService *manager.ServiceAccountsService, routeRegister routing.RouteRegister, diff --git a/pkg/services/ssosettings/api/api.go b/pkg/services/ssosettings/api/api.go index d45c2d0db57..8e2a8f0da21 100644 --- a/pkg/services/ssosettings/api/api.go +++ b/pkg/services/ssosettings/api/api.go @@ -23,7 +23,7 @@ type Api struct { Log log.Logger RouteRegister routing.RouteRegister AccessControl ac.AccessControl - Features *featuremgmt.FeatureManager + Features featuremgmt.FeatureToggles SSOSettingsService ssosettings.Service } diff --git a/pkg/services/supportbundles/supportbundlesimpl/service.go b/pkg/services/supportbundles/supportbundlesimpl/service.go index 50d5f9f317c..dd9ade72d20 100644 --- a/pkg/services/supportbundles/supportbundlesimpl/service.go +++ b/pkg/services/supportbundles/supportbundlesimpl/service.go @@ -31,7 +31,7 @@ type Service struct { accessControl ac.AccessControl bundleRegistry *bundleregistry.Service cfg *setting.Cfg - features *featuremgmt.FeatureManager + features featuremgmt.FeatureToggles pluginSettings pluginsettings.Service pluginStore pluginstore.Store store bundleStore @@ -49,7 +49,7 @@ func ProvideService( accesscontrolService ac.Service, bundleRegistry *bundleregistry.Service, cfg *setting.Cfg, - features *featuremgmt.FeatureManager, + features featuremgmt.FeatureToggles, httpServer *grafanaApi.HTTPServer, kvStore kvstore.KVStore, pluginSettings pluginsettings.Service,