From 38debdee88f0a78db1e66a5f4fc932d732cee522 Mon Sep 17 00:00:00 2001
From: George Fu <kuhe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:18:46 -0400
Subject: [PATCH] test: convert private packages to vitest (#6587)

* test: conversions to vitest

* fix: compilation fixes for clients

* test: private tests to vitest

* chore: update vitest script

* test: private packages to vitest

* test: there are no tests in echo service
---
 private/aws-client-api-test/jest.config.js    |  5 --
 private/aws-client-api-test/package.json      |  3 +-
 .../client-s3/ClientS3InterfaceTest.spec.ts   |  2 +
 .../vitest.config.js}                         |  1 +
 private/aws-client-retry-test/jest.config.js  |  5 --
 private/aws-client-retry-test/package.json    |  3 +-
 .../src/ClientRetryTest.spec.ts               |  3 +-
 .../aws-client-retry-test/vitest.config.js    | 10 +++
 private/aws-echo-service/jest.config.js       |  4 --
 private/aws-echo-service/package.json         |  3 +-
 .../middleware-apply-body-checksum.spec.ts    |  3 +-
 .../src/middleware-content-length.spec.ts     |  3 +-
 .../src/middleware-endpoint.spec.ts           |  3 +-
 .../src/middleware-retry.spec.ts              |  3 +-
 .../src/middleware-serde.spec.ts              |  3 +-
 .../src/util-stream.spec.ts                   |  3 +-
 private/aws-middleware-test/vitest.config.js  | 10 +++
 private/aws-protocoltests-ec2/README.md       |  2 +-
 private/aws-protocoltests-ec2/jest.config.js  |  5 --
 private/aws-protocoltests-ec2/package.json    |  3 +-
 .../aws-protocoltests-ec2/vitest.config.js    | 10 +++
 private/aws-protocoltests-json-10/README.md   |  2 +-
 .../aws-protocoltests-json-10/jest.config.js  |  5 --
 .../aws-protocoltests-json-10/package.json    |  3 +-
 .../vitest.config.js                          | 10 +++
 .../README.md                                 |  2 +-
 .../jest.config.js                            |  5 --
 .../package.json                              |  3 +-
 .../vitest.config.js                          | 10 +++
 private/aws-protocoltests-json/README.md      |  2 +-
 private/aws-protocoltests-json/jest.config.js |  5 --
 private/aws-protocoltests-json/package.json   |  3 +-
 .../aws-protocoltests-json/vitest.config.js   | 10 +++
 private/aws-protocoltests-query/README.md     |  2 +-
 .../aws-protocoltests-query/jest.config.js    |  5 --
 private/aws-protocoltests-query/package.json  |  3 +-
 .../aws-protocoltests-query/vitest.config.js  | 10 +++
 .../README.md                                 |  2 +-
 .../jest.config.js                            |  5 --
 .../package.json                              |  3 +-
 .../vitest.config.js                          | 10 +++
 .../README.md                                 |  2 +-
 .../jest.config.js                            |  5 --
 .../package.json                              |  3 +-
 .../vitest.config.js                          | 10 +++
 private/aws-protocoltests-restjson/README.md  |  2 +-
 .../aws-protocoltests-restjson/jest.config.js |  5 --
 .../aws-protocoltests-restjson/package.json   |  3 +-
 .../vitest.config.js                          | 10 +++
 private/aws-protocoltests-restxml/README.md   |  2 +-
 .../aws-protocoltests-restxml/jest.config.js  |  5 --
 .../aws-protocoltests-restxml/package.json    |  3 +-
 .../vitest.config.js                          | 10 +++
 .../jest.config.js                            |  5 --
 .../package.json                              |  3 +-
 .../vitest.config.js                          | 10 +++
 private/aws-restjson-server/vitest.config.js  | 10 +++
 .../vitest.config.js                          | 10 +++
 private/aws-util-test/package.json            |  4 +-
 .../src/clients/Weather.integ.spec.ts         |  3 +-
 .../requests/test-http-handler.integ.spec.ts  |  2 +-
 private/aws-util-test/vitest.config.integ.js  |  9 +++
 private/aws-util-test/vitest.config.integ.ts  |  2 +-
 private/weather/vite.config.js                |  8 ---
 scripts/validation/vitest-validation.js       | 65 ++++++++++++++-----
 vitest.config.integ.ts                        | 48 +-------------
 vitest.config.ts                              | 54 ++-------------
 67 files changed, 260 insertions(+), 220 deletions(-)
 delete mode 100644 private/aws-client-api-test/jest.config.js
 rename private/{aws-middleware-test/vitest.config.ts => aws-client-api-test/vitest.config.js} (91%)
 delete mode 100644 private/aws-client-retry-test/jest.config.js
 create mode 100644 private/aws-client-retry-test/vitest.config.js
 delete mode 100644 private/aws-echo-service/jest.config.js
 create mode 100644 private/aws-middleware-test/vitest.config.js
 delete mode 100644 private/aws-protocoltests-ec2/jest.config.js
 create mode 100644 private/aws-protocoltests-ec2/vitest.config.js
 delete mode 100644 private/aws-protocoltests-json-10/jest.config.js
 create mode 100644 private/aws-protocoltests-json-10/vitest.config.js
 delete mode 100644 private/aws-protocoltests-json-machinelearning/jest.config.js
 create mode 100644 private/aws-protocoltests-json-machinelearning/vitest.config.js
 delete mode 100644 private/aws-protocoltests-json/jest.config.js
 create mode 100644 private/aws-protocoltests-json/vitest.config.js
 delete mode 100644 private/aws-protocoltests-query/jest.config.js
 create mode 100644 private/aws-protocoltests-query/vitest.config.js
 delete mode 100644 private/aws-protocoltests-restjson-apigateway/jest.config.js
 create mode 100644 private/aws-protocoltests-restjson-apigateway/vitest.config.js
 delete mode 100644 private/aws-protocoltests-restjson-glacier/jest.config.js
 create mode 100644 private/aws-protocoltests-restjson-glacier/vitest.config.js
 delete mode 100644 private/aws-protocoltests-restjson/jest.config.js
 create mode 100644 private/aws-protocoltests-restjson/vitest.config.js
 delete mode 100644 private/aws-protocoltests-restxml/jest.config.js
 create mode 100644 private/aws-protocoltests-restxml/vitest.config.js
 delete mode 100644 private/aws-protocoltests-smithy-rpcv2-cbor/jest.config.js
 create mode 100644 private/aws-protocoltests-smithy-rpcv2-cbor/vitest.config.js
 create mode 100644 private/aws-restjson-server/vitest.config.js
 create mode 100644 private/aws-restjson-validation-server/vitest.config.js
 create mode 100644 private/aws-util-test/vitest.config.integ.js
 delete mode 100644 private/weather/vite.config.js

