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

Chore: capitalise log message for auth packages (#74332)

Browse Source
This commit is contained in:
Serge Zaitsev
2023-09-04 18:49:47 +02:00
committed by GitHub
parent 58f6648505
commit 8187d8cb66
32 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/serviceaccounts/database/store.go
View File

@@ -313,7 +313,7 @@ func (s *ServiceAccountsStoreImpl) SearchOrgServiceAccounts(ctx context.Context,
"is_disabled = ?")
whereParams = append(whereParams, s.sqlStore.GetDialect().BooleanStr(true))
default:
s.log.Warn("invalid filter user for service account filtering", "service account search filtering", query.Filter)
s.log.Warn("Invalid filter user for service account filtering", "service account search filtering", query.Filter)
}
if len(whereConditions) > 0 {
@@ -380,7 +380,7 @@ func (s *ServiceAccountsStoreImpl) MigrateApiKeysToServiceAccounts(ctx context.C
for _, key := range basicKeys {
err := s.CreateServiceAccountFromApikey(ctx, key)
if err != nil {
s.log.Error("migating to service accounts failed with error", err.Error())
s.log.Error("Migating to service accounts failed with error", err.Error())
migrationResult.Failed++
migrationResult.FailedDetails = append(migrationResult.FailedDetails, fmt.Sprintf("API key name: %s - Error: %s", key.Name, err.Error()))
migrationResult.FailedApikeyIDs = append(migrationResult.FailedApikeyIDs, key.ID)
@@ -405,7 +405,7 @@ func (s *ServiceAccountsStoreImpl) MigrateApiKey(ctx context.Context, orgId int6
if keyId == key.ID {
err := s.CreateServiceAccountFromApikey(ctx, key)
if err != nil {
s.log.Error("converting to service account failed with error", "keyId", keyId, "error", err)
s.log.Error("Converting to service account failed with error", "keyId", keyId, "error", err)
return err
}
}

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

@@ -81,7 +81,7 @@ func ProvideServiceAccountsService(
s.secretScanService, errSecret = secretscan.NewService(s.store, cfg)
if errSecret != nil {
s.secretScanEnabled = false
s.log.Warn("failed to initialize secret scan service. secret scan is disabled",
s.log.Warn("Failed to initialize secret scan service. secret scan is disabled",
"error", errSecret.Error())
}
}
@@ -90,7 +90,7 @@ func ProvideServiceAccountsService(
}
func (sa *ServiceAccountsService) Run(ctx context.Context) error {
sa.backgroundLog.Debug("service initialized")
sa.backgroundLog.Debug("Service initialized")
if _, err := sa.getUsageMetrics(ctx); err != nil {
sa.log.Warn("Failed to get usage metrics", "error", err.Error())
@@ -101,7 +101,7 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error {
// Enforce a minimum interval of 1 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())
sa.secretScanInterval = defaultSecretScanInterval
@@ -112,7 +112,7 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error {
if !sa.secretScanEnabled {
tokenCheckTicker.Stop()
} else {
sa.backgroundLog.Debug("enabled token secret check and executing first check")
sa.backgroundLog.Debug("Enabled token secret check and executing first check")
if err := sa.secretScanService.CheckTokens(ctx); err != nil {
sa.backgroundLog.Warn("Failed to check for leaked tokens", "error", err.Error())
}
@@ -127,17 +127,17 @@ func (sa *ServiceAccountsService) Run(ctx context.Context) error {
return fmt.Errorf("context error in service account background service: %w", ctx.Err())
}
sa.backgroundLog.Debug("stopped service account background service")
sa.backgroundLog.Debug("Stopped service account background service")
return nil
case <-updateStatsTicker.C:
sa.backgroundLog.Debug("updating usage metrics")
sa.backgroundLog.Debug("Updating usage metrics")
if _, err := sa.getUsageMetrics(ctx); err != nil {
sa.backgroundLog.Warn("Failed to get usage metrics", "error", err.Error())
}
case <-tokenCheckTicker.C:
sa.backgroundLog.Debug("checking for leaked tokens")
sa.backgroundLog.Debug("Checking for leaked tokens")
if err := sa.secretScanService.CheckTokens(ctx); err != nil {
sa.backgroundLog.Warn("Failed to check for leaked tokens", "error", err.Error())

8
pkg/services/serviceaccounts/secretscan/service.go
View File

@@ -101,7 +101,7 @@ func (s *Service) CheckTokens(ctx context.Context) error {
hashes, hashMap := s.filterCheckableTokens(tokens)
if len(hashes) == 0 {
s.logger.Debug("no active tokens to check")
s.logger.Debug("No active tokens to check")
return nil
}
@@ -121,7 +121,7 @@ func (s *Service) CheckTokens(ctx context.Context) error {
if s.revoke {
if err := s.store.RevokeServiceAccountToken(
ctx, leakedToken.OrgID, *leakedToken.ServiceAccountId, leakedToken.ID); err != nil {
s.logger.Error("failed to delete leaked token. Revoke manually.",
s.logger.Error("Failed to delete leaked token. Revoke manually.",
"error", err, "url", secretscanToken.URL, "reported_at", secretscanToken.ReportedAt,
"token_id", leakedToken.ID, "token", leakedToken.Name, "org", leakedToken.OrgID,
"serviceAccount", *leakedToken.ServiceAccountId)
@@ -130,11 +130,11 @@ func (s *Service) CheckTokens(ctx context.Context) error {
if s.webHookNotify {
if err := s.webHookClient.Notify(ctx, &secretscanToken, leakedToken.Name, s.revoke); err != nil {
s.logger.Warn("failed to call token leak webhook", "error", err)
s.logger.Warn("Failed to call token leak webhook", "error", err)
}
}
s.logger.Warn("found leaked token",
s.logger.Warn("Found leaked token",
"url", secretscanToken.URL, "reported_at", secretscanToken.ReportedAt,
"token_id", leakedToken.ID, "token", leakedToken.Name, "org", leakedToken.OrgID,
"serviceAccount", *leakedToken.ServiceAccountId, "revoked", s.revoke)