FeatureToggls: remove IsFeatureToggleEnabled from SettingsProvider (#44574)

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
+5 -2
View File
@@ -178,15 +178,16 @@ func TestSecretsService_UseCurrentProvider(t *testing.T) {
raw, err := ini.Load([]byte(rawCfg))
require.NoError(t, err)
features := featuremgmt.WithFeatures(featuremgmt.FlagEnvelopeEncryption)
providerID := secrets.ProviderID("fakeProvider.v1")
settings := &setting.OSSImpl{
Cfg: &setting.Cfg{
Raw: raw,
IsFeatureToggleEnabled: featuremgmt.WithFeatures(featuremgmt.FlagEnvelopeEncryption).IsEnabled,
IsFeatureToggleEnabled: features.IsEnabled,
},
}
encr := ossencryption.ProvideService()
kms := newFakeKMS(osskmsproviders.ProvideService(encr, settings))
kms := newFakeKMS(osskmsproviders.ProvideService(encr, settings, features))
secretStore := database.ProvideSecretsStore(sqlstore.InitTestDB(t))
svcEncrypt, err := ProvideSecretsService(
@@ -194,6 +195,7 @@ func TestSecretsService_UseCurrentProvider(t *testing.T) {
&kms,
encr,
settings,
features,
&usagestats.UsageStatsMock{T: t},
)
require.NoError(t, err)
@@ -211,6 +213,7 @@ func TestSecretsService_UseCurrentProvider(t *testing.T) {
&kms,
encr,
settings,
features,
&usagestats.UsageStatsMock{T: t},
)
require.NoError(t, err)