test: remove changesets calls from e2e tests

clients/client-cognito-identity/test/e2e/CognitoIdentity.e2e.spec.ts

@@ -1,6 +1,6 @@
 import { beforeAll, describe, expect, test as it } from "vitest";
 
-import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 import { CognitoIdentity } from "../../src/index";
 
 describe("@aws-sdk/client-cognito-identity", () => {
@@ -9,8 +9,8 @@ describe("@aws-sdk/client-cognito-identity", () => {
   let IdentityPoolId: string;
 
   beforeAll(async () => {
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
+    const e2eTestResourcesEnv = await getE2eTestResources();
+    Object.assign(process.env, e2eTestResourcesEnv);
 
     region = process?.env?.AWS_SMOKE_TEST_REGION as string;
     IdentityPoolId =
@@ -38,4 +38,4 @@ describe("@aws-sdk/client-cognito-identity", () => {
     expect(typeof getCredentialsResult.Credentials?.AccessKeyId).to.equal("string");
     expect(typeof getCredentialsResult.Credentials?.SecretKey).to.equal("string");
   });
-});
+}, 60_000);

clients/client-s3/test/e2e/S3.browser.e2e.spec.ts

@@ -4,10 +4,10 @@ import { FetchHttpHandler } from "@smithy/fetch-http-handler";
 import { Browser } from "happy-dom";
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, onTestFailed, test as it } from "vitest";
 
-import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
 import { getRuntimeConfig } from "../../src/runtimeConfig.browser";
 import { S3 as S3Impl, waitUntilObjectExists as waitUntilObjectExistsImpl } from "../browser-build/browser-s3-bundle";
 import { createBuffer } from "./helpers";
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 
 describe("@aws-sdk/client-s3", () => {
   let client: S3;
@@ -25,8 +25,8 @@ describe("@aws-sdk/client-s3", () => {
     const browser = new Browser();
     browser.settings.fetch.disableSameOriginPolicy = true;
 
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
+    const e2eTestResourcesEnv = await getE2eTestResources();
+    Object.assign(process.env, e2eTestResourcesEnv);
 
     region = process?.env?.AWS_SMOKE_TEST_REGION as string;
     Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;

clients/client-s3/test/e2e/S3.e2e.spec.ts

@@ -3,8 +3,8 @@ import "@aws-sdk/signature-v4-crt";
 import { ChecksumAlgorithm, S3 } from "@aws-sdk/client-s3";
 import { afterAll, afterEach, beforeAll, describe, expect, test as it } from "vitest";
 
-import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
 import { createBuffer } from "./helpers";
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 
 let Key = `${Date.now()}`;
 
@@ -15,8 +15,8 @@ describe("@aws-sdk/client-s3", () => {
   let mrapArn: string;
 
   beforeAll(async () => {
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
+    const e2eTestResourcesEnv = await getE2eTestResources();
+    Object.assign(process.env, e2eTestResourcesEnv);
 
     region = process?.env?.AWS_SMOKE_TEST_REGION as string;
     Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
@@ -247,4 +247,4 @@ describe("@aws-sdk/client-s3", () => {
       expect(result.Contents).toBeInstanceOf(Array);
     });
   });
-});
+}, 60_000);

clients/client-s3/test/e2e/s3-object-features.e2e.spec.ts

@@ -5,16 +5,16 @@ import { GetObjectCommand, PutObjectCommand, S3 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { afterAll, beforeAll, describe, expect, test as it } from "vitest";
 
-import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 
 describe("@aws-sdk/client-s3", () => {
   let client: S3;
   let Bucket: string;
   let region: string;
 
   beforeAll(async () => {
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
+    const e2eTestResourcesEnv = await getE2eTestResources();
+    Object.assign(process.env, e2eTestResourcesEnv);
 
     region = process?.env?.AWS_SMOKE_TEST_REGION as string;
     Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;

lib/lib-storage/src/lib-storage.e2e.spec.ts

@@ -1,11 +1,10 @@
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 import { ChecksumAlgorithm, S3 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { randomBytes } from "crypto";
 import { Readable } from "stream";
 import { afterAll, beforeAll, describe, expect, test as it } from "vitest";
 
-import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
-
 describe("@aws-sdk/lib-storage", () => {
   describe.each([undefined, "WHEN_REQUIRED", "WHEN_SUPPORTED"])(
     "requestChecksumCalculation: %s",
@@ -23,12 +22,11 @@ describe("@aws-sdk/lib-storage", () => {
         let dataString: string;
         let Bucket: string;
         let region: string;
-        let resourcesAvailable = false;
 
         beforeAll(async () => {
           try {
-            const integTestResourcesEnv = await getIntegTestResources();
-            Object.assign(process.env, integTestResourcesEnv);
+            const e2eTestResourcesEnv = await getE2eTestResources();
+            Object.assign(process.env, e2eTestResourcesEnv);
 
             region = process?.env?.AWS_SMOKE_TEST_REGION as string;
             Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;

packages/middleware-flexible-checksums/src/middleware-flexible-checksums.e2e.spec.ts

@@ -1,3 +1,4 @@
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 import { S3, UploadPartCommandOutput } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { FetchHttpHandler } from "@smithy/fetch-http-handler";
@@ -6,8 +7,6 @@ import { ChecksumStream, headStream } from "@smithy/util-stream";
 import { Readable } from "node:stream";
 import { beforeAll, describe, expect, test as it, vi } from "vitest";
 
-import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
-
 describe("S3 checksums", () => {
   let s3: S3;
   let s3_noChecksum: S3;
@@ -38,8 +37,8 @@ describe("S3 checksums", () => {
   }
 
   beforeAll(async () => {
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
+    const e2eTestResourcesEnv = await getE2eTestResources();
+    Object.assign(process.env, e2eTestResourcesEnv);
 
     region = process?.env?.AWS_SMOKE_TEST_REGION as string;
     Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
@@ -252,4 +251,4 @@ describe("S3 checksums", () => {
       await expect(checksumStream.getReader().closed).resolves.toBe(undefined);
     });
   });
-});
+}, 60_000);

packages/s3-presigned-post/src/createPresignedPost.e2e.spec.ts

@@ -3,98 +3,102 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test as i
 
 const FormData = require("form-data");
 
+import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
 import { createReadStream, existsSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";
 
-import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
 import { createPresignedPost } from "./createPresignedPost";
 
-describe(createPresignedPost.name, () => {
-  let Bucket: string;
-  let region: string;
-
-  beforeAll(async () => {
-    const integTestResourcesEnv = await getIntegTestResources();
-    Object.assign(process.env, integTestResourcesEnv);
-
-    region = process?.env?.AWS_SMOKE_TEST_REGION as string;
-    Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
-  });
-
-  it("should allow custom endpoints to be modified by endpoint resolution options", async () => {
-    const Key = "test-key";
-    {
-      const client = new S3({
-        region,
-        forcePathStyle: true,
-        endpoint: `https://s3.dualstack.${region}.amazonaws.com`,
-      });
-      const { url } = await createPresignedPost(client, { Bucket, Key });
-      expect(url).toBe(`https://s3.dualstack.${region}.amazonaws.com/${Bucket}`);
-    }
-    {
-      const client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
-      const { url } = await createPresignedPost(client, { Bucket, Key });
-      expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
-    }
-  });
-
-  describe("test with real bucket", () => {
-    let Key: string;
-    let client: S3;
-    let contents: string;
-    let fileLocation: string;
+describe(
+  createPresignedPost.name,
+  () => {
+    let Bucket: string;
+    let region: string;
 
     beforeAll(async () => {
-      Key = `aws-sdk-js-integration-test-s3-presigned-post-${Date.now()}.txt`;
-      contents = "Hello, world!";
-      fileLocation = join(__dirname, Key);
-      client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
+      const e2eTestResourcesEnv = await getE2eTestResources();
+      Object.assign(process.env, e2eTestResourcesEnv);
 
-      await client.headBucket({ Bucket });
-      writeFileSync(fileLocation, contents, "utf-8");
+      region = process?.env?.AWS_SMOKE_TEST_REGION as string;
+      Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
     });
 
-    afterAll(async () => {
-      if (existsSync(fileLocation)) {
-        rmSync(fileLocation);
+    it("should allow custom endpoints to be modified by endpoint resolution options", async () => {
+      const Key = "test-key";
+      {
+        const client = new S3({
+          region,
+          forcePathStyle: true,
+          endpoint: `https://s3.dualstack.${region}.amazonaws.com`,
+        });
+        const { url } = await createPresignedPost(client, { Bucket, Key });
+        expect(url).toBe(`https://s3.dualstack.${region}.amazonaws.com/${Bucket}`);
+      }
+      {
+        const client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
+        const { url } = await createPresignedPost(client, { Bucket, Key });
+        expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
       }
     });
 
-    beforeEach(async () => {
-      await client.deleteObject({ Bucket, Key });
-    });
+    describe("test with real bucket", () => {
+      let Key: string;
+      let client: S3;
+      let contents: string;
+      let fileLocation: string;
 
-    afterEach(async () => {
-      await client.deleteObject({ Bucket, Key });
-    });
+      beforeAll(async () => {
+        Key = `aws-sdk-js-integration-test-s3-presigned-post-${Date.now()}.txt`;
+        contents = "Hello, world!";
+        fileLocation = join(__dirname, Key);
+        client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
 
-    it("should put an object using a presigned post w/ custom endpoint", async () => {
-      const { url, fields } = await createPresignedPost(client, { Bucket, Key });
+        await client.headBucket({ Bucket });
+        writeFileSync(fileLocation, contents, "utf-8");
+      });
 
-      expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
+      afterAll(async () => {
+        if (existsSync(fileLocation)) {
+          rmSync(fileLocation);
+        }
+      });
 
-      const form = new FormData();
-      Object.entries(fields).forEach(([field, value]) => {
-        form.append(field, value);
+      beforeEach(async () => {
+        await client.deleteObject({ Bucket, Key });
       });
-      form.append("file", createReadStream(fileLocation));
 
-      const precheck = await client.getObject({ Bucket, Key }).catch((err) => err);
-      expect(precheck).toBeInstanceOf(NoSuchKey);
+      afterEach(async () => {
+        await client.deleteObject({ Bucket, Key });
+      });
 
-      const submit: { statusCode: number } = await new Promise((resolve, reject) => {
-        form.submit(url, (err: any, res: any) => {
-          if (err) reject(err);
-          resolve(res);
+      it("should put an object using a presigned post w/ custom endpoint", async () => {
+        const { url, fields } = await createPresignedPost(client, { Bucket, Key });
+
+        expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
+
+        const form = new FormData();
+        Object.entries(fields).forEach(([field, value]) => {
+          form.append(field, value);
         });
-      });
+        form.append("file", createReadStream(fileLocation));
 
-      expect(submit.statusCode).toBe(204);
+        const precheck = await client.getObject({ Bucket, Key }).catch((err) => err);
+        expect(precheck).toBeInstanceOf(NoSuchKey);
 
-      const check = await client.getObject({ Bucket, Key });
+        const submit: { statusCode: number } = await new Promise((resolve, reject) => {
+          form.submit(url, (err: any, res: any) => {
+            if (err) reject(err);
+            resolve(res);
+          });
+        });
 
-      expect(await check.Body?.transformToString()).toEqual(contents);
+        expect(submit.statusCode).toBe(204);
+
+        const check = await client.getObject({ Bucket, Key });
+
+        expect(await check.Body?.transformToString()).toEqual(contents);
+      });
     });
-  });
-});
+  },
+  60_000
+);

private/aws-util-test/package.json

@@ -20,6 +20,10 @@
   "sideEffects": false,
   "dependencies": {
     "@aws-sdk/aws-protocoltests-json": "*",
+    "@aws-sdk/client-cognito-identity": "*",
+    "@aws-sdk/client-s3": "*",
+    "@aws-sdk/client-s3-control": "*",
+    "@aws-sdk/client-sts": "*",
     "@smithy/protocol-http": "^5.2.1",
     "@smithy/shared-ini-file-loader": "^4.2.0",
     "@smithy/types": "^4.5.0",