From 5708e6ce32d7f495fffe0e40d32178509bb2947b Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 5 May 2023 14:44:40 -0800 Subject: [PATCH] Format redacted arg lines Pushing straight to main again. --- src/node/cli.ts | 15 ++++++--------- src/node/wrapper.ts | 11 +++++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/node/cli.ts b/src/node/cli.ts index eab083ab5..87807ec77 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -433,10 +433,7 @@ export const parse = ( throw new Error("--cert-key is missing") } - logger.debug(() => [ - `parsed ${opts?.configFile ? "config" : "command line"}`, - field("args", redactArgs(args)), - ]) + logger.debug(() => [`parsed ${opts?.configFile ? "config" : "command line"}`, field("args", redactArgs(args))]) return args } @@ -446,11 +443,11 @@ export const parse = ( */ export const redactArgs = (args: UserProvidedArgs): UserProvidedArgs => { return { - ...args, - password: args.password ? "" : undefined, - "hashed-password": args["hashed-password"] ? "" : undefined, - "github-auth": args["github-auth"] ? "" : undefined, - } + ...args, + password: args.password ? "" : undefined, + "hashed-password": args["hashed-password"] ? "" : undefined, + "github-auth": args["github-auth"] ? "" : undefined, + } } /** diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 4b8a61be7..ab8f70c16 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -182,10 +182,13 @@ export class ChildProcess extends Process { }, this.logger, ) - this.logger.debug("got message", field("message", { - type: message.type, - args: redactArgs(message.args), - })) + this.logger.debug( + "got message", + field("message", { + type: message.type, + args: redactArgs(message.args), + }), + ) return message.args }