mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Settings: Actually deprecate access to feature flags (#78073)
This commit is contained in:
@@ -144,7 +144,9 @@ func (o *OSSImpl) Section(section string) Section {
|
||||
|
||||
func (*OSSImpl) RegisterReloadHandler(string, ReloadHandler) {}
|
||||
|
||||
// Deprecated: use feature toggles
|
||||
func (o *OSSImpl) IsFeatureToggleEnabled(name string) bool {
|
||||
// nolint:staticcheck
|
||||
return o.Cfg.IsFeatureToggleEnabled(name)
|
||||
}
|
||||
|
||||
|
||||
@@ -361,7 +361,7 @@ type Cfg struct {
|
||||
ApiKeyMaxSecondsToLive int64
|
||||
|
||||
// Check if a feature toggle is enabled
|
||||
// @deprecated
|
||||
// Deprecated: use featuremgmt.FeatureFlags
|
||||
IsFeatureToggleEnabled func(key string) bool // filled in dynamically
|
||||
|
||||
AnonymousEnabled bool
|
||||
@@ -1168,6 +1168,7 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// nolint:staticcheck
|
||||
if err := cfg.readFeatureToggles(iniFile); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -8,13 +8,14 @@ import (
|
||||
"github.com/grafana/grafana/pkg/util"
|
||||
)
|
||||
|
||||
// @deprecated -- should use `featuremgmt.FeatureToggles`
|
||||
// Deprecated: should use `featuremgmt.FeatureToggles`
|
||||
func (cfg *Cfg) readFeatureToggles(iniFile *ini.File) error {
|
||||
section := iniFile.Section("feature_toggles")
|
||||
toggles, err := ReadFeatureTogglesFromInitFile(section)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// nolint:staticcheck
|
||||
cfg.IsFeatureToggleEnabled = func(key string) bool { return toggles[key] }
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user