From 0f603c8a1c8dae606c2302d362aff36a9c8dd188 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 15 May 2024 17:26:33 +0200 Subject: [PATCH] chore: [REDACTED] -> *** Signed-off-by: blam Signed-off-by: blam --- packages/backend-app-api/src/logging/WinstonLogger.test.ts | 6 +++--- packages/backend-app-api/src/logging/WinstonLogger.ts | 2 +- .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts | 5 +---- plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/backend-app-api/src/logging/WinstonLogger.test.ts b/packages/backend-app-api/src/logging/WinstonLogger.test.ts index 4b608f8e57..0f9e079943 100644 --- a/packages/backend-app-api/src/logging/WinstonLogger.test.ts +++ b/packages/backend-app-api/src/logging/WinstonLogger.test.ts @@ -50,7 +50,7 @@ describe('WinstonLogger', () => { expect.objectContaining({ [MESSAGE]: JSON.stringify({ level: 'error', - message: '[REDACTED]) from this file', + message: '***) from this file', }), }), expect.any(Function), @@ -83,10 +83,10 @@ describe('WinstonLogger', () => { [MESSAGE]: JSON.stringify({ level: 'error', message: 'something went wrong', - nested: '[REDACTED] (world) from nested object', + nested: '*** (world) from nested object', null: null, nullProto: { - foo: '[REDACTED] foo', + foo: '*** foo', }, }), }), diff --git a/packages/backend-app-api/src/logging/WinstonLogger.ts b/packages/backend-app-api/src/logging/WinstonLogger.ts index 8ee86d247f..64e97b230c 100644 --- a/packages/backend-app-api/src/logging/WinstonLogger.ts +++ b/packages/backend-app-api/src/logging/WinstonLogger.ts @@ -92,7 +92,7 @@ export class WinstonLogger implements RootLoggerService { return obj; } - obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '[REDACTED]'); + obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '***'); return obj; })(), diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts index 77097e97ea..6ae01c60cd 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts @@ -272,10 +272,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner { if (task.isDryRun) { const redactedSecrets = Object.fromEntries( - Object.entries(task.secrets ?? {}).map(secret => [ - secret[0], - '[REDACTED]', - ]), + Object.entries(task.secrets ?? {}).map(secret => [secret[0], '***']), ); const debugInput = (step.input && diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts index 3824a32a6f..e85c61d489 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts @@ -114,7 +114,7 @@ export class WinstonLogger implements RootLoggerService { return obj; } - obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '[REDACTED]'); + obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '***'); return obj; })(),