chore(deps): update aws-sdk v3 dependencies (#1848)

* restructuring to static imports as well since it doesn't impact bundling/perf much

Author: dphang

packages/libs/aws-common/package.json

@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/serverless-nextjs/serverless-next.js#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.35.0",
-    "@aws-sdk/client-sqs": "^3.35.0",
+    "@aws-sdk/client-s3": "^3.37.0",
+    "@aws-sdk/client-sqs": "^3.37.0",
     "@sls-next/core": "link:../core"
   },
   "devDependencies": {

packages/libs/aws-common/yarn.lock

@@ -68,8 +68,8 @@
     "typescript": "^4.4.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.35.0",
-    "@aws-sdk/client-sqs": "3.35.0",
+    "@aws-sdk/client-s3": "^3.37.0",
+    "@aws-sdk/client-sqs": "^3.37.0",
     "@sls-next/aws-common": "link:../aws-common",
     "@sls-next/core": "link:../core",
     "@vercel/nft": "^0.16.1",

packages/libs/lambda-at-edge/package.json

@@ -51,6 +51,7 @@ import { triggerStaticRegeneration } from "./lib/triggerStaticRegeneration";
 import { s3StorePage } from "./s3/s3StorePage";
 import { createRedirectResponse } from "@sls-next/core/dist/module/route/redirect";
 import { redirect } from "@sls-next/core/dist/module/handle/redirect";
+import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
 
 const basePath = RoutesManifestJson.basePath;
 
@@ -423,9 +424,6 @@ const handleOriginResponse = async ({
     return await responsePromise;
   }
 
-  // Lazily import only S3Client to reduce init times until actually needed
-  const { S3Client } = await import("@aws-sdk/client-s3/src/S3Client");
-
   const s3 = new S3Client({
     region: request.origin?.s3?.region,
     maxAttempts: 3
@@ -436,9 +434,6 @@ const handleOriginResponse = async ({
   if (fallbackRoute.isStatic) {
     const file = fallbackRoute.file.slice("pages".length);
     const s3Key = `${s3BasePath}static-pages/${manifest.buildId}${file}`;
-    const { GetObjectCommand } = await import(
-      "@aws-sdk/client-s3/src/commands/GetObjectCommand"
-    );
     // S3 Body is stream per: https://github.com/aws/aws-sdk-js-v3/issues/1096
     const getStream = await import("get-stream");
 

packages/libs/lambda-at-edge/src/default-handler.ts

@@ -1,6 +1,7 @@
 import { s3BucketNameFromEventRequest } from "../s3/s3BucketNameFromEventRequest";
 import { RegenerationEvent } from "../types";
 import * as crypto from "crypto";
+import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
 
 interface TriggerStaticRegenerationOptions {
   request: AWSLambda.CloudFrontRequest;
@@ -27,12 +28,6 @@ export const triggerStaticRegeneration = async (
     throw new Error("Expected region to be defined");
   }
 
-  // Dynamic imports don't get treeshook so we need to import as deep as possible for only the code we need.
-  const { SQSClient } = await import("@aws-sdk/client-sqs/src/SQSClient");
-  const { SendMessageCommand } = await import(
-    "@aws-sdk/client-sqs/src/commands/SendMessageCommand"
-  );
-
   const sqs = new SQSClient({
     region,
     maxAttempts: 1

packages/libs/lambda-at-edge/src/lib/triggerStaticRegeneration.ts

@@ -13,6 +13,7 @@ import { Readable } from "stream";
 import { triggerStaticRegeneration } from "../lib/triggerStaticRegeneration";
 import { s3StorePage } from "../s3/s3StorePage";
 import { IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
+import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
 
 /**
  * This function is experimental to allow rendering static pages fully from the handler.
@@ -63,16 +64,11 @@ export const renderStaticPage = async ({
   }
 
   // Render response from S3
-  // Lazily import only S3Client to reduce init times until actually needed
-  const { S3Client } = await import("@aws-sdk/client-s3/src/S3Client");
   const s3 = new S3Client({
     region: request.origin?.s3?.region,
     maxAttempts: 3
   });
   const s3BasePath = basePath ? `${basePath.replace(/^\//, "")}/` : "";
-  const { GetObjectCommand } = await import(
-    "@aws-sdk/client-s3/src/commands/GetObjectCommand"
-  );
   // S3 Body is stream per: https://github.com/aws/aws-sdk-js-v3/issues/1096
   const getStream = await import("get-stream");
   const s3Params = {

packages/libs/lambda-at-edge/src/render/renderStaticPage.ts

@@ -1,3 +1,5 @@
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+
 interface S3StorePageOptions {
   basePath: string | undefined;
   uri: string;
@@ -19,8 +21,6 @@ interface S3StorePageOptions {
 export const s3StorePage = async (
   options: S3StorePageOptions
 ): Promise<{ cacheControl: string | undefined; expires: Date | undefined }> => {
-  const { S3Client } = await import("@aws-sdk/client-s3/src/S3Client");
-
   const s3 = new S3Client({
     region: options.region,
     maxAttempts: 3
@@ -61,9 +61,6 @@ export const s3StorePage = async (
     Expires: expires
   };
 
-  const { PutObjectCommand } = await import(
-    "@aws-sdk/client-s3/src/commands/PutObjectCommand"
-  );
   await Promise.all([
     s3.send(new PutObjectCommand(s3JsonParams)),
     s3.send(new PutObjectCommand(s3HtmlParams))

packages/libs/lambda-at-edge/src/s3/s3StorePage.ts

@@ -5,20 +5,13 @@ import {
   CloudFrontHeaders,
   CloudFrontResponse
 } from "aws-lambda";
-import { S3Client } from "@aws-sdk/client-s3/src/S3Client";
+import { S3Client } from "@aws-sdk/client-s3";
+import { jest } from "@jest/globals";
 
-jest.mock("@aws-sdk/client-s3/src/S3Client", () =>
+jest.mock("@aws-sdk/client-s3", () =>
   require("../mocks/s3/aws-sdk-s3-client.mock")
 );
 
-jest.mock("@aws-sdk/client-s3/src/commands/GetObjectCommand", () =>
-  require("../mocks/s3/aws-sdk-s3-client-get-object-command.mock")
-);
-
-jest.mock("@aws-sdk/client-s3/src/commands/PutObjectCommand", () =>
-  require("../mocks/s3/aws-sdk-s3-client-put-object-command.mock")
-);
-
 jest.mock(
   "../../src/manifest.json",
   () => require("./default-build-manifest-origin-response.json"),

packages/libs/lambda-at-edge/tests/default-handler/default-handler-origin-response.test.ts

@@ -5,20 +5,12 @@ import {
   CloudFrontHeaders,
   CloudFrontResponse
 } from "aws-lambda";
-import { S3Client } from "@aws-sdk/client-s3/src/S3Client";
+import { S3Client } from "@aws-sdk/client-s3";
 
-jest.mock("@aws-sdk/client-s3/src/S3Client", () =>
+jest.mock("@aws-sdk/client-s3", () =>
   require("../mocks/s3/aws-sdk-s3-client.mock")
 );
 
-jest.mock("@aws-sdk/client-s3/src/commands/GetObjectCommand", () =>
-  require("../mocks/s3/aws-sdk-s3-client-get-object-command.mock")
-);
-
-jest.mock("@aws-sdk/client-s3/src/commands/PutObjectCommand", () =>
-  require("../mocks/s3/aws-sdk-s3-client-put-object-command.mock")
-);
-
 jest.mock(
   "../../src/manifest.json",
   () => require("./default-build-manifest-origin-response.json"),

packages/libs/lambda-at-edge/tests/default-handler/default-handler-with-basepath-origin-response.test.ts

@@ -1,6 +1,7 @@
 import { Readable } from "stream";
+import { jest } from "@jest/globals";
 
-export const mockSend = jest.fn((input) => {
+export const mockSend = jest.fn((input: any) => {
   if (input.Command === "GetObjectCommand") {
     // Simulate fallback page cache control headers
     const isFallback = /\[.*]/.test(input.Key as string);
@@ -18,8 +19,35 @@ export const mockSend = jest.fn((input) => {
 });
 
 const MockS3Client = jest.fn(() => ({
-  constructor: () => {},
+  constructor: () => {
+    // intentionally empty
+  },
   send: mockSend
 }));
 
-export { MockS3Client as S3Client };
+// This mock makes it easier to unit test by returning params with the command name
+const MockGetObjectCommand = jest.fn((params: Record<string, string>) => {
+  return {
+    ...{
+      Command: "GetObjectCommand"
+    },
+    ...params
+  };
+});
+
+// This mock makes it easier to unit test by returning params with the command name
+const MockPutObjectCommand = jest.fn((params: any) => {
+  return {
+    ...{
+      Command: "PutObjectCommand"
+    },
+    ...params
+  };
+});
+
+export {
+  MockS3Client as S3Client,
+  MockGetObjectCommand as GetObjectCommand,
+  MockGetObjectCommand,
+  MockPutObjectCommand as PutObjectCommand
+};

packages/libs/lambda-at-edge/tests/mocks/s3/aws-sdk-s3-client.mock.ts

@@ -0,0 +1,18 @@
+import { jest } from "@jest/globals";
+
+const mockSend = jest.fn();
+const mockS3Client = jest.fn(() => ({
+  send: mockSend
+}));
+const mockGetObjectCommand = jest.fn();
+const mockPutObjectCommand = jest.fn();
+
+export {
+  mockS3Client as S3Client,
+  mockGetObjectCommand as GetObjectCommand,
+  mockPutObjectCommand as PutObjectCommand,
+  mockS3Client,
+  mockGetObjectCommand,
+  mockPutObjectCommand,
+  mockSend
+};

packages/libs/lambda-at-edge/tests/mocks/s3/aws-sdk-s3-client.mock2.ts

@@ -0,0 +1,11 @@
+import { jest } from "@jest/globals";
+
+const mockSQSClient = jest.fn();
+const mockSendMessageCommand = jest.fn();
+
+export {
+  mockSQSClient as SQSClient,
+  mockSendMessageCommand as SendMessageCommand,
+  mockSQSClient,
+  mockSendMessageCommand
+};

packages/libs/lambda-at-edge/tests/mocks/sqs/aws-sdk-sqs-client.mock.ts

@@ -1,17 +1,14 @@
 import { s3StorePage } from "../../src/s3/s3StorePage";
+import { jest } from "@jest/globals";
 
-const mockSend = jest.fn();
-const mockPutObjectCommand = jest.fn();
+import {
+  mockSend,
+  mockPutObjectCommand
+} from "../mocks/s3/aws-sdk-s3-client.mock2";
 
-jest.mock("@aws-sdk/client-s3/src/S3Client", () => ({
-  S3Client: jest.fn(() => ({
-    send: mockSend
-  }))
-}));
-
-jest.mock("@aws-sdk/client-s3/src/commands/PutObjectCommand", () => ({
-  PutObjectCommand: mockPutObjectCommand
-}));
+jest.mock("@aws-sdk/client-s3", () =>
+  require("../mocks/s3/aws-sdk-s3-client.mock2")
+);
 
 describe("S3StorePage Tests", () => {
   it.each`

packages/libs/lambda-at-edge/tests/s3/s3StorePage.test.ts

@@ -1,19 +1,17 @@
 import { triggerStaticRegeneration } from "../../src/lib/triggerStaticRegeneration";
+import {
+  mockSQSClient,
+  mockSendMessageCommand
+} from "../mocks/sqs/aws-sdk-sqs-client.mock";
 import { jest } from "@jest/globals";
 
+jest.mock("@aws-sdk/client-sqs", () =>
+  require("../mocks/sqs/aws-sdk-sqs-client.mock")
+);
+
 describe("triggerStaticRegeneration()", () => {
-  const mockSQSClient = jest.fn();
-  const mockSendMessageCommand = jest.fn();
   beforeEach(() => {
     mockSQSClient.mockReset();
-    jest.mock("@aws-sdk/client-sqs/src/SQSClient", () => ({
-      __esModule: true,
-      SQSClient: mockSQSClient
-    }));
-    jest.mock("@aws-sdk/client-sqs/src/commands/SendMessageCommand", () => ({
-      _esModule: true,
-      SendMessageCommand: mockSendMessageCommand
-    }));
   });
 
   const options = {