FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382)

* Revert "FeatureToggles: register all enterprise feature toggles (#44336)"

This reverts commit f53b3fb007.

* Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)"

This reverts commit f94c0decbd.
This commit is contained in:
Agnès Toulet
2022-01-24 16:08:05 +01:00
committed by GitHub
parent 29268483c2
commit 65bdb3a899
66 changed files with 249 additions and 1324 deletions
+6 -6
View File
@@ -8,9 +8,9 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/schema"
"github.com/grafana/grafana/pkg/schema/load"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting"
)
const ServiceName = "SchemaLoader"
@@ -26,13 +26,13 @@ type RenderUser struct {
OrgRole string
}
func ProvideService(features *featuremgmt.FeatureToggles) (*SchemaLoaderService, error) {
func ProvideService(cfg *setting.Cfg) (*SchemaLoaderService, error) {
dashFam, err := load.BaseDashboardFamily(baseLoadPath)
if err != nil {
return nil, fmt.Errorf("failed to load dashboard cue schema from path %q: %w", baseLoadPath, err)
}
s := &SchemaLoaderService{
features: features,
Cfg: cfg,
DashFamily: dashFam,
log: log.New("schemaloader"),
}
@@ -42,14 +42,14 @@ func ProvideService(features *featuremgmt.FeatureToggles) (*SchemaLoaderService,
type SchemaLoaderService struct {
log log.Logger
DashFamily schema.VersionedCueSchema
features *featuremgmt.FeatureToggles
Cfg *setting.Cfg
}
func (rs *SchemaLoaderService) IsDisabled() bool {
if rs.features == nil {
if rs.Cfg == nil {
return true
}
return !rs.features.IsTrimDefaultsEnabled()
return !rs.Cfg.IsTrimDefaultsEnabled()
}
func (rs *SchemaLoaderService) DashboardApplyDefaults(input *simplejson.Json) (*simplejson.Json, error) {