From 78f179112300b0f34e6988ff050bbf67053e23b6 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Fri, 9 Jul 2021 14:40:45 +0000 Subject: [PATCH] chore(middleware-apply-body-checksum): use arrow functions --- .../src/applyMd5BodyChecksumMiddleware.ts | 62 +++++++++---------- .../src/md5Configuration.ts | 10 ++- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts b/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts index 5354b864633d..430ef33c731a 100644 --- a/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts +++ b/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts @@ -13,37 +13,37 @@ import { import { Md5BodyChecksumResolvedConfig } from "./md5Configuration"; -export function applyMd5BodyChecksumMiddleware(options: Md5BodyChecksumResolvedConfig): BuildMiddleware { - return (next: BuildHandler): BuildHandler => - async (args: BuildHandlerArguments): Promise> => { - let { request } = args; - if (HttpRequest.isInstance(request)) { - const { body, headers } = request; - if (!hasHeader("Content-MD5", headers)) { - let digest: Promise; - if (body === undefined || typeof body === "string" || ArrayBuffer.isView(body) || isArrayBuffer(body)) { - const hash = new options.md5(); - hash.update(body || ""); - digest = hash.digest(); - } else { - digest = options.streamHasher(options.md5, body); - } - - request = { - ...request, - headers: { - ...headers, - "Content-MD5": options.base64Encoder(await digest), - }, - }; +export const applyMd5BodyChecksumMiddleware = + (options: Md5BodyChecksumResolvedConfig): BuildMiddleware => + (next: BuildHandler): BuildHandler => + async (args: BuildHandlerArguments): Promise> => { + let { request } = args; + if (HttpRequest.isInstance(request)) { + const { body, headers } = request; + if (!hasHeader("Content-MD5", headers)) { + let digest: Promise; + if (body === undefined || typeof body === "string" || ArrayBuffer.isView(body) || isArrayBuffer(body)) { + const hash = new options.md5(); + hash.update(body || ""); + digest = hash.digest(); + } else { + digest = options.streamHasher(options.md5, body); } + + request = { + ...request, + headers: { + ...headers, + "Content-MD5": options.base64Encoder(await digest), + }, + }; } - return next({ - ...args, - request, - }); - }; -} + } + return next({ + ...args, + request, + }); + }; export const applyMd5BodyChecksumMiddlewareOptions: BuildHandlerOptions = { name: "applyMd5BodyChecksumMiddleware", @@ -58,7 +58,7 @@ export const getApplyMd5BodyChecksumPlugin = (config: Md5BodyChecksumResolvedCon }, }); -function hasHeader(soughtHeader: string, headers: HeaderBag): boolean { +const hasHeader = (soughtHeader: string, headers: HeaderBag): boolean => { soughtHeader = soughtHeader.toLowerCase(); for (const headerName of Object.keys(headers)) { if (soughtHeader === headerName.toLowerCase()) { @@ -67,4 +67,4 @@ function hasHeader(soughtHeader: string, headers: HeaderBag): boolean { } return false; -} +}; diff --git a/packages/middleware-apply-body-checksum/src/md5Configuration.ts b/packages/middleware-apply-body-checksum/src/md5Configuration.ts index a0081623202a..f7ded7c3bc09 100644 --- a/packages/middleware-apply-body-checksum/src/md5Configuration.ts +++ b/packages/middleware-apply-body-checksum/src/md5Configuration.ts @@ -6,6 +6,7 @@ interface PreviouslyResolved { base64Encoder: Encoder; streamHasher: StreamHasher; } + export interface Md5BodyChecksumResolvedConfig { /** * A constructor for a class implementing the @aws-sdk/types.Hash interface that computes MD5 hashes. @@ -23,10 +24,7 @@ export interface Md5BodyChecksumResolvedConfig { */ streamHasher: StreamHasher; } -export function resolveMd5BodyChecksumConfig( + +export const resolveMd5BodyChecksumConfig = ( input: T & PreviouslyResolved & Md5BodyChecksumInputConfig -): T & Md5BodyChecksumResolvedConfig { - return { - ...input, - }; -} +): T & Md5BodyChecksumResolvedConfig => input;