From d3943639ecfcac561c9a80c4bb6ab308528171d5 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:19:05 +0000 Subject: [PATCH 01/12] chore(package.json): use lerna run test in test:all --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 719f582b4cdc..7a9b2dcca9b1 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "build:all": "yarn build:crypto-dependencies && lerna run build", "build-documentation": "yarn remove-documentation && typedoc", "pretest:all": "yarn build:all", - "test:all": "jest --coverage --passWithNoTests && lerna run test --scope '@aws-sdk/{fetch-http-handler,hash-blob-browser}' && yarn test:versions", + "test:all": "lerna run test && yarn test:versions", "test:functional": "jest --config tests/functional/jest.config.js", "test:integration:legacy": "cucumber-js --fail-fast", "test:integration:legacy:since:release": "./tests/integ-legacy/index.js", From 53f45de9407a1e7172cc613d50669a917657b98f Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:20:05 +0000 Subject: [PATCH 02/12] chore(middleware-content-length): add passWithNoTests --- packages/middleware-content-length/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/middleware-content-length/package.json b/packages/middleware-content-length/package.json index 2e50f7363842..a707c8327816 100644 --- a/packages/middleware-content-length/package.json +++ b/packages/middleware-content-length/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From a3b7677f263482a137d18f00cafc6d237878d728 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:21:17 +0000 Subject: [PATCH 03/12] chore(util-credentials): add passWithNoTests --- packages/util-credentials/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util-credentials/package.json b/packages/util-credentials/package.json index f8db50edbfd7..dd1bad66f0a9 100644 --- a/packages/util-credentials/package.json +++ b/packages/util-credentials/package.json @@ -10,7 +10,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "keywords": [ "aws", From e20a2105e0e8f35933d53254a4f4004ccbd718dd Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:22:00 +0000 Subject: [PATCH 04/12] chore(middleware-eventstream): add passWithNoTests --- packages/middleware-eventstream/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/middleware-eventstream/package.json b/packages/middleware-eventstream/package.json index b5b2e4dfce15..b13e5e5afe6d 100644 --- a/packages/middleware-eventstream/package.json +++ b/packages/middleware-eventstream/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From 6aecc5f0ac83fd68d9afcd3969c3a855ee1f0814 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:22:58 +0000 Subject: [PATCH 05/12] chore(querystring-builder): add passWithNoTests --- packages/querystring-builder/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/querystring-builder/package.json b/packages/querystring-builder/package.json index f429259e1e2f..0f4112a308fc 100644 --- a/packages/querystring-builder/package.json +++ b/packages/querystring-builder/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From 0f0ff87b3f6297d3d107a7c236ddccba446f0db3 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:27:54 +0000 Subject: [PATCH 06/12] chore(middleware-sdk-sts): add passWithNoTests --- packages/middleware-sdk-sts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/middleware-sdk-sts/package.json b/packages/middleware-sdk-sts/package.json index 0e0e133e1f31..959dc7d66ad6 100644 --- a/packages/middleware-sdk-sts/package.json +++ b/packages/middleware-sdk-sts/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From e2d3f46a2d8d01c6757016523e7d208bf063bd83 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:29:02 +0000 Subject: [PATCH 07/12] chore(eventstream-serde-browser): add passWithNoTests --- packages/eventstream-serde-browser/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eventstream-serde-browser/package.json b/packages/eventstream-serde-browser/package.json index a4c58c6f0d9b..e6518830bba2 100644 --- a/packages/eventstream-serde-browser/package.json +++ b/packages/eventstream-serde-browser/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From 28d48a9d0448e74ccf889e4ca931b556a0b98a0f Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Wed, 5 Jan 2022 23:30:23 +0000 Subject: [PATCH 08/12] chore(eventstream-serde-node): add passWithNoTests --- packages/eventstream-serde-node/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eventstream-serde-node/package.json b/packages/eventstream-serde-node/package.json index 895b05312d93..a96ceff007c9 100644 --- a/packages/eventstream-serde-node/package.json +++ b/packages/eventstream-serde-node/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From 912212971a6829a67a063aaa30622b81d16e3860 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:21:40 +0000 Subject: [PATCH 09/12] fix: disable jest coverage to test seg fault Refs: https://github.com/facebook/jest/issues/10662#issuecomment-870700903 --- packages/fetch-http-handler/package.json | 2 +- packages/middleware-apply-body-checksum/package.json | 2 +- packages/node-http-handler/package.json | 2 +- packages/signature-v4-crt/package.json | 2 +- packages/signature-v4/package.json | 2 +- private/aws-echo-service/package.json | 2 +- private/aws-protocoltests-ec2/package.json | 2 +- private/aws-protocoltests-json-10/package.json | 2 +- private/aws-protocoltests-json/package.json | 2 +- private/aws-protocoltests-query/package.json | 2 +- private/aws-protocoltests-restjson/package.json | 2 +- private/aws-protocoltests-restxml/package.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/fetch-http-handler/package.json b/packages/fetch-http-handler/package.json index 0400f910322a..9f4b2b3c3267 100644 --- a/packages/fetch-http-handler/package.json +++ b/packages/fetch-http-handler/package.json @@ -8,7 +8,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage && karma start karma.conf.js" + "test": "jest && karma start karma.conf.js" }, "author": { "name": "AWS SDK for JavaScript Team", diff --git a/packages/middleware-apply-body-checksum/package.json b/packages/middleware-apply-body-checksum/package.json index ae3b0d03ef17..c999a11b73b4 100644 --- a/packages/middleware-apply-body-checksum/package.json +++ b/packages/middleware-apply-body-checksum/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage" + "test": "jest " }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/packages/node-http-handler/package.json b/packages/node-http-handler/package.json index 3bc696e3a9cd..71fdc21a3e29 100644 --- a/packages/node-http-handler/package.json +++ b/packages/node-http-handler/package.json @@ -8,7 +8,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage" + "test": "jest " }, "author": { "name": "AWS SDK for JavaScript Team", diff --git a/packages/signature-v4-crt/package.json b/packages/signature-v4-crt/package.json index 0f08831a0601..8a08a52af76a 100644 --- a/packages/signature-v4-crt/package.json +++ b/packages/signature-v4-crt/package.json @@ -11,7 +11,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage" + "test": "jest " }, "author": { "name": "AWS SDK for JavaScript Team", diff --git a/packages/signature-v4/package.json b/packages/signature-v4/package.json index 3444fee5f6fd..ac57136a41d7 100644 --- a/packages/signature-v4/package.json +++ b/packages/signature-v4/package.json @@ -11,7 +11,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage" + "test": "jest " }, "author": { "name": "AWS SDK for JavaScript Team", diff --git a/private/aws-echo-service/package.json b/private/aws-echo-service/package.json index 5391cbd5cfae..b7b4b9707929 100644 --- a/private/aws-echo-service/package.json +++ b/private/aws-echo-service/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist-*", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-ec2/package.json b/private/aws-protocoltests-ec2/package.json index 7b99edf5dddb..70b084f4b58f 100644 --- a/private/aws-protocoltests-ec2/package.json +++ b/private/aws-protocoltests-ec2/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-json-10/package.json b/private/aws-protocoltests-json-10/package.json index f3976b8128fa..847dc82051af 100644 --- a/private/aws-protocoltests-json-10/package.json +++ b/private/aws-protocoltests-json-10/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-json/package.json b/private/aws-protocoltests-json/package.json index e0a337aea382..d9d3fbb95ddc 100644 --- a/private/aws-protocoltests-json/package.json +++ b/private/aws-protocoltests-json/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-query/package.json b/private/aws-protocoltests-query/package.json index 9a31ed66d126..9e5ffdec3bd6 100644 --- a/private/aws-protocoltests-query/package.json +++ b/private/aws-protocoltests-query/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-restjson/package.json b/private/aws-protocoltests-restjson/package.json index af5fb757b2c8..eac51d4348ed 100644 --- a/private/aws-protocoltests-restjson/package.json +++ b/private/aws-protocoltests-restjson/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", diff --git a/private/aws-protocoltests-restxml/package.json b/private/aws-protocoltests-restxml/package.json index e61f7b0d032f..f34f39daa287 100644 --- a/private/aws-protocoltests-restxml/package.json +++ b/private/aws-protocoltests-restxml/package.json @@ -12,7 +12,7 @@ "clean:dist": "rimraf ./dist", "clean:docs": "rimraf ./docs", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage --passWithNoTests" + "test": "jest --passWithNoTests" }, "main": "./dist-cjs/index.js", "types": "./dist-types/index.d.ts", From 4c1c01243ff4ee7077e25435151c98cdc71fb34c Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:41:06 +0000 Subject: [PATCH 10/12] fix(eventstream-marshaller): disable jest coverage to test seg fault --- packages/eventstream-marshaller/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eventstream-marshaller/package.json b/packages/eventstream-marshaller/package.json index fd24afa918d1..36db1828e492 100644 --- a/packages/eventstream-marshaller/package.json +++ b/packages/eventstream-marshaller/package.json @@ -7,7 +7,7 @@ "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", - "test": "jest --coverage" + "test": "jest" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", From a1f716f6518062affa083d4cb885e1c1c4db8a58 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:43:16 +0000 Subject: [PATCH 11/12] fix(polly-request-presigner): incorrect import of RequestPresigningArguments --- packages/polly-request-presigner/src/getSignedUrls.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/polly-request-presigner/src/getSignedUrls.spec.ts b/packages/polly-request-presigner/src/getSignedUrls.spec.ts index 3dcf14010d5c..d761225ee176 100644 --- a/packages/polly-request-presigner/src/getSignedUrls.spec.ts +++ b/packages/polly-request-presigner/src/getSignedUrls.spec.ts @@ -14,7 +14,7 @@ jest.mock("@aws-sdk/util-format-url", () => ({ formatUrl: (url: any) => url, })); -import { RequestPresigningArguments } from "@aws-sdk/types/src"; +import { RequestPresigningArguments } from "@aws-sdk/types"; import { getSignedUrl } from "./getSignedUrls"; From db4a7702b8cdf5d674a83d30c38c88d4c716e64e Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:53:51 +0000 Subject: [PATCH 12/12] test(polly-request-presigner): mock inside beforeEach --- .../src/getSignedUrls.spec.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/polly-request-presigner/src/getSignedUrls.spec.ts b/packages/polly-request-presigner/src/getSignedUrls.spec.ts index d761225ee176..c9cacdbdd61c 100644 --- a/packages/polly-request-presigner/src/getSignedUrls.spec.ts +++ b/packages/polly-request-presigner/src/getSignedUrls.spec.ts @@ -1,28 +1,28 @@ -const mockV4Sign = jest.fn(); -const mockPresign = jest.fn(); -const mockV4 = jest.fn().mockReturnValue({ - presign: mockPresign, - sign: mockV4Sign, -}); -jest.mock("@aws-sdk/signature-v4", () => ({ - SignatureV4: mockV4, -})); - import { PollyClient, SynthesizeSpeechCommand } from "@aws-sdk/client-polly"; - -jest.mock("@aws-sdk/util-format-url", () => ({ - formatUrl: (url: any) => url, -})); - +import { SignatureV4 } from "@aws-sdk/signature-v4"; import { RequestPresigningArguments } from "@aws-sdk/types"; +import { formatUrl } from "@aws-sdk/util-format-url"; import { getSignedUrl } from "./getSignedUrls"; +jest.mock("@aws-sdk/signature-v4"); +jest.mock("@aws-sdk/util-format-url"); + describe("getSignedUrl", () => { const clientParams = { region: "us-foo-1" }; + const mockV4Sign = jest.fn(); + const mockPresign = jest.fn(); beforeEach(() => { - mockPresign.mockReset(); + (SignatureV4 as jest.Mock).mockReturnValue({ + presign: mockPresign, + sign: mockV4Sign, + }); + (formatUrl as jest.Mock).mockImplementation((url: any) => url); + }); + + afterEach(() => { + jest.resetAllMocks(); }); it("should call SignatureV4.sign", async () => {