Skip to content

Commit

Permalink
fix(middleware-logger): retrieve filter overrides after middleware re…
Browse files Browse the repository at this point in the history
…turns (aws#4502)
  • Loading branch information
kuhe authored Mar 8, 2023
1 parent 4069de2 commit 6405a58
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions packages/middleware-logger/src/loggerMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ export const loggerMiddleware =
context: HandlerExecutionContext
): InitializeHandler<any, Output> =>
async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {
const { clientName, commandName, logger, dynamoDbDocumentClientOptions = {} } = context;

const { overrideInputFilterSensitiveLog, overrideOutputFilterSensitiveLog } = dynamoDbDocumentClientOptions;
const inputFilterSensitiveLog = overrideInputFilterSensitiveLog ?? context.inputFilterSensitiveLog;
const outputFilterSensitiveLog = overrideOutputFilterSensitiveLog ?? context.outputFilterSensitiveLog;

try {
const response = await next(args);
const { clientName, commandName, logger, dynamoDbDocumentClientOptions = {} } = context;

const { overrideInputFilterSensitiveLog, overrideOutputFilterSensitiveLog } = dynamoDbDocumentClientOptions;
const inputFilterSensitiveLog = overrideInputFilterSensitiveLog ?? context.inputFilterSensitiveLog;
const outputFilterSensitiveLog = overrideOutputFilterSensitiveLog ?? context.outputFilterSensitiveLog;

const { $metadata, ...outputWithoutMetadata } = response.output;
logger?.info?.({
clientName,
Expand All @@ -34,6 +34,11 @@ export const loggerMiddleware =
});
return response;
} catch (error) {
const { clientName, commandName, logger, dynamoDbDocumentClientOptions = {} } = context;

const { overrideInputFilterSensitiveLog } = dynamoDbDocumentClientOptions;
const inputFilterSensitiveLog = overrideInputFilterSensitiveLog ?? context.inputFilterSensitiveLog;

logger?.error?.({
clientName,
commandName,
Expand Down

0 comments on commit 6405a58

Please sign in to comment.