chore(packages): consolidate middleware integ tests

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",

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",

packages/middleware-endpoint/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 --passWithNoTests",
- "test:integration": "jest -c jest.config.integ.js"
+ "test": "jest --passWithNoTests"
  },
  "main": "./dist-cjs/index.js",
  "module": "./dist-es/index.js",

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",

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",

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.

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": {
@@ -55,6 +58,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"
  }
 }

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.

private/aws-middleware-test/jest.config.js

@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+ ...base,
+};

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": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
+ "build:cjs": "tsc -p tsconfig.cjs.json",
+ "build:es": "tsc -p tsconfig.es.json",
+ "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"
+ }
+}

private/aws-client-retry-test/readme.md → 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.

packages/middleware-apply-body-checksum/src/middleware-apply-body-checksum.integ.spec.ts → 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, () => {

packages/middleware-content-length/src/middleware-content-length.integ.spec.ts → 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, () => {

packages/middleware-endpoint/src/middleware-endpoint.integ.spec.ts → 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

packages/middleware-retry/src/middleware-retry.integ.spec.ts → 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, () => {

packages/middleware-serde/src/middleware-serde.integ.spec.ts → 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, () => {

private/aws-middleware-test/tsconfig.cjs.json

@@ -0,0 +1,6 @@
+{
+ "extends": "./tsconfig",
+ "compilerOptions": {
+ "outDir": "dist-cjs"
+ }
+}

private/aws-middleware-test/tsconfig.es.json

@@ -0,0 +1,8 @@
+{
+ "extends": "./tsconfig",
+ "compilerOptions": {
+ "lib": ["dom"],
+ "module": "esnext",
+ "outDir": "dist-es"
+ }
+}

private/aws-middleware-test/tsconfig.json

@@ -0,0 +1,13 @@
+{
+ "extends": "@tsconfig/node14/tsconfig.json",
+ "compilerOptions": {
+ "downlevelIteration": true,
+ "importHelpers": true,
+ "incremental": true,
+ "removeComments": true,
+ "resolveJsonModule": true,
+ "rootDir": "src",
+ "useUnknownInCatchVariables": false
+ },
+ "exclude": ["test/"]
+}

private/aws-middleware-test/tsconfig.types.json

@@ -0,0 +1,10 @@
+{
+ "extends": "./tsconfig",
+ "compilerOptions": {
+ "removeComments": false,
+ "declaration": true,
+ "declarationDir": "dist-types",
+ "emitDeclarationOnly": true
+ },
+ "exclude": ["test/**/*", "dist-types/**/*"]
+}

private/aws-util-test/src/index.d.ts

@@ -0,0 +1 @@
+export * from "./requests/test-http-handler";

private/aws-util-test/src/index.js

@@ -0,0 +1 @@
+export * from "./requests/test-http-handler";

private/aws-util-test/src/requests/test-http-handler.d.ts

@@ -0,0 +1,65 @@
+import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
+import { Client, HttpHandlerOptions, RequestHandlerOutput } from "@aws-sdk/types";
+/**
+ * Instructs {@link TestHttpHandler} how to match the handled request and the expected request.
+ * @internal
+ */
+export type Matcher = string | number | boolean | RegExp | null | undefined | ((value: any) => void);
+/**
+ * @internal
+ */
+export type HttpRequestMatcher = {
+ protocol?: Matcher;
+ hostname?: Matcher;
+ port?: Matcher;
+ path?: Matcher;
+ query?: Record<string, Matcher> | Map<RegExp | string, Matcher>;
+ headers?: Record<string, Matcher> | Map<RegExp | string, Matcher>;
+ body?: Matcher;
+ method?: Matcher;
+ log?: boolean;
+};
+/**
+ * Supplied to test clients to assert correct requests.
+ * @internal
+ */
+export declare class TestHttpHandler implements HttpHandler {
+ readonly matcher: HttpRequestMatcher;
+ private static WATCHER;
+ private originalSend?;
+ private originalRequestHandler?;
+ private client?;
+ private assertions;
+ constructor(matcher: HttpRequestMatcher);
+ /**
+ * @param client - to watch for requests.
+ * @param matcher - optional override of this instance's matchers.
+ *
+ * Temporarily hooks the client.send call to check the outgoing request.
+ */
+ watch(client: Client<any, any, any>, matcher?: HttpRequestMatcher): void;
+ /**
+ * @throws TestHttpHandlerSuccess to indicate success (only way to control it).
+ * @throws Error any other exception to indicate failure.
+ */
+ handle(request: HttpRequest, handlerOptions?: HttpHandlerOptions): Promise<RequestHandlerOutput<HttpResponse>>;
+ destroy(): Promise<void>;
+ private check;
+ private checkAll;
+}
+/**
+ * This is used as an interrupt signal for success.
+ * It does not indicate a true error.
+ *
+ * @internal
+ */
+export declare class TestHttpHandlerSuccess extends Error {
+ static readonly ID: unique symbol;
+ readonly id: symbol;
+}
+/**
+ * @internal
+ */
+export declare const requireRequestsFrom: (client: Client<any, any, any>) => {
+ toMatch(matcher: HttpRequestMatcher): void;
+};