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

ManagedServiceAccounts: Add a config option to disable the feature on-prem (#93571)

Browse Source 
* ManagedServiceAccounts: Add a config option to disabled by default

* Update log in pkg/services/extsvcauth/registry/service.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
Gabriel MABILLE
2024-09-27 09:11:59 +02:00
committed by GitHub
co-authored by Ieva
parent 2cfba519f1
commit 7928245eb6
13 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
+4 -2
View File
@@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/services/extsvcauth"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
"github.com/grafana/grafana/pkg/setting"
)
type Service struct {
@@ -20,9 +21,10 @@ type Service struct {
settingsSvc pluginsettings.Service
}
func ProvideService(features featuremgmt.FeatureToggles, reg extsvcauth.ExternalServiceRegistry, settingsSvc pluginsettings.Service) *Service {
func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles, reg extsvcauth.ExternalServiceRegistry, settingsSvc pluginsettings.Service) *Service {
enabled := features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts) && cfg.ManagedServiceAccountsEnabled
s := &Service{
featureEnabled: features.IsEnabledGlobally(featuremgmt.FlagExternalServiceAccounts),
featureEnabled: enabled,
log: log.New("plugins.external.registration"),
reg: reg,
settingsSvc: settingsSvc,