Settings: Actually deprecate access to feature flags (#78073)

This commit is contained in:
Ryan McKinley
2023-11-13 11:39:01 -08:00
committed by GitHub
parent 4a3c148298
commit dec9a07738
15 changed files with 37 additions and 21 deletions

View File

@@ -153,7 +153,8 @@ func TestMigrations(t *testing.T) {
{
desc: "with editors can admin",
config: &setting.Cfg{
EditorsCanAdmin: true,
EditorsCanAdmin: true,
// nolint:staticcheck
IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" },
Raw: ini.Empty(),
},

View File

@@ -94,7 +94,9 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
AddExternalAlertmanagerToDatasourceMigration(mg)
addFolderMigrations(mg)
// nolint:staticcheck
if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {
// nolint:staticcheck
if mg.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagExternalServiceAuth) {
oauthserver.AddMigration(mg)
}