diff --git a/private/aws-client-api-test/jest.config.js b/private/aws-client-api-test/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-client-api-test/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-client-api-test/package.json b/private/aws-client-api-test/package.json
index febdd780cd11..1b99d2b05117 100644
--- a/private/aws-client-api-test/package.json
+++ b/private/aws-client-api-test/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
index 47c6f328f179..15b69ddacf70 100644
--- a/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
+++ b/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
@@ -1,3 +1,5 @@
+import { test as it, describe, expect } from "vitest";
+
 import { ClientS3InterfaceTest } from "./ClientS3InterfaceTest";
 import { RESOLVED_FIELDS } from "./RESOLVED_FIELDS";
 
diff --git a/private/aws-middleware-test/vitest.config.ts b/private/aws-client-api-test/vitest.config.js
similarity index 91%
rename from private/aws-middleware-test/vitest.config.ts
rename to private/aws-client-api-test/vitest.config.js
index 4e46707824a5..ff6aa0c5d1dc 100644
--- a/private/aws-middleware-test/vitest.config.ts
+++ b/private/aws-client-api-test/vitest.config.js
@@ -5,5 +5,6 @@ export default defineConfig({
     exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
     include: ["**/*.spec.ts"],
     environment: "node",
+    globals: true,
   },
 });
diff --git a/private/aws-client-retry-test/jest.config.js b/private/aws-client-retry-test/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-client-retry-test/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-client-retry-test/package.json b/private/aws-client-retry-test/package.json
index 154efbbca813..9f9ad2ac32d3 100644
--- a/private/aws-client-retry-test/package.json
+++ b/private/aws-client-retry-test/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-client-retry-test/src/ClientRetryTest.spec.ts b/private/aws-client-retry-test/src/ClientRetryTest.spec.ts
index 36646030ce3d..360e86b19680 100644
--- a/private/aws-client-retry-test/src/ClientRetryTest.spec.ts
+++ b/private/aws-client-retry-test/src/ClientRetryTest.spec.ts
@@ -3,6 +3,7 @@ import { HttpHandler, HttpResponse } from "@smithy/protocol-http";
 import { AwsCredentialIdentity, RequestHandlerOutput } from "@smithy/types";
 import { ConfiguredRetryStrategy, StandardRetryStrategy } from "@smithy/util-retry";
 import { Readable } from "stream";
+import { describe, expect, test as it, vi } from "vitest";
 
 const MOCK_REGION = "us-west-2";
 
