IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59952)

Browse Source 
ServiceAccounts: Fix warnings about secret scanner when scanner is disabled
This commit is contained in:
Jo 2022-12-07 13:49:28 +00:00 committed by GitHub
parent a5ace56be8
commit d833031726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/serviceaccounts/manager/service.go
View File

@ -55,10 +55,9 @@ func ProvideServiceAccountsService(
serviceaccountsAPI.RegisterAPIEndpoints() serviceaccountsAPI.RegisterAPIEndpoints()
s.secretScanEnabled = cfg.SectionWithEnvOverrides("secretscan").Key("enabled").MustBool(false) s.secretScanEnabled = cfg.SectionWithEnvOverrides("secretscan").Key("enabled").MustBool(false)
s.secretScanInterval = cfg.SectionWithEnvOverrides("secretscan").
Key("interval").MustDuration(defaultSecretScanInterval)
if s.secretScanEnabled { if s.secretScanEnabled {
s.secretScanInterval = cfg.SectionWithEnvOverrides("secretscan").
Key("interval").MustDuration(defaultSecretScanInterval)
s.secretScanService = secretscan.NewService(s.store, cfg) s.secretScanService = secretscan.NewService(s.store, cfg)
} }
@ -76,7 +75,7 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error {
defer updateStatsTicker.Stop() defer updateStatsTicker.Stop()
// Enforce a minimum interval of 1 minute. // Enforce a minimum interval of 1 minute.
if sa.secretScanInterval < time.Minute { if sa.secretScanEnabled && sa.secretScanInterval < time.Minute {
sa.backgroundLog.Warn("secret scan interval is too low, increasing to " + sa.backgroundLog.Warn("secret scan interval is too low, increasing to " +
defaultSecretScanInterval.String()) defaultSecretScanInterval.String())