public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FeatureToggls: remove IsFeatureToggleEnabled from SettingsProvider (#44574)

Browse Source
This commit is contained in:
Ryan McKinley
2022-02-01 10:24:59 -08:00
committed by GitHub
parent de04f19c47
commit 7ee38af95a
9 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/kmsproviders/osskmsproviders/osskmsproviders.go
+4 -2
View File
@@ -12,17 +12,19 @@ import (
type Service struct {
enc encryption.Internal
settings setting.Provider
features featuremgmt.FeatureToggles
}
func ProvideService(enc encryption.Internal, settings setting.Provider) Service {
func ProvideService(enc encryption.Internal, settings setting.Provider, features featuremgmt.FeatureToggles) Service {
return Service{
enc: enc,
settings: settings,
features: features,
}
}
func (s Service) Provide() (map[secrets.ProviderID]secrets.Provider, error) {
if !s.settings.IsFeatureToggleEnabled(featuremgmt.FlagEnvelopeEncryption) {
if !s.features.IsEnabled(featuremgmt.FlagEnvelopeEncryption) {
return nil, nil
}