FeatureToggles: Removed deprecated code (#111750)

pkg/setting/setting.go

@@ -543,9 +543,6 @@ type Cfg struct {
 	// Cloud Migration
 	CloudMigration CloudMigrationSettings
 
-	// Feature Management Settings
-	FeatureManagement FeatureMgmtSettings
-
 	// Alerting
 	AlertingEvaluationTimeout   time.Duration
 	AlertingNotificationTimeout time.Duration
@@ -1429,7 +1426,6 @@ func (cfg *Cfg) parseINIFile(iniFile *ini.File) error {
 	logSection := iniFile.Section("log")
 	cfg.UserFacingDefaultError = logSection.Key("user_facing_default_error").MustString("please inspect Grafana server log for details")
 
-	cfg.readFeatureManagementConfig()
 	cfg.readPublicDashboardsSettings()
 	cfg.readCloudMigrationSettings()
 	cfg.readSecretsManagerSettings()

pkg/setting/setting_featuremgmt.go

@@ -1,38 +0,0 @@
-package setting
-
-import (
-	"github.com/grafana/grafana/pkg/util"
-)
-
-type FeatureMgmtSettings struct {
-	HiddenToggles      map[string]struct{}
-	ReadOnlyToggles    map[string]struct{}
-	AllowEditing       bool
-	UpdateWebhook      string
-	UpdateWebhookToken string
-}
-
-func (cfg *Cfg) readFeatureManagementConfig() {
-	section := cfg.Raw.Section("feature_management")
-
-	hiddenToggles := make(map[string]struct{})
-	readOnlyToggles := make(map[string]struct{})
-
-	// parse the comma separated list in `hidden_toggles`.
-	hiddenTogglesStr := valueAsString(section, "hidden_toggles", "")
-	for _, feature := range util.SplitString(hiddenTogglesStr) {
-		hiddenToggles[feature] = struct{}{}
-	}
-
-	// parse the comma separated list in `read_only_toggles`.
-	readOnlyTogglesStr := valueAsString(section, "read_only_toggles", "")
-	for _, feature := range util.SplitString(readOnlyTogglesStr) {
-		readOnlyToggles[feature] = struct{}{}
-	}
-
-	cfg.FeatureManagement.HiddenToggles = hiddenToggles
-	cfg.FeatureManagement.ReadOnlyToggles = readOnlyToggles
-	cfg.FeatureManagement.AllowEditing = cfg.SectionWithEnvOverrides("feature_management").Key("allow_editing").MustBool(false)
-	cfg.FeatureManagement.UpdateWebhook = cfg.SectionWithEnvOverrides("feature_management").Key("update_webhook").MustString("")
-	cfg.FeatureManagement.UpdateWebhookToken = cfg.SectionWithEnvOverrides("feature_management").Key("update_webhook_token").MustString("")
-}