fix(client-s3): revert MRAP customizations (#2759)

The @aws-sdk/[email protected] released with MRAP customization that instroduces
`aws-crt` dependency. The dependency takes up too much disk space that blocks
Lambda users deploying S3 client with certain deployers.

Rollback the change to unblock these users. The MRAP users that's not affected
by the dependency size can ping to the older version `@aws-sdk/[email protected]`

Author: AllanZhengYP

packages/signature-v4/src/SignatureV4.ts

@@ -37,9 +37,8 @@ import { createScope, getSigningKey } from "./credentialDerivation";
 import { getCanonicalHeaders } from "./getCanonicalHeaders";
 import { getCanonicalQuery } from "./getCanonicalQuery";
 import { getPayloadHash } from "./getPayloadHash";
-import { hasHeader } from "./headerUtil";
+import { hasHeader } from "./hasHeader";
 import { moveHeadersToQuery } from "./moveHeadersToQuery";
-import { normalizeCredentialsProvider, normalizeRegionProvider } from "./normalizeProvider";
 import { prepareRequest } from "./prepareRequest";
 import { iso8601 } from "./utilDate";
 
@@ -318,3 +317,21 @@ const formatDate = (now: DateInput): { longDate: string; shortDate: string } =>
 };
 
 const getCanonicalHeaderList = (headers: object): string => Object.keys(headers).sort().join(";");
+
+const normalizeRegionProvider = (region: string | Provider<string>): Provider<string> => {
+  if (typeof region === "string") {
+    const promisified = Promise.resolve(region);
+    return () => promisified;
+  } else {
+    return region;
+  }
+};
+
+const normalizeCredentialsProvider = (credentials: Credentials | Provider<Credentials>): Provider<Credentials> => {
+  if (typeof credentials === "object") {
+    const promisified = Promise.resolve(credentials);
+    return () => promisified;
+  } else {
+    return credentials;
+  }
+};

packages/signature-v4/src/cloneRequest.ts

@@ -3,17 +3,20 @@ import { HttpRequest, QueryParameterBag } from "@aws-sdk/types";
 /**
  * @internal
  */
-export const cloneRequest = ({ headers, query, ...rest }: HttpRequest): HttpRequest => ({
-  ...rest,
-  headers: { ...headers },
-  query: query ? cloneQuery(query) : undefined,
-});
+export function cloneRequest({ headers, query, ...rest }: HttpRequest): HttpRequest {
+  return {
+    ...rest,
+    headers: { ...headers },
+    query: query ? cloneQuery(query) : undefined,
+  };
+}
 
-export const cloneQuery = (query: QueryParameterBag): QueryParameterBag =>
-  Object.keys(query).reduce((carry: QueryParameterBag, paramName: string) => {
+function cloneQuery(query: QueryParameterBag): QueryParameterBag {
+  return Object.keys(query).reduce((carry: QueryParameterBag, paramName: string) => {
     const param = query[paramName];
     return {
       ...carry,
       [paramName]: Array.isArray(param) ? [...param] : param,
     };
   }, {});
+}

packages/signature-v4/src/constants.ts

@@ -5,7 +5,6 @@ export const SIGNED_HEADERS_QUERY_PARAM = "X-Amz-SignedHeaders";
 export const EXPIRES_QUERY_PARAM = "X-Amz-Expires";
 export const SIGNATURE_QUERY_PARAM = "X-Amz-Signature";
 export const TOKEN_QUERY_PARAM = "X-Amz-Security-Token";
-export const REGION_SET_PARAM = "X-Amz-Region-Set";
 
 export const AUTH_HEADER = "authorization";
 export const AMZ_DATE_HEADER = AMZ_DATE_QUERY_PARAM.toLowerCase();
@@ -41,7 +40,6 @@ export const SEC_HEADER_PATTERN = /^sec-/;
 export const UNSIGNABLE_PATTERNS = [/^proxy-/i, /^sec-/i];
 
 export const ALGORITHM_IDENTIFIER = "AWS4-HMAC-SHA256";
-export const ALGORITHM_IDENTIFIER_V4A = "AWS4-ECDSA-P256-SHA256";
 
 export const EVENT_ALGORITHM_IDENTIFIER = "AWS4-HMAC-SHA256-PAYLOAD";
 

packages/signature-v4/src/credentialDerivation.ts

@@ -13,8 +13,9 @@ const cacheQueue: Array<string> = [];
  * @param region    The AWS region in which the service resides.
  * @param service   The service to which the signed request is being sent.
  */
-export const createScope = (shortDate: string, region: string, service: string): string =>
-  `${shortDate}/${region}/${service}/${KEY_TYPE_IDENTIFIER}`;
+export function createScope(shortDate: string, region: string, service: string): string {
+  return `${shortDate}/${region}/${service}/${KEY_TYPE_IDENTIFIER}`;
+}
 
 /**
  * Derive a signing key from its composite parts
@@ -56,15 +57,15 @@ export const getSigningKey = async (
 /**
  * @internal
  */
-export const clearCredentialCache = (): void => {
+export function clearCredentialCache(): void {
   cacheQueue.length = 0;
   Object.keys(signingKeyCache).forEach((cacheKey) => {
     delete signingKeyCache[cacheKey];
   });
-};
+}
 
-const hmac = (ctor: HashConstructor, secret: SourceData, data: SourceData): Promise<Uint8Array> => {
+function hmac(ctor: HashConstructor, secret: SourceData, data: SourceData): Promise<Uint8Array> {
   const hash = new ctor(secret);
   hash.update(data);
   return hash.digest();
-};
+}

packages/signature-v4/src/getCanonicalHeaders.ts

@@ -3,13 +3,13 @@ import { HeaderBag, HttpRequest } from "@aws-sdk/types";
 import { ALWAYS_UNSIGNABLE_HEADERS, PROXY_HEADER_PATTERN, SEC_HEADER_PATTERN } from "./constants";
 
 /**
- * @private
+ * @internal
  */
-export const getCanonicalHeaders = (
+export function getCanonicalHeaders(
   { headers }: HttpRequest,
   unsignableHeaders?: Set<string>,
   signableHeaders?: Set<string>
-): HeaderBag => {
+): HeaderBag {
   const canonical: HeaderBag = {};
   for (const headerName of Object.keys(headers).sort()) {
     const canonicalHeaderName = headerName.toLowerCase();
@@ -28,4 +28,4 @@ export const getCanonicalHeaders = (
   }
 
   return canonical;
-};
+}

packages/signature-v4/src/getCanonicalQuery.ts

@@ -4,9 +4,9 @@ import { escapeUri } from "@aws-sdk/util-uri-escape";
 import { SIGNATURE_HEADER } from "./constants";
 
 /**
- * @private
+ * @internal
  */
-export const getCanonicalQuery = ({ query = {} }: HttpRequest): string => {
+export function getCanonicalQuery({ query = {} }: HttpRequest): string {
   const keys: Array<string> = [];
   const serialized: { [key: string]: string } = {};
   for (const key of Object.keys(query).sort()) {
@@ -34,4 +34,4 @@ export const getCanonicalQuery = ({ query = {} }: HttpRequest): string => {
     .map((key) => serialized[key])
     .filter((serialized) => serialized) // omit any falsy values
     .join("&");
-};
+}

packages/signature-v4/src/getPayloadHash.ts

@@ -5,12 +5,12 @@ import { toHex } from "@aws-sdk/util-hex-encoding";
 import { SHA256_HEADER, UNSIGNED_PAYLOAD } from "./constants";
 
 /**
- * @private
+ * @internal
  */
-export const getPayloadHash = async (
+export async function getPayloadHash(
   { headers, body }: HttpRequest,
   hashConstructor: HashConstructor
-): Promise<string> => {
+): Promise<string> {
   for (const headerName of Object.keys(headers)) {
     if (headerName.toLowerCase() === SHA256_HEADER) {
       return headers[headerName];
@@ -29,4 +29,4 @@ export const getPayloadHash = async (
   // body is unsignable. Attempt to send the request with an unsigned payload,
   // which may or may not be accepted by the service.
   return UNSIGNED_PAYLOAD;
-};
+}

packages/signature-v4/src/hasHeader.ts

@@ -0,0 +1,12 @@
+import { HeaderBag } from "@aws-sdk/types";
+
+export function hasHeader(soughtHeader: string, headers: HeaderBag): boolean {
+  soughtHeader = soughtHeader.toLowerCase();
+  for (const headerName of Object.keys(headers)) {
+    if (soughtHeader === headerName.toLowerCase()) {
+      return true;
+    }
+  }
+
+  return false;
+}

packages/signature-v4/src/headerUtil.ts

@@ -1,8 +1,2 @@
 export * from "./credentialDerivation";
-export { getCanonicalHeaders } from "./getCanonicalHeaders";
-export { getCanonicalQuery } from "./getCanonicalQuery";
-export { getPayloadHash } from "./getPayloadHash";
-export { moveHeadersToQuery } from "./moveHeadersToQuery";
-export { prepareRequest } from "./prepareRequest";
-export { normalizeCredentialsProvider, normalizeRegionProvider } from "./normalizeProvider";
 export * from "./SignatureV4";

packages/signature-v4/src/index.ts

@@ -3,12 +3,12 @@ import { HttpRequest, QueryParameterBag } from "@aws-sdk/types";
 import { cloneRequest } from "./cloneRequest";
 
 /**
- * @private
+ * @internal
  */
-export const moveHeadersToQuery = (
+export function moveHeadersToQuery(
   request: HttpRequest,
   options: { unhoistableHeaders?: Set<string> } = {}
-): HttpRequest & { query: QueryParameterBag } => {
+): HttpRequest & { query: QueryParameterBag } {
   const { headers, query = {} as QueryParameterBag } =
     typeof (request as any).clone === "function" ? (request as any).clone() : cloneRequest(request);
   for (const name of Object.keys(headers)) {
@@ -24,4 +24,4 @@ export const moveHeadersToQuery = (
     headers,
     query,
   };
-};
+}

packages/signature-v4/src/moveHeadersToQuery.ts

@@ -4,9 +4,9 @@ import { cloneRequest } from "./cloneRequest";
 import { GENERATED_HEADERS } from "./constants";
 
 /**
- * @private
+ * @internal
  */
-export const prepareRequest = (request: HttpRequest): HttpRequest => {
+export function prepareRequest(request: HttpRequest): HttpRequest {
   // Create a clone of the request object that does not clone the body
   request = typeof (request as any).clone === "function" ? (request as any).clone() : cloneRequest(request);
 
@@ -17,4 +17,4 @@ export const prepareRequest = (request: HttpRequest): HttpRequest => {
   }
 
   return request;
-};
+}

packages/signature-v4/src/normalizeProvider.ts

@@ -1,9 +1,10 @@
-export const iso8601 = (time: number | string | Date): string =>
-  toDate(time)
+export function iso8601(time: number | string | Date): string {
+  return toDate(time)
     .toISOString()
     .replace(/\.\d{3}Z$/, "Z");
+}
 
-export const toDate = (time: number | string | Date): Date => {
+export function toDate(time: number | string | Date): Date {
   if (typeof time === "number") {
     return new Date(time * 1000);
   }
@@ -16,4 +17,4 @@ export const toDate = (time: number | string | Date): Date => {
   }
 
   return time;
-};
+}

packages/signature-v4/src/prepareRequest.ts

@@ -4,6 +4,7 @@
     "declarationDir": "./dist/types",
     "rootDir": "./src",
     "outDir": "./dist/cjs",
+    "noUnusedLocals": true,
     "baseUrl": "."
   },
   "extends": "../../tsconfig.cjs.json",