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

[v9.3.x] ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59955)

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

ServiceAccounts: Fix warnings about secret scanner when scanner is disabled
(cherry picked from commit d833031726)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-12-07 09:06:08 -05:00
committed by GitHub
co-authored by Jo
parent 4f68c4ee8b
commit 0f6c4d1756
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/serviceaccounts/manager/service.go
+3 -4
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())