diff --git a/private/aws-middleware-test/jest.config.js b/packages/middleware-apply-body-checksum/jest.config.integ.js similarity index 53% rename from private/aws-middleware-test/jest.config.js rename to packages/middleware-apply-body-checksum/jest.config.integ.js index 37675d406a439..d09aba7398c72 100644 --- a/private/aws-middleware-test/jest.config.js +++ b/packages/middleware-apply-body-checksum/jest.config.integ.js @@ -1,4 +1,4 @@ module.exports = { preset: "ts-jest", - testMatch: ["**/*.spec.ts"], + testMatch: ["**/*.integ.spec.ts"], }; diff --git a/packages/middleware-apply-body-checksum/package.json b/packages/middleware-apply-body-checksum/package.json index 2351ad4a0e421..f2b88c8abd040 100644 --- a/packages/middleware-apply-body-checksum/package.json +++ b/packages/middleware-apply-body-checksum/package.json @@ -9,7 +9,8 @@ "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": "jest --coverage", + "test:integration": "jest --config jest.config.integ.js" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts b/packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts similarity index 93% rename from private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts rename to packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts index f913246e2045b..5e5fa92eba834 100644 --- a/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts +++ b/packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts @@ -1,6 +1,6 @@ import { S3Control } from "@aws-sdk/client-s3-control"; -import { requireRequestsFrom } from "../../aws-util-test/src"; +import { requireRequestsFrom } from "../../../private/aws-util-test/src"; describe("middleware-apply-body-checksum", () => { describe(S3Control.name, () => { diff --git a/packages/middleware-content-length/jest.config.integ.js b/packages/middleware-content-length/jest.config.integ.js new file mode 100644 index 0000000000000..d09aba7398c72 --- /dev/null +++ b/packages/middleware-content-length/jest.config.integ.js @@ -0,0 +1,4 @@ +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 dd3a32f0b5b93..6df6991b1ad26 100644 --- a/packages/middleware-content-length/package.json +++ b/packages/middleware-content-length/package.json @@ -9,7 +9,8 @@ "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": "exit 0", + "test:integration": "jest --config jest.config.integ.js" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/private/aws-middleware-test/src/middleware-content-length.spec.ts b/packages/middleware-content-length/src/middleware-content-length.integ.spec.ts similarity index 96% rename from private/aws-middleware-test/src/middleware-content-length.spec.ts rename to packages/middleware-content-length/src/middleware-content-length.integ.spec.ts index 095a48acc9763..e4849e9ffa9df 100644 --- a/private/aws-middleware-test/src/middleware-content-length.spec.ts +++ b/packages/middleware-content-length/src/middleware-content-length.integ.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 "../../aws-util-test/src"; +import { requireRequestsFrom } from "../../../private/aws-util-test/src"; describe("middleware-content-length", () => { describe(AccessAnalyzer.name, () => { diff --git a/private/aws-middleware-test/src/middleware-endpoint.spec.ts b/packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts similarity index 94% rename from private/aws-middleware-test/src/middleware-endpoint.spec.ts rename to packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts index fd35effa31d49..911cdefec91c3 100644 --- a/private/aws-middleware-test/src/middleware-endpoint.spec.ts +++ b/packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts @@ -1,7 +1,7 @@ import { S3 } from "@aws-sdk/client-s3"; import { S3Control } from "@aws-sdk/client-s3-control"; -import { requireRequestsFrom } from "../../aws-util-test/src"; +import { requireRequestsFrom } from "../../../private/aws-util-test/src"; describe("middleware-endpoint", () => { // these are token examples because most endpoint diff --git a/packages/middleware-retry/jest.config.integ.js b/packages/middleware-retry/jest.config.integ.js new file mode 100644 index 0000000000000..d09aba7398c72 --- /dev/null +++ b/packages/middleware-retry/jest.config.integ.js @@ -0,0 +1,4 @@ +module.exports = { + preset: "ts-jest", + testMatch: ["**/*.integ.spec.ts"], +}; diff --git a/packages/middleware-retry/package.json b/packages/middleware-retry/package.json index a068a4cffcab8..617ebf80ed3b5 100644 --- a/packages/middleware-retry/package.json +++ b/packages/middleware-retry/package.json @@ -10,7 +10,8 @@ "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": "jest", + "test:integration": "jest -c jest.config.integ.js" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/private/aws-middleware-test/src/middleware-retry.spec.ts b/packages/middleware-retry/src/middleware-retry.integ.spec.ts similarity index 90% rename from private/aws-middleware-test/src/middleware-retry.spec.ts rename to packages/middleware-retry/src/middleware-retry.integ.spec.ts index f22880ffee54b..2c568ff6de5e2 100644 --- a/private/aws-middleware-test/src/middleware-retry.spec.ts +++ b/packages/middleware-retry/src/middleware-retry.integ.spec.ts @@ -1,6 +1,6 @@ import { Lambda } from "@aws-sdk/client-lambda"; -import { requireRequestsFrom } from "../../aws-util-test/src"; +import { requireRequestsFrom } from "../../../private/aws-util-test/src"; describe("middleware-retry", () => { describe(Lambda.name, () => { diff --git a/packages/middleware-serde/jest.config.integ.js b/packages/middleware-serde/jest.config.integ.js new file mode 100644 index 0000000000000..d09aba7398c72 --- /dev/null +++ b/packages/middleware-serde/jest.config.integ.js @@ -0,0 +1,4 @@ +module.exports = { + preset: "ts-jest", + testMatch: ["**/*.integ.spec.ts"], +}; diff --git a/packages/middleware-serde/package.json b/packages/middleware-serde/package.json index 4a172122fc15b..03dbe96a821ec 100644 --- a/packages/middleware-serde/package.json +++ b/packages/middleware-serde/package.json @@ -9,7 +9,8 @@ "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": "jest", + "test:integration": "jest -c jest.config.integ.js" }, "main": "./dist-cjs/index.js", "module": "./dist-es/index.js", diff --git a/private/aws-middleware-test/src/middleware-serde.spec.ts b/packages/middleware-serde/src/middleware-serde.integ.spec.ts similarity index 98% rename from private/aws-middleware-test/src/middleware-serde.spec.ts rename to packages/middleware-serde/src/middleware-serde.integ.spec.ts index 88f476cf556a4..49a98d87f0c02 100644 --- a/private/aws-middleware-test/src/middleware-serde.spec.ts +++ b/packages/middleware-serde/src/middleware-serde.integ.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 "../../aws-util-test/src"; +import { requireRequestsFrom } from "../../../private/aws-util-test/src"; describe("middleware-serde", () => { describe(S3.name, () => { 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 deleted file mode 100644 index 063e1e67f6a2f..0000000000000 --- a/private/aws-client-retry-test/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# @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 2fab77e66421d..e47761fd7d860 100644 --- a/private/aws-client-retry-test/package.json +++ b/private/aws-client-retry-test/package.json @@ -17,10 +17,7 @@ "module": "./dist-es/index.js", "sideEffects": false, "dependencies": { - "@aws-sdk/client-s3": "*", - "@aws-sdk/util-retry": "*", - "@smithy/protocol-http": "*", - "@smithy/types": "*", + "@aws-sdk/client-xray": "*", "tslib": "^2.5.0" }, "devDependencies": { @@ -60,6 +57,6 @@ "repository": { "type": "git", "url": "https://github.com/aws/aws-sdk-js-v3.git", - "directory": "private/aws-client-retry-test" + "directory": "private/aws-client-api-test" } } diff --git a/private/aws-middleware-test/readme.md b/private/aws-client-retry-test/readme.md similarity index 86% rename from private/aws-middleware-test/readme.md rename to private/aws-client-retry-test/readme.md index e80b0e0945212..ffa7676aed832 100644 --- a/private/aws-middleware-test/readme.md +++ b/private/aws-client-retry-test/readme.md @@ -1,10 +1,10 @@ -# @aws-sdk/aws-middleware-test +# @aws-sdk/aws-client-api-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 AWS middleware. +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-middleware-test/CHANGELOG.md b/private/aws-middleware-test/CHANGELOG.md deleted file mode 100644 index e4d87c4d45c45..0000000000000 --- a/private/aws-middleware-test/CHANGELOG.md +++ /dev/null @@ -1,4 +0,0 @@ -# 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/private/aws-middleware-test/package.json b/private/aws-middleware-test/package.json deleted file mode 100644 index c1acfb42ddb07..0000000000000 --- a/private/aws-middleware-test/package.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "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" - } -}