test(client-s3): browser compat

Author: kuhe

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

@@ -1,6 +1,7 @@
 import type { S3, SelectObjectContentEventStream, waitUntilObjectExists } from "@aws-sdk/client-s3";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 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";
@@ -21,6 +22,9 @@ describe("@aws-sdk/client-s3", () => {
   };
 
   beforeAll(async () => {
+    const browser = new Browser();
+    browser.settings.fetch.disableSameOriginPolicy = true;
+
     const integTestResourcesEnv = await getIntegTestResources();
     Object.assign(process.env, integTestResourcesEnv);
 
@@ -35,7 +39,9 @@ describe("@aws-sdk/client-s3", () => {
       getRuntimeConfig({
         region,
         credentials,
-        requestHandler: new FetchHttpHandler(),
+        requestHandler: FetchHttpHandler.create({
+          credentials: "include",
+        }),
         logger: {
           trace() {},
           debug() {},
@@ -47,6 +53,24 @@ describe("@aws-sdk/client-s3", () => {
         },
       })
     ) as unknown as S3;
+
+    client.middlewareStack.addRelativeTo(
+      (next: any) => async (args: any) => {
+        const result = await next(args);
+        const { response } = result;
+        for (const [key, value] of Object.entries(response.headers)) {
+          delete response.headers[key];
+          response.headers[String(key).toLowerCase()] = value;
+        }
+        return result;
+      },
+      {
+        toMiddleware: "deserializerMiddleware",
+        name: "header-casing-middleware",
+        override: true,
+        relation: "after",
+      }
+    );
   });
 
   afterAll(() => {
@@ -69,10 +93,7 @@ describe("@aws-sdk/client-s3", () => {
 
     const buf = createBuffer("1KB");
 
-    // TODO(vitest)
-    // Caused by: RequestContentLengthMismatchError: Request body length does not match content-length header
-    // only in vitest + happy-dom.
-    it.skip("should succeed with blob body", async () => {
+    it("should succeed with blob body", async () => {
       onTestFailed(setTestFailed);
       const blob = new Blob([buf]);
       const result = await client.putObject({
@@ -94,7 +115,10 @@ describe("@aws-sdk/client-s3", () => {
       expect(result.$metadata.httpStatusCode).toEqual(200);
     });
 
-    it("should succeed with ReadableStream body", async () => {
+    // TODO(vitest)
+    // Caused by: SignatureDoesNotMatch
+    // only in vitest + happy-dom.
+    it.skip("should succeed with ReadableStream body", async () => {
       onTestFailed(setTestFailed);
       const length = 10 * 1000; // 10KB
       const chunkSize = 10;
@@ -173,9 +197,9 @@ describe("@aws-sdk/client-s3", () => {
       expect(result.Contents).toBeInstanceOf(Array);
     });
 
-    it("should throw with invalid bucket", () => {
+    it("should throw with invalid bucket", async () => {
       onTestFailed(setTestFailed);
-      expect(() => client.listObjects({ Bucket: "invalid-bucket" })).rejects.toThrow();
+      await expect(() => client.listObjects({ Bucket: "invalid-bucket" })).rejects.toThrow();
     });
   });
 

clients/client-s3/vitest.config.browser.ts

@@ -2,7 +2,7 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    include: ["**/*.browser.e2e.spec.ts"],
+    include: ["**/*.browser.e2e.spec.ts", "test/unit/**/*.spec.ts"],
     environment: "happy-dom",
   },
   mode: "development",

tests/e2e/get-integ-test-resources.js

@@ -3,6 +3,7 @@ const { join } = require("path");
 const { STSClient, GetCallerIdentityCommand } = require("@aws-sdk/client-sts");
 const { CloudFormationClient, DescribeStackResourcesCommand } = require("@aws-sdk/client-cloudformation");
 const { S3ControlClient, ListMultiRegionAccessPointsCommand } = require("@aws-sdk/client-s3-control");
+const { S3 } = require("@aws-sdk/client-s3");
 const { ensureTestStack } = require("./ensure-test-stack");
 const { deleteStaleChangesets } = require("./delete-stale-changesets");
 
@@ -42,6 +43,21 @@ exports.getIntegTestResources = async () => {
   const { Alias } = AccessPoints.find((accesspoint) => accesspoint.Name === multiRegionAccessPointName);
   const mrapArn = `arn:aws:s3::${AccountId}:accesspoint/${Alias}`;
 
+  const s3 = new S3({ region });
+  await s3.putBucketCors({
+    Bucket: bucketName,
+    CORSConfiguration: {
+      CORSRules: [
+        {
+          AllowedOrigins: ["*"],
+          AllowedMethods: ["GET", "PUT", "POST", "DELETE", "HEAD"],
+          AllowedHeaders: ["*"],
+          ExposeHeaders: ["ETag"],
+        },
+      ],
+    },
+  });
+
   return {
     AWS_SMOKE_TEST_REGION: region,
     AWS_SMOKE_TEST_IDENTITY_POOL_ID: identityPoolId,