From b46bc03b26ae13530363ea4df81fa2da66451f6c Mon Sep 17 00:00:00 2001 From: Chase Coalwell <782571+srchase@users.noreply.github.com> Date: Fri, 30 Jun 2023 10:18:31 -0600 Subject: [PATCH] chore(packages): consolidate middleware integ tests --- .../package.json | 3 +- .../jest.config.integ.js | 4 -- .../middleware-content-length/package.json | 3 +- .../middleware-retry/jest.config.integ.js | 4 -- packages/middleware-retry/package.json | 3 +- .../middleware-serde/jest.config.integ.js | 4 -- packages/middleware-serde/package.json | 3 +- .../{readme.md => README.md} | 0 private/aws-client-retry-test/README.md | 10 +++ private/aws-client-retry-test/package.json | 7 +- private/aws-middleware-test/CHANGELOG.md | 4 ++ .../aws-middleware-test/jest.config.js | 2 +- private/aws-middleware-test/package.json | 67 +++++++++++++++++++ .../readme.md | 4 +- .../middleware-apply-body-checksum.spec.ts | 2 +- .../src/middleware-content-length.spec.ts | 2 +- .../src/middleware-endpoint.spec.ts | 2 +- .../src/middleware-retry.spec.ts | 2 +- .../src/middleware-serde.spec.ts | 2 +- 19 files changed, 98 insertions(+), 30 deletions(-) delete mode 100644 packages/middleware-content-length/jest.config.integ.js delete mode 100644 packages/middleware-retry/jest.config.integ.js delete mode 100644 packages/middleware-serde/jest.config.integ.js rename private/aws-client-api-test/{readme.md => README.md} (100%) create mode 100644 private/aws-client-retry-test/README.md create mode 100644 private/aws-middleware-test/CHANGELOG.md rename packages/middleware-apply-body-checksum/jest.config.integ.js => private/aws-middleware-test/jest.config.js (53%) create mode 100644 private/aws-middleware-test/package.json rename private/{aws-client-retry-test => aws-middleware-test}/readme.md (86%) rename packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts => private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts (93%) rename packages/middleware-content-length/src/middleware-content-length.integ.spec.ts => private/aws-middleware-test/src/middleware-content-length.spec.ts (96%) rename packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts => private/aws-middleware-test/src/middleware-endpoint.spec.ts (94%) rename packages/middleware-retry/src/middleware-retry.integ.spec.ts => private/aws-middleware-test/src/middleware-retry.spec.ts (90%) rename packages/middleware-serde/src/middleware-serde.integ.spec.ts => private/aws-middleware-test/src/middleware-serde.spec.ts (98%) diff --git a/packages/middleware-apply-body-checksum/package.json b/packages/middleware-apply-body-checksum/package.json index f2b88c8abd04..2351ad4a0e42 100644 --- a/packages/middleware-apply-body-checksum/package.json +++ b/packages/middleware-apply-body-checksum/package.json @@ -9,8 +9,7 @@ "build:types": "tsc -p tsconfig.types.json", "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", - "test": "jest --coverage", - "test:integration": "jest --config jest.config.integ.js" + "test": "jest --coverage" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/packages/middleware-content-length/jest.config.integ.js b/packages/middleware-content-length/jest.config.integ.js deleted file mode 100644 index d09aba7398c7..000000000000 --- a/packages/middleware-content-length/jest.config.integ.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - preset: "ts-jest", - testMatch: ["**/*.integ.spec.ts"], -}; diff --git a/packages/middleware-content-length/package.json b/packages/middleware-content-length/package.json index 6df6991b1ad2..dd3a32f0b5b9 100644 --- a/packages/middleware-content-length/package.json +++ b/packages/middleware-content-length/package.json @@ -9,8 +9,7 @@ "build:types": "tsc -p tsconfig.types.json", "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", - "test": "exit 0", - "test:integration": "jest --config jest.config.integ.js" + "test": "exit 0" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/packages/middleware-retry/jest.config.integ.js b/packages/middleware-retry/jest.config.integ.js deleted file mode 100644 index d09aba7398c7..000000000000 --- a/packages/middleware-retry/jest.config.integ.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - preset: "ts-jest", - testMatch: ["**/*.integ.spec.ts"], -}; diff --git a/packages/middleware-retry/package.json b/packages/middleware-retry/package.json index 804aa917c64b..e5ceb432f3ed 100644 --- a/packages/middleware-retry/package.json +++ b/packages/middleware-retry/package.json @@ -10,8 +10,7 @@ "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", "extract:docs": "api-extractor run --local", - "test": "jest", - "test:integration": "jest -c jest.config.integ.js" + "test": "jest" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/packages/middleware-serde/jest.config.integ.js b/packages/middleware-serde/jest.config.integ.js deleted file mode 100644 index d09aba7398c7..000000000000 --- a/packages/middleware-serde/jest.config.integ.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - preset: "ts-jest", - testMatch: ["**/*.integ.spec.ts"], -}; diff --git a/packages/middleware-serde/package.json b/packages/middleware-serde/package.json index 03dbe96a821e..4a172122fc15 100644 --- a/packages/middleware-serde/package.json +++ b/packages/middleware-serde/package.json @@ -9,8 +9,7 @@ "build:types": "tsc -p tsconfig.types.json", "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", - "test": "jest", - "test:integration": "jest -c jest.config.integ.js" + "test": "jest" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/private/aws-client-api-test/readme.md b/private/aws-client-api-test/README.md similarity index 100% rename from private/aws-client-api-test/readme.md rename to private/aws-client-api-test/README.md diff --git a/private/aws-client-retry-test/README.md b/private/aws-client-retry-test/README.md new file mode 100644 index 000000000000..063e1e67f6a2 --- /dev/null +++ b/private/aws-client-retry-test/README.md @@ -0,0 +1,10 @@ +# @aws-sdk/aws-client-retry-test + +This is not a runtime or published package. + +This is a test spec. + +The purpose of this package is to perform integration tests on the retry-middleware. + +If tests in this package fail, the author should either fix their changes such that the API contract +is maintained, or appropriately announce and safely deprecate the interfaces affected by incoming changes. diff --git a/private/aws-client-retry-test/package.json b/private/aws-client-retry-test/package.json index e47761fd7d86..2fab77e66421 100644 --- a/private/aws-client-retry-test/package.json +++ b/private/aws-client-retry-test/package.json @@ -17,7 +17,10 @@ "module": "./dist-es/index.js", "sideEffects": false, "dependencies": { - "@aws-sdk/client-xray": "*", + "@aws-sdk/client-s3": "*", + "@aws-sdk/util-retry": "*", + "@smithy/protocol-http": "*", + "@smithy/types": "*", "tslib": "^2.5.0" }, "devDependencies": { @@ -57,6 +60,6 @@ "repository": { "type": "git", "url": "https://github.com/aws/aws-sdk-js-v3.git", - "directory": "private/aws-client-api-test" + "directory": "private/aws-client-retry-test" } } diff --git a/private/aws-middleware-test/CHANGELOG.md b/private/aws-middleware-test/CHANGELOG.md new file mode 100644 index 000000000000..e4d87c4d45c4 --- /dev/null +++ b/private/aws-middleware-test/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. diff --git a/packages/middleware-apply-body-checksum/jest.config.integ.js b/private/aws-middleware-test/jest.config.js similarity index 53% rename from packages/middleware-apply-body-checksum/jest.config.integ.js rename to private/aws-middleware-test/jest.config.js index d09aba7398c7..37675d406a43 100644 --- a/packages/middleware-apply-body-checksum/jest.config.integ.js +++ b/private/aws-middleware-test/jest.config.js @@ -1,4 +1,4 @@ module.exports = { preset: "ts-jest", - testMatch: ["**/*.integ.spec.ts"], + testMatch: ["**/*.spec.ts"], }; diff --git a/private/aws-middleware-test/package.json b/private/aws-middleware-test/package.json new file mode 100644 index 000000000000..c1acfb42ddb0 --- /dev/null +++ b/private/aws-middleware-test/package.json @@ -0,0 +1,67 @@ +{ + "name": "@aws-sdk/aws-middleware-test", + "description": "Integration test suite for AWS middleware", + "version": "3.0.0", + "scripts": { + "build": "exit 0", + "build:cjs": "exit 0", + "build:es": "exit 0", + "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build", + "build:types": "tsc -p tsconfig.types.json", + "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", + "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", + "test": "jest --coverage --passWithNoTests" + }, + "main": "./dist-cjs/index.js", + "types": "./dist-types/index.d.ts", + "module": "./dist-es/index.js", + "sideEffects": false, + "dependencies": { + "@aws-sdk/client-accessanalyzer": "*", + "@aws-sdk/client-ec2": "*", + "@aws-sdk/client-lambda": "*", + "@aws-sdk/client-s3": "*", + "@aws-sdk/client-s3-control": "*", + "@aws-sdk/client-sagemaker": "*", + "@aws-sdk/client-sagemaker-runtime": "*", + "@aws-sdk/client-xray": "*", + "tslib": "^2.5.0" + }, + "devDependencies": { + "@tsconfig/node14": "1.0.3", + "@types/node": "^12.7.5", + "concurrently": "7.0.0", + "downlevel-dts": "0.10.1", + "typedoc": "0.23.23", + "typescript": "~4.9.5" + }, + "overrides": { + "typedoc": { + "typescript": "~4.9.5" + } + }, + "engines": { + "node": ">=14.0.0" + }, + "typesVersions": { + "<4.0": { + "dist-types/*": [ + "dist-types/ts3.4/*" + ] + } + }, + "files": [ + "dist-*/**" + ], + "author": { + "name": "AWS SDK for JavaScript Team", + "url": "https://aws.amazon.com/javascript/" + }, + "license": "Apache-2.0", + "private": true, + "repository": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-js-v3.git", + "directory": "private/aws-middleware-test" + } +} diff --git a/private/aws-client-retry-test/readme.md b/private/aws-middleware-test/readme.md similarity index 86% rename from private/aws-client-retry-test/readme.md rename to private/aws-middleware-test/readme.md index ffa7676aed83..e80b0e094521 100644 --- a/private/aws-client-retry-test/readme.md +++ b/private/aws-middleware-test/readme.md @@ -1,10 +1,10 @@ -# @aws-sdk/aws-client-api-test +# @aws-sdk/aws-middleware-test This is not a runtime or published package. This is a test spec. -The purpose of this package is to perform integration tests on the retry-middleware. +The purpose of this package is to perform integration tests on the AWS middleware. If tests in this package fail, the author should either fix their changes such that the API contract is maintained, or appropriately announce and safely deprecate the interfaces affected by incoming changes. diff --git a/packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts b/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts similarity index 93% rename from packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts rename to private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts index 5e5fa92eba83..f913246e2045 100644 --- a/packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts +++ b/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts @@ -1,6 +1,6 @@ import { S3Control } from "@aws-sdk/client-s3-control"; -import { requireRequestsFrom } from "../../../private/aws-util-test/src"; +import { requireRequestsFrom } from "../../aws-util-test/src"; describe("middleware-apply-body-checksum", () => { describe(S3Control.name, () => { diff --git a/packages/middleware-content-length/src/middleware-content-length.integ.spec.ts b/private/aws-middleware-test/src/middleware-content-length.spec.ts similarity index 96% rename from packages/middleware-content-length/src/middleware-content-length.integ.spec.ts rename to private/aws-middleware-test/src/middleware-content-length.spec.ts index e4849e9ffa9d..095a48acc976 100644 --- a/packages/middleware-content-length/src/middleware-content-length.integ.spec.ts +++ b/private/aws-middleware-test/src/middleware-content-length.spec.ts @@ -2,7 +2,7 @@ import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer"; import { S3 } from "@aws-sdk/client-s3"; import { XRay } from "@aws-sdk/client-xray"; -import { requireRequestsFrom } from "../../../private/aws-util-test/src"; +import { requireRequestsFrom } from "../../aws-util-test/src"; describe("middleware-content-length", () => { describe(AccessAnalyzer.name, () => { diff --git a/packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts b/private/aws-middleware-test/src/middleware-endpoint.spec.ts similarity index 94% rename from packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts rename to private/aws-middleware-test/src/middleware-endpoint.spec.ts index 911cdefec91c..fd35effa31d4 100644 --- a/packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts +++ b/private/aws-middleware-test/src/middleware-endpoint.spec.ts @@ -1,7 +1,7 @@ import { S3 } from "@aws-sdk/client-s3"; import { S3Control } from "@aws-sdk/client-s3-control"; -import { requireRequestsFrom } from "../../../private/aws-util-test/src"; +import { requireRequestsFrom } from "../../aws-util-test/src"; describe("middleware-endpoint", () => { // these are token examples because most endpoint diff --git a/packages/middleware-retry/src/middleware-retry.integ.spec.ts b/private/aws-middleware-test/src/middleware-retry.spec.ts similarity index 90% rename from packages/middleware-retry/src/middleware-retry.integ.spec.ts rename to private/aws-middleware-test/src/middleware-retry.spec.ts index 2c568ff6de5e..f22880ffee54 100644 --- a/packages/middleware-retry/src/middleware-retry.integ.spec.ts +++ b/private/aws-middleware-test/src/middleware-retry.spec.ts @@ -1,6 +1,6 @@ import { Lambda } from "@aws-sdk/client-lambda"; -import { requireRequestsFrom } from "../../../private/aws-util-test/src"; +import { requireRequestsFrom } from "../../aws-util-test/src"; describe("middleware-retry", () => { describe(Lambda.name, () => { diff --git a/packages/middleware-serde/src/middleware-serde.integ.spec.ts b/private/aws-middleware-test/src/middleware-serde.spec.ts similarity index 98% rename from packages/middleware-serde/src/middleware-serde.integ.spec.ts rename to private/aws-middleware-test/src/middleware-serde.spec.ts index 49a98d87f0c0..88f476cf556a 100644 --- a/packages/middleware-serde/src/middleware-serde.integ.spec.ts +++ b/private/aws-middleware-test/src/middleware-serde.spec.ts @@ -3,7 +3,7 @@ import { S3 } from "@aws-sdk/client-s3"; import { SageMaker } from "@aws-sdk/client-sagemaker"; import { SageMakerRuntime } from "@aws-sdk/client-sagemaker-runtime"; -import { requireRequestsFrom } from "../../../private/aws-util-test/src"; +import { requireRequestsFrom } from "../../aws-util-test/src"; describe("middleware-serde", () => { describe(S3.name, () => {