From daeea3afcc844246e70c8f878d054b87fc239b1e Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Thu, 6 Feb 2025 19:01:27 +0000 Subject: [PATCH] fix(cli): sdk logging is always present even when not turned on --- packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts | 4 ++-- packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts b/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts index 8e449fd4a259f..4ac90ad16ed1e 100644 --- a/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts +++ b/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts @@ -13,7 +13,7 @@ export class SdkToCliLogger implements Logger { private notify(level: 'debug' | 'info' | 'warn' | 'error', ...content: any[]) { void this.ioHost.notify({ time: new Date(), - level, + level: 'trace', // always log all SDK logs at trace level, no matter what level they are coming from the SDK action: 'none' as any, code: 'CDK_SDK_I0000', message: format('[SDK %s] %s', level, formatSdkLoggerContent(content)), @@ -87,7 +87,7 @@ export class SdkToCliLogger implements Logger { * ``` */ public error(...content: any[]) { - this.notify('info', ...content); + this.notify('error', ...content); } } diff --git a/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts b/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts index c1912799d81a7..da08bcaef4a80 100644 --- a/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts +++ b/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts @@ -12,13 +12,16 @@ describe(SdkToCliLogger, () => { }); test.each(['trace', 'debug'] as Array)('%s method does not call notify', (method) => { - logger[method]('test'); + logger[method]('SDK Logger test message'); expect(ioHost.notify).not.toHaveBeenCalled(); }); test.each(['info', 'warn', 'error'] as Array)('%s method logs to notify', (method) => { - logger[method]('test'); - expect(ioHost.notify).toHaveBeenCalled(); + logger[method]('SDK Logger test message'); + expect(ioHost.notify).toHaveBeenCalledWith(expect.objectContaining({ + level: 'trace', + message: `[SDK ${method}] SDK Logger test message`, + })); }); });