debug log user_ids

johnstcn · johnstcn · commit cce02442bf2a · 2023-09-06T15:42:47.000+01:00
diff --git a/enterprise/cli/dbcrypt_rotate.go b/enterprise/cli/dbcrypt_rotate.go
@@ -108,7 +108,7 @@ func (*RootCmd) dbcryptRotate() *clibase.Cmd {
 							UserID:            usr.ID,
 							LoginType:         usr.LoginType,
 						}); err != nil {
-							return xerrors.Errorf("update user link: %w", err)
+							return xerrors.Errorf("update user link user_id=%s linked_id=%s: %w", userLink.UserID, userLink.LinkedID, err)
 						}
 					}
 					gitAuthLinks, err := tx.GetGitAuthLinksByUserID(ctx, usr.ID)
@@ -124,7 +124,7 @@ func (*RootCmd) dbcryptRotate() *clibase.Cmd {
 							OAuthRefreshToken: gitAuthLink.OAuthRefreshToken,
 							OAuthExpiry:       gitAuthLink.OAuthExpiry,
 						}); err != nil {
-							return xerrors.Errorf("update git auth link: %w", err)
+							return xerrors.Errorf("update git auth link user_id=%s provider_id=%s: %w", gitAuthLink.UserID, gitAuthLink.ProviderID, err)
 						}
 					}
 					return nil
@@ -134,7 +134,7 @@ func (*RootCmd) dbcryptRotate() *clibase.Cmd {
 				if err != nil {
 					return xerrors.Errorf("update user links: %w", err)
 				}
-				logger.Debug(ctx, "encrypted user tokens", slog.F("current", idx+1), slog.F("cipher", ciphers[0].HexDigest()))
+				logger.Debug(ctx, "encrypted user tokens", slog.F("user_id", usr.ID), slog.F("current", idx+1), slog.F("cipher", ciphers[0].HexDigest()))
 			}
 			logger.Info(ctx, "operation completed successfully")
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (RootCmd) dbcryptRotate() clibase.Cmd {`
`108`	`108`	`UserID: usr.ID,`
`109`	`109`	`LoginType: usr.LoginType,`
`110`	`110`	`}); err != nil {`
`111`		`- return xerrors.Errorf("update user link: %w", err)`
	`111`	`+ return xerrors.Errorf("update user link user_id=%s linked_id=%s: %w", userLink.UserID, userLink.LinkedID, err)`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`gitAuthLinks, err := tx.GetGitAuthLinksByUserID(ctx, usr.ID)`
`@@ -124,7 +124,7 @@ func (RootCmd) dbcryptRotate() clibase.Cmd {`
`124`	`124`	`OAuthRefreshToken: gitAuthLink.OAuthRefreshToken,`
`125`	`125`	`OAuthExpiry: gitAuthLink.OAuthExpiry,`
`126`	`126`	`}); err != nil {`
`127`		`- return xerrors.Errorf("update git auth link: %w", err)`
	`127`	`+ return xerrors.Errorf("update git auth link user_id=%s provider_id=%s: %w", gitAuthLink.UserID, gitAuthLink.ProviderID, err)`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`return nil`
`@@ -134,7 +134,7 @@ func (RootCmd) dbcryptRotate() clibase.Cmd {`
`134`	`134`	`if err != nil {`
`135`	`135`	`return xerrors.Errorf("update user links: %w", err)`
`136`	`136`	`}`
`137`		`- logger.Debug(ctx, "encrypted user tokens", slog.F("current", idx+1), slog.F("cipher", ciphers[0].HexDigest()))`
	`137`	`+ logger.Debug(ctx, "encrypted user tokens", slog.F("user_id", usr.ID), slog.F("current", idx+1), slog.F("cipher", ciphers[0].HexDigest()))`
`138`	`138`	`}`
`139`	`139`	`logger.Info(ctx, "operation completed successfully")`
`140`	`140`