@@ -64,7 +65,7 @@ describe("util-retry integration tests", () => {
   });
 
   it("should retry until success", async () => {
-    const mockHandle = jest
+    const mockHandle = vi
       .fn()
       .mockResolvedValueOnce(mockThrottled)
       .mockResolvedValueOnce(mockThrottled)
diff --git a/private/aws-client-retry-test/vitest.config.js b/private/aws-client-retry-test/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-client-retry-test/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-echo-service/jest.config.js b/private/aws-echo-service/jest.config.js
deleted file mode 100644
index 02eed352c6a8..000000000000
--- a/private/aws-echo-service/jest.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  preset: "ts-jest",
-  testMatch: ["**/*.spec.ts", "!**/*.browser.spec.ts", "!**/*.integ.spec.ts"],
-};
diff --git a/private/aws-echo-service/package.json b/private/aws-echo-service/package.json
index 609a44addc57..46c9e607a4ab 100644
--- a/private/aws-echo-service/package.json
+++ b/private/aws-echo-service/package.json
@@ -9,8 +9,7 @@
     "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"
+    "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts b/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts
index 859ec9cf31dc..6b8ee965e9c3 100644
--- a/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts
+++ b/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts
@@ -1,5 +1,6 @@
+import { test as it, describe, expect } from "vitest";
+
 import { S3Control } from "@aws-sdk/client-s3-control";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../aws-util-test/src";
 
diff --git a/private/aws-middleware-test/src/middleware-content-length.spec.ts b/private/aws-middleware-test/src/middleware-content-length.spec.ts
index 1ac77a156a81..2c9d73db112b 100644
--- a/private/aws-middleware-test/src/middleware-content-length.spec.ts
+++ b/private/aws-middleware-test/src/middleware-content-length.spec.ts
@@ -1,7 +1,8 @@
+import { test as it, describe, expect } from "vitest";
+
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
 import { S3 } from "@aws-sdk/client-s3";
 import { XRay } from "@aws-sdk/client-xray";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../../private/aws-util-test/src";
 
diff --git a/private/aws-middleware-test/src/middleware-endpoint.spec.ts b/private/aws-middleware-test/src/middleware-endpoint.spec.ts
index 6550d1c6d387..c3b504b8da6e 100644
--- a/private/aws-middleware-test/src/middleware-endpoint.spec.ts
+++ b/private/aws-middleware-test/src/middleware-endpoint.spec.ts
@@ -1,6 +1,7 @@
+import { test as it, describe, expect } from "vitest";
+
 import { S3 } from "@aws-sdk/client-s3";
 import { S3Control } from "@aws-sdk/client-s3-control";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../aws-util-test/src";
 
diff --git a/private/aws-middleware-test/src/middleware-retry.spec.ts b/private/aws-middleware-test/src/middleware-retry.spec.ts
index 9e8a649cf0fa..83e13baf61bf 100644
--- a/private/aws-middleware-test/src/middleware-retry.spec.ts
+++ b/private/aws-middleware-test/src/middleware-retry.spec.ts
@@ -1,5 +1,6 @@
+import { test as it, describe, expect } from "vitest";
+
 import { Lambda } from "@aws-sdk/client-lambda";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../aws-util-test/src";
 
diff --git a/private/aws-middleware-test/src/middleware-serde.spec.ts b/private/aws-middleware-test/src/middleware-serde.spec.ts
index 7e86611c7462..89c5e26fcbc1 100644
--- a/private/aws-middleware-test/src/middleware-serde.spec.ts
+++ b/private/aws-middleware-test/src/middleware-serde.spec.ts
@@ -1,8 +1,9 @@
+import { test as it, describe } from "vitest";
+
 import { EC2 } from "@aws-sdk/client-ec2";
 import { S3 } from "@aws-sdk/client-s3";
 import { SageMaker } from "@aws-sdk/client-sagemaker";
 import { SageMakerRuntime } from "@aws-sdk/client-sagemaker-runtime";
-import { describe, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../aws-util-test/src";
 
diff --git a/private/aws-middleware-test/src/util-stream.spec.ts b/private/aws-middleware-test/src/util-stream.spec.ts
index dd22adc04365..a069a53c7d87 100644
--- a/private/aws-middleware-test/src/util-stream.spec.ts
+++ b/private/aws-middleware-test/src/util-stream.spec.ts
@@ -1,10 +1,11 @@
+import { test as it, describe, expect } from "vitest";
+
 import { Lambda } from "@aws-sdk/client-lambda";
 import { HttpHandler, HttpResponse } from "@smithy/protocol-http";
 import { HttpRequest as IHttpRequest } from "@smithy/types";
 import { Uint8ArrayBlobAdapter } from "@smithy/util-stream";
 import { fromUtf8 } from "@smithy/util-utf8";
 import { Readable } from "stream";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../../aws-util-test/src";
 
diff --git a/private/aws-middleware-test/vitest.config.js b/private/aws-middleware-test/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-middleware-test/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-ec2/README.md b/private/aws-protocoltests-ec2/README.md
index 3c07dc393b70..841f34598a71 100644
--- a/private/aws-protocoltests-ec2/README.md
+++ b/private/aws-protocoltests-ec2/README.md
@@ -10,7 +10,7 @@ An EC2 query service that sends query requests and XML responses.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-ec2
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-ec2
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-ec2`
diff --git a/private/aws-protocoltests-ec2/jest.config.js b/private/aws-protocoltests-ec2/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-ec2/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-ec2/package.json b/private/aws-protocoltests-ec2/package.json
index e093414ba553..910437031538 100644
--- a/private/aws-protocoltests-ec2/package.json
+++ b/private/aws-protocoltests-ec2/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-ec2/vitest.config.js b/private/aws-protocoltests-ec2/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-ec2/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-json-10/README.md b/private/aws-protocoltests-json-10/README.md
index 55b8aa2a8bec..4874e1b28230 100644
--- a/private/aws-protocoltests-json-10/README.md
+++ b/private/aws-protocoltests-json-10/README.md
@@ -8,7 +8,7 @@ AWS SDK for JavaScript JSONRPC10 Client for Node.js, Browser and React Native.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-json-10
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-json-10
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-json-10`
diff --git a/private/aws-protocoltests-json-10/jest.config.js b/private/aws-protocoltests-json-10/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-json-10/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-json-10/package.json b/private/aws-protocoltests-json-10/package.json
index ecdab0ed238d..524a27bafab5 100644
--- a/private/aws-protocoltests-json-10/package.json
+++ b/private/aws-protocoltests-json-10/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-json-10/vitest.config.js b/private/aws-protocoltests-json-10/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-json-10/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-json-machinelearning/README.md b/private/aws-protocoltests-json-machinelearning/README.md
index d93414ba55aa..773412afd67c 100644
--- a/private/aws-protocoltests-json-machinelearning/README.md
+++ b/private/aws-protocoltests-json-machinelearning/README.md
@@ -8,7 +8,7 @@ AWS SDK for JavaScript MachineLearning Client for Node.js, Browser and React Nat
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-json-machinelearning
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-json-machinelearning
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-json-machinelearning`
diff --git a/private/aws-protocoltests-json-machinelearning/jest.config.js b/private/aws-protocoltests-json-machinelearning/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-json-machinelearning/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-json-machinelearning/package.json b/private/aws-protocoltests-json-machinelearning/package.json
index 1dda3565683d..21ee34c02ae8 100644
--- a/private/aws-protocoltests-json-machinelearning/package.json
+++ b/private/aws-protocoltests-json-machinelearning/package.json
@@ -10,7 +10,8 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
-    "test": "jest --coverage --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-json-machinelearning/vitest.config.js b/private/aws-protocoltests-json-machinelearning/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-json-machinelearning/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-json/README.md b/private/aws-protocoltests-json/README.md
index e368b774d5bc..644b1b26febf 100644
--- a/private/aws-protocoltests-json/README.md
+++ b/private/aws-protocoltests-json/README.md
@@ -8,7 +8,7 @@ AWS SDK for JavaScript JsonProtocol Client for Node.js, Browser and React Native
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-json
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-json
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-json`
diff --git a/private/aws-protocoltests-json/jest.config.js b/private/aws-protocoltests-json/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-json/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-json/package.json b/private/aws-protocoltests-json/package.json
index e6d46469fc1c..d63587d1a3bd 100644
--- a/private/aws-protocoltests-json/package.json
+++ b/private/aws-protocoltests-json/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-json/vitest.config.js b/private/aws-protocoltests-json/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-json/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-query/README.md b/private/aws-protocoltests-query/README.md
index accf4dc7a0a2..4ca387b9c72c 100644
--- a/private/aws-protocoltests-query/README.md
+++ b/private/aws-protocoltests-query/README.md
@@ -10,7 +10,7 @@ A query service that sends query requests and XML responses.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-query
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-query
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-query`
diff --git a/private/aws-protocoltests-query/jest.config.js b/private/aws-protocoltests-query/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-query/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-query/package.json b/private/aws-protocoltests-query/package.json
index a9dd53d8932b..376a87d851b7 100644
--- a/private/aws-protocoltests-query/package.json
+++ b/private/aws-protocoltests-query/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-query/vitest.config.js b/private/aws-protocoltests-query/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-query/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-restjson-apigateway/README.md b/private/aws-protocoltests-restjson-apigateway/README.md
index 462c44ccc49d..1ff8ac66fef5 100644
--- a/private/aws-protocoltests-restjson-apigateway/README.md
+++ b/private/aws-protocoltests-restjson-apigateway/README.md
@@ -8,7 +8,7 @@ AWS SDK for JavaScript APIGateway Client for Node.js, Browser and React Native.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-restjson-apigateway
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-restjson-apigateway
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-restjson-apigateway`
diff --git a/private/aws-protocoltests-restjson-apigateway/jest.config.js b/private/aws-protocoltests-restjson-apigateway/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-restjson-apigateway/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-restjson-apigateway/package.json b/private/aws-protocoltests-restjson-apigateway/package.json
index 2b7ff3e171a6..3d89bbee1de4 100644
--- a/private/aws-protocoltests-restjson-apigateway/package.json
+++ b/private/aws-protocoltests-restjson-apigateway/package.json
@@ -10,7 +10,8 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
-    "test": "jest --coverage --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-restjson-apigateway/vitest.config.js b/private/aws-protocoltests-restjson-apigateway/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-restjson-apigateway/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-restjson-glacier/README.md b/private/aws-protocoltests-restjson-glacier/README.md
index c3cffadee423..809483bae145 100644
--- a/private/aws-protocoltests-restjson-glacier/README.md
+++ b/private/aws-protocoltests-restjson-glacier/README.md
@@ -8,7 +8,7 @@ AWS SDK for JavaScript Glacier Client for Node.js, Browser and React Native.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-restjson-glacier
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-restjson-glacier
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-restjson-glacier`
diff --git a/private/aws-protocoltests-restjson-glacier/jest.config.js b/private/aws-protocoltests-restjson-glacier/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-restjson-glacier/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-restjson-glacier/package.json b/private/aws-protocoltests-restjson-glacier/package.json
index 2d787e810057..5ba954b25d13 100644
--- a/private/aws-protocoltests-restjson-glacier/package.json
+++ b/private/aws-protocoltests-restjson-glacier/package.json
@@ -10,7 +10,8 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
-    "test": "jest --coverage --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-restjson-glacier/vitest.config.js b/private/aws-protocoltests-restjson-glacier/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-restjson-glacier/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-restjson/README.md b/private/aws-protocoltests-restjson/README.md
index 780eafefec81..0ea9096f28d5 100644
--- a/private/aws-protocoltests-restjson/README.md
+++ b/private/aws-protocoltests-restjson/README.md
@@ -10,7 +10,7 @@ A REST JSON service that sends JSON requests and responses.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-restjson
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-restjson
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-restjson`
diff --git a/private/aws-protocoltests-restjson/jest.config.js b/private/aws-protocoltests-restjson/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-restjson/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-restjson/package.json b/private/aws-protocoltests-restjson/package.json
index 45470412986c..36409c3dafa2 100644
--- a/private/aws-protocoltests-restjson/package.json
+++ b/private/aws-protocoltests-restjson/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-restjson/vitest.config.js b/private/aws-protocoltests-restjson/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-restjson/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-restxml/README.md b/private/aws-protocoltests-restxml/README.md
index 897b4eec89a6..dc72ab39fefe 100644
--- a/private/aws-protocoltests-restxml/README.md
+++ b/private/aws-protocoltests-restxml/README.md
@@ -10,7 +10,7 @@ A REST XML service that sends XML requests and responses.
 
 ## Installing
 
-To install the this package, simply type add or install @aws-sdk/aws-protocoltests-restxml
+To install this package, simply type add or install @aws-sdk/aws-protocoltests-restxml
 using your favorite package manager:
 
 - `npm install @aws-sdk/aws-protocoltests-restxml`
diff --git a/private/aws-protocoltests-restxml/jest.config.js b/private/aws-protocoltests-restxml/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-restxml/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-restxml/package.json b/private/aws-protocoltests-restxml/package.json
index 5a8b1b6b9da7..b237b1d296ca 100644
--- a/private/aws-protocoltests-restxml/package.json
+++ b/private/aws-protocoltests-restxml/package.json
@@ -10,7 +10,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 --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-restxml/vitest.config.js b/private/aws-protocoltests-restxml/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-restxml/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-protocoltests-smithy-rpcv2-cbor/jest.config.js b/private/aws-protocoltests-smithy-rpcv2-cbor/jest.config.js
deleted file mode 100644
index a8d1c2e49912..000000000000
--- a/private/aws-protocoltests-smithy-rpcv2-cbor/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const base = require("../../jest.config.base.js");
-
-module.exports = {
-  ...base,
-};
diff --git a/private/aws-protocoltests-smithy-rpcv2-cbor/package.json b/private/aws-protocoltests-smithy-rpcv2-cbor/package.json
index 3ed6faff9597..03861480ca5e 100644
--- a/private/aws-protocoltests-smithy-rpcv2-cbor/package.json
+++ b/private/aws-protocoltests-smithy-rpcv2-cbor/package.json
@@ -10,7 +10,8 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
-    "test": "jest --coverage --passWithNoTests"
+    "test": "vitest run",
+    "test:watch": "vitest watch"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-protocoltests-smithy-rpcv2-cbor/vitest.config.js b/private/aws-protocoltests-smithy-rpcv2-cbor/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-protocoltests-smithy-rpcv2-cbor/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-restjson-server/vitest.config.js b/private/aws-restjson-server/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-restjson-server/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-restjson-validation-server/vitest.config.js b/private/aws-restjson-validation-server/vitest.config.js
new file mode 100644
index 000000000000..ff6aa0c5d1dc
--- /dev/null
+++ b/private/aws-restjson-validation-server/vitest.config.js
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+    include: ["**/*.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-util-test/package.json b/private/aws-util-test/package.json
index cf76bb7187b9..8a45076395e1 100644
--- a/private/aws-util-test/package.json
+++ b/private/aws-util-test/package.json
@@ -10,8 +10,8 @@
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "prepack": "yarn run clean && yarn run build",
-    "test:integration": "vitest run -c vitest.config.integ.ts",
-    "test:integration:watch": "vitest watch -c vitest.config.integ.ts"
+    "test:integration": "vitest run -c vitest.config.integ.js",
+    "test:integration:watch": "vitest watch -c vitest.config.integ.js"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",
diff --git a/private/aws-util-test/src/clients/Weather.integ.spec.ts b/private/aws-util-test/src/clients/Weather.integ.spec.ts
index 4df5afaea2a6..2efeb8bcdd95 100644
--- a/private/aws-util-test/src/clients/Weather.integ.spec.ts
+++ b/private/aws-util-test/src/clients/Weather.integ.spec.ts
@@ -1,5 +1,6 @@
+import { test as it, describe, expect } from "vitest";
+
 import { Weather } from "@aws-sdk/weather";
-import { describe, expect, test as it } from "vitest";
 
 import { requireRequestsFrom } from "../requests/test-http-handler";
 
diff --git a/private/aws-util-test/src/requests/test-http-handler.integ.spec.ts b/private/aws-util-test/src/requests/test-http-handler.integ.spec.ts
index 85d8a8697da8..9c7f54f5bafe 100644
--- a/private/aws-util-test/src/requests/test-http-handler.integ.spec.ts
+++ b/private/aws-util-test/src/requests/test-http-handler.integ.spec.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test as it } from "vitest";
+import { test as it, describe, expect } from "vitest";
 
 // import { JsonProtocol } from "@aws-sdk/aws-protocoltests-json";
 // CI has difficult importing a named private client from the workspace.
diff --git a/private/aws-util-test/vitest.config.integ.js b/private/aws-util-test/vitest.config.integ.js
new file mode 100644
index 000000000000..5f2f9bbda2c4
--- /dev/null
+++ b/private/aws-util-test/vitest.config.integ.js
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["**/*.integ.spec.ts"],
+    environment: "node",
+    globals: true,
+  },
+});
diff --git a/private/aws-util-test/vitest.config.integ.ts b/private/aws-util-test/vitest.config.integ.ts
index 5802db1ac64a..35e2b17c4f3d 100644
--- a/private/aws-util-test/vitest.config.integ.ts
+++ b/private/aws-util-test/vitest.config.integ.ts
@@ -2,7 +2,7 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    include: ["**/*.integ.spec.ts"],
+    include: ["**/*.integ.spec.{ts,js}"],
     environment: "node",
   },
 });
diff --git a/private/weather/vite.config.js b/private/weather/vite.config.js
deleted file mode 100644
index e7147d3ac9e1..000000000000
--- a/private/weather/vite.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  test: {
-    include: ["**/*.spec.ts"],
-    globals: true,
-  },
-});
diff --git a/scripts/validation/vitest-validation.js b/scripts/validation/vitest-validation.js
index 7ae496de613a..13c98f974176 100644
--- a/scripts/validation/vitest-validation.js
+++ b/scripts/validation/vitest-validation.js
@@ -7,7 +7,6 @@ const paths = [
   // path.join(__dirname, "..", "..", "clients", "client-s3"),
   // path.join(__dirname, "..", "..", "clients", "client-sts"),
   // path.join(__dirname, "..", "..", "clients", "client-transcribe-streaming"),
-
   // path.join(__dirname, "..", "..", "lib", "lib-dynamodb"),
   // path.join(__dirname, "..", "..", "lib", "lib-storage"),
   // path.join(__dirname, "..", "..", "packages", "body-checksum-browser"),
@@ -27,7 +26,6 @@ const paths = [
   // path.join(__dirname, "..", "..", "packages", "ec2-metadata-service"),
   // path.join(__dirname, "..", "..", "packages", "endpoint-cache"),
   // path.join(__dirname, "..", "..", "packages", "eventstream-handler-node"),
-
   // path.join(__dirname, "..", "..", "packages", "middleware-api-key"),
   // path.join(__dirname, "..", "..", "packages", "middleware-bucket-endpoint"),
   // path.join(__dirname, "..", "..", "packages", "middleware-endpoint-discovery"),
@@ -54,59 +52,86 @@ const paths = [
   // path.join(__dirname, "..", "..", "packages", "middleware-token"),
   // path.join(__dirname, "..", "..", "packages", "middleware-user-agent"),
   // path.join(__dirname, "..", "..", "packages", "middleware-websocket"),
-
   // path.join(__dirname, "..", "..", "packages", "s3-presigned-post"),
-
-  // path.join(__dirname, "..", "..", "private", "aws-middleware-test"),
+  path.join(__dirname, "..", "..", "private", "aws-middleware-test"),
   path.join(__dirname, "..", "..", "private", "aws-util-test"),
+  path.join(__dirname, "..", "..", "private", "aws-client-api-test"),
+  path.join(__dirname, "..", "..", "private", "aws-client-retry-test"),
+  path.join(__dirname, "..", "..", "private", "aws-echo-service"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-ec2"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-json"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-json-10"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-json-machinelearning"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-query"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-restjson"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-restjson-apigateway"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-restjson-glacier"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-restxml"),
+  path.join(__dirname, "..", "..", "private", "aws-protocoltests-smithy-rpcv2-cbor"),
+  path.join(__dirname, "..", "..", "private", "aws-restjson-server"),
+  path.join(__dirname, "..", "..", "private", "aws-restjson-validation-server"),
 ];
 
 (async () => {
   for (const folder of paths) {
     const pkgJson = require(path.join(folder, "package.json"));
+    const isPrivate = folder.includes("/private/");
+    let configExtension = "ts";
+    if (folder.includes("/private/")) {
+      configExtension = "js";
+    }
 
     if (pkgJson.scripts.test) {
-      if (pkgJson.scripts.test.includes("jest")) {
+      if (fs.existsSync(path.join(folder, "jest.config.js"))) {
+        fs.rmSync(path.join(folder, "jest.config.js"));
+      }
+
+      if (pkgJson.scripts.test.includes("jest") || pkgJson.scripts.test.includes("vitest")) {
         console.log("setting unit test to vitest");
 
         pkgJson.scripts.test = "vitest run";
         pkgJson.scripts["test:watch"] = "vitest watch";
-        fs.rmSync(path.join(folder, "jest.config.js"));
         fs.writeFileSync(
-          path.join(folder, "vitest.config.ts"),
+          path.join(folder, `vitest.config.${configExtension}`),
           `import { defineConfig } from "vitest/config";
 
   export default defineConfig({
     test: {
-      exclude: ["**/*.{integ,e2e,browser}.spec.{ts,js}"],
-      include: ["**/*.spec.{ts,js}"],
+      exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
+      include: ["**/*.spec.ts"],
       environment: "node",
+      ${isPrivate ? "globals: true,\n" : ""}
     },
   });
   `
         );
       } else if (pkgJson.scripts.test.includes("vitest")) {
-        pkgJson.scripts["test:watch"] ??= "vitest watch --passWithNot";
+        pkgJson.scripts["test:watch"] ??= "vitest watch --passWithNoTests";
       }
     }
 
     for (const testType of ["integ", "e2e"]) {
       const script = testType === "integ" ? "integration" : testType;
+      if (fs.existsSync(path.join(folder, `jest.config.${testType}.js`))) {
+        fs.rmSync(path.join(folder, `jest.config.${testType}.js`));
+      }
       if (pkgJson.scripts[`test:${script}`]) {
-        pkgJson.scripts[`test:${script}:watch`] = `vitest watch -c vitest.config.${testType}.ts`;
-        if (pkgJson.scripts[`test:${script}`].includes("jest")) {
+        pkgJson.scripts[`test:${script}:watch`] = `vitest watch -c vitest.config.${testType}.${configExtension}`;
+        if (
+          pkgJson.scripts[`test:${script}`].includes("jest") ||
+          pkgJson.scripts[`test:${script}`].includes("vitest")
+        ) {
           console.log(`setting ${testType} test to vitest`);
-
-          pkgJson.scripts[`test:${script}`] = `vitest run -c vitest.config.${testType}.ts`;
-          fs.rmSync(path.join(folder, `jest.config.${testType}.js`));
+          pkgJson.scripts[`test:${script}`] = `vitest run -c vitest.config.${testType}.${configExtension}`;
           fs.writeFileSync(
-            path.join(folder, `vitest.config.${testType}.ts`),
+            path.join(folder, `vitest.config.${testType}.${configExtension}`),
             `import { defineConfig } from "vitest/config";
 
     export default defineConfig({
       test: {
-        include: ["**/*.${testType}.spec.{ts,js}"],
+        include: ["**/*.${testType}.spec.ts"],
         environment: "node",
+        ${isPrivate ? "globals: true,\n" : ""}
       },
     });
     `
@@ -117,6 +142,10 @@ const paths = [
 
     fs.writeFileSync(path.join(folder, "package.json"), JSON.stringify(pkgJson, null, 2) + "\n");
 
+    if (isPrivate) {
+      continue;
+    }
+
     for await (const file of walk(path.join(folder))) {
       if (file.endsWith(".spec.ts")) {
         let contents = fs.readFileSync(file, "utf-8");
diff --git a/vitest.config.integ.ts b/vitest.config.integ.ts
index f24eb5805243..cdec52abaf64 100644
--- a/vitest.config.integ.ts
+++ b/vitest.config.integ.ts
@@ -3,53 +3,7 @@ import { defineConfig } from "vitest/config";
 export default defineConfig({
   test: {
     exclude: ["**/*.{e2e,browser}.spec.ts"],
-    include: [
-      "lib/lib-dynamodb/**/*.integ.spec.ts",
-      "lib/lib-storage/**/*.integ.spec.ts",
-      // "packages/body-checksum-browser/**/*.integ.spec.ts",
-      "packages/body-checksum-node/**/*.integ.spec.ts",
-      "packages/chunked-stream-reader-node/**/*.integ.spec.ts",
-      "packages/cloudfront-signer/**/*.integ.spec.ts",
-      "packages/core/**/*.integ.spec.ts",
-      "packages/credential-provider-cognito-identity/**/*.integ.spec.ts",
-      "packages/credential-provider-env/**/*.integ.spec.ts",
-      "packages/credential-provider-http/**/*.integ.spec.ts",
-      "packages/credential-provider-ini/**/*.integ.spec.ts",
-      // "packages/credential-provider-node/**/*.integ.spec.ts",
-      "packages/credential-provider-process/**/*.integ.spec.ts",
-      "packages/credential-provider-sso/**/*.integ.spec.ts",
-      "packages/credential-provider-web-identity/**/*.integ.spec.ts",
-      "packages/credential-providers/**/*.integ.spec.ts",
-      "packages/ec2-metadata-service/**/*.integ.spec.ts",
-      "packages/endpoint-cache/**/*.integ.spec.ts",
-      "packages/eventstream-handler-node/**/*.integ.spec.ts",
-      "packages/middleware-api-key/**/*.integ.spec.ts",
-      "packages/middleware-bucket-endpoint/**/*.integ.spec.ts",
-      "packages/middleware-endpoint-discovery/**/*.integ.spec.ts",
-      "packages/middleware-eventstream/**/*.integ.spec.ts",
-      "packages/middleware-expect-continue/**/*.integ.spec.ts",
-      "packages/middleware-flexible-checksums/**/*.integ.spec.ts",
-      "packages/middleware-host-header/**/*.integ.spec.ts",
-      "packages/middleware-location-constraint/**/*.integ.spec.ts",
-      "packages/middleware-logger/**/*.integ.spec.ts",
-      "packages/middleware-recursion-detection/**/*.integ.spec.ts",
-      "packages/middleware-sdk-api-gateway/**/*.integ.spec.ts",
-      "packages/middleware-sdk-ec2/**/*.integ.spec.ts",
-      "packages/middleware-sdk-glacier/**/*.integ.spec.ts",
-      "packages/middleware-sdk-machinelearning/**/*.integ.spec.ts",
-      "packages/middleware-sdk-rds/**/*.integ.spec.ts",
-      "packages/middleware-sdk-route53/**/*.integ.spec.ts",
-      "packages/middleware-sdk-s3/**/*.integ.spec.ts",
-      "packages/middleware-sdk-s3-control/**/*.integ.spec.ts",
-      "packages/middleware-sdk-sqs/**/*.integ.spec.ts",
-      "packages/middleware-sdk-sts/**/*.integ.spec.ts",
-      "packages/middleware-sdk-transcribe-streaming/**/*.integ.spec.ts",
-      "packages/middleware-signing/**/*.integ.spec.ts",
-      "packages/middleware-ssec/**/*.integ.spec.ts",
-      "packages/middleware-token/**/*.integ.spec.ts",
-      "packages/middleware-user-agent/**/*.integ.spec.ts",
-      "packages/middleware-websocket/**/*.integ.spec.ts",
-    ],
+    include: ["{clients,lib,packages,private}/**/*.integ.spec.ts"],
     environment: "node",
   },
 });
diff --git a/vitest.config.ts b/vitest.config.ts
index 0e34a11c1215..e35b9249e821 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,55 +2,13 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    exclude: ["**/*.{integ,e2e,browser}.spec.ts"],
-    include: [
-      "clients/client-*/**/*.spec.ts",
-      "lib/lib-dynamodb/**/*.spec.ts",
-      "lib/lib-storage/**/*.spec.ts",
-      // "packages/body-checksum-browser/**/*.spec.ts",
-      "packages/body-checksum-node/**/*.spec.ts",
-      "packages/chunked-stream-reader-node/**/*.spec.ts",
-      "packages/cloudfront-signer/**/*.spec.ts",
-      "packages/core/**/*.spec.ts",
-      "packages/credential-provider-cognito-identity/**/*.spec.ts",
-      "packages/credential-provider-env/**/*.spec.ts",
-      "packages/credential-provider-http/**/*.spec.ts",
-      "packages/credential-provider-ini/**/*.spec.ts",
-      "packages/credential-provider-node/**/*.spec.ts",
-      "packages/credential-provider-process/**/*.spec.ts",
-      "packages/credential-provider-sso/**/*.spec.ts",
-      "packages/credential-provider-web-identity/**/*.spec.ts",
-      "packages/credential-providers/**/*.spec.ts",
-      "packages/ec2-metadata-service/**/*.spec.ts",
-      "packages/endpoint-cache/**/*.spec.ts",
-      "packages/eventstream-handler-node/**/*.spec.ts",
-      "packages/middleware-api-key/**/*.spec.ts",
-      "packages/middleware-bucket-endpoint/**/*.spec.ts",
-      "packages/middleware-endpoint-discovery/**/*.spec.ts",
-      "packages/middleware-eventstream/**/*.spec.ts",
-      "packages/middleware-expect-continue/**/*.spec.ts",
-      "packages/middleware-flexible-checksums/**/*.spec.ts",
-      "packages/middleware-host-header/**/*.spec.ts",
-      "packages/middleware-location-constraint/**/*.spec.ts",
-      "packages/middleware-logger/**/*.spec.ts",
-      "packages/middleware-recursion-detection/**/*.spec.ts",
-      "packages/middleware-sdk-api-gateway/**/*.spec.ts",
-      "packages/middleware-sdk-ec2/**/*.spec.ts",
-      "packages/middleware-sdk-glacier/**/*.spec.ts",
-      "packages/middleware-sdk-machinelearning/**/*.spec.ts",
-      "packages/middleware-sdk-rds/**/*.spec.ts",
-      "packages/middleware-sdk-route53/**/*.spec.ts",
-      "packages/middleware-sdk-s3/**/*.spec.ts",
-      "packages/middleware-sdk-s3-control/**/*.spec.ts",
-      "packages/middleware-sdk-sqs/**/*.spec.ts",
-      "packages/middleware-sdk-sts/**/*.spec.ts",
-      "packages/middleware-sdk-transcribe-streaming/**/*.spec.ts",
-      "packages/middleware-signing/**/*.spec.ts",
-      "packages/middleware-ssec/**/*.spec.ts",
-      "packages/middleware-token/**/*.spec.ts",
-      "packages/middleware-user-agent/**/*.spec.ts",
-      // "packages/middleware-websocket/**/*.spec.ts",
+    exclude: [
+      "**/*.{integ,e2e,browser}.spec.ts",
+      "private/aws-restjson-server/**/*.spec.ts",
+      "private/aws-restjson-validation-server/**/*.spec.ts",
     ],
+    include: ["clients/client-*/**/*.spec.ts", "lib/**/*.spec.ts", "packages/**/*.spec.ts", "private/**/*.spec.ts"],
     environment: "node",
+    globals: true,
   },
 });