From 0f6c4d17567cb95ab189de75b60ddfee4ef1fa0d Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:06:08 +0100 Subject: [PATCH] [v9.3.x] ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59955) 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 d833031726ce64a085483d02ce3c3f30e5d03b5e) Co-authored-by: Jo --- pkg/services/serviceaccounts/manager/service.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/services/serviceaccounts/manager/service.go b/pkg/services/serviceaccounts/manager/service.go index 4365fcd52af..635e467df8d 100644 --- a/pkg/services/serviceaccounts/manager/service.go +++ b/pkg/services/serviceaccounts/manager/service.go @@ -55,10 +55,9 @@ func ProvideServiceAccountsService( serviceaccountsAPI.RegisterAPIEndpoints() s.secretScanEnabled = cfg.SectionWithEnvOverrides("secretscan").Key("enabled").MustBool(false) + s.secretScanInterval = cfg.SectionWithEnvOverrides("secretscan"). + Key("interval").MustDuration(defaultSecretScanInterval) if s.secretScanEnabled { - s.secretScanInterval = cfg.SectionWithEnvOverrides("secretscan"). - Key("interval").MustDuration(defaultSecretScanInterval) - s.secretScanService = secretscan.NewService(s.store, cfg) } @@ -76,7 +75,7 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error { defer updateStatsTicker.Stop() // 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 " + defaultSecretScanInterval.String())