FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382)
* Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commitf53b3fb007. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commitf94c0decbd.
This commit is contained in:
@@ -13,8 +13,8 @@ import (
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
||||
acmiddleware "github.com/grafana/grafana/pkg/services/accesscontrol/middleware"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"github.com/grafana/grafana/pkg/services/serviceaccounts"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
"github.com/grafana/grafana/pkg/web"
|
||||
)
|
||||
|
||||
@@ -40,9 +40,9 @@ func NewServiceAccountsAPI(
|
||||
}
|
||||
|
||||
func (api *ServiceAccountsAPI) RegisterAPIEndpoints(
|
||||
features *featuremgmt.FeatureToggles,
|
||||
cfg *setting.Cfg,
|
||||
) {
|
||||
if !features.IsServiceAccountsEnabled() {
|
||||
if !cfg.FeatureToggles["service-accounts"] {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user