Bundle locally available AWS SDK packages by default (#1691)

Kamil Sobol · web-flow · commit 0200d111e0dd · 2024-06-27T12:15:04.000-07:00
* Bundle locally available AWS SDK packages by default

* bump CDK to required minimum

* bump CDK to required minimum
diff --git a/.changeset/red-wasps-promise.md b/.changeset/red-wasps-promise.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-function': minor
+---
+
+Bundle locally available AWS SDK packages by default
diff --git a/.changeset/ten-masks-change.md b/.changeset/ten-masks-change.md
@@ -0,0 +1,14 @@
+---
+'@aws-amplify/backend-output-storage': patch
+'@aws-amplify/backend-deployer': patch
+'@aws-amplify/backend-function': patch
+'@aws-amplify/backend-storage': patch
+'@aws-amplify/auth-construct': patch
+'@aws-amplify/backend-auth': patch
+'@aws-amplify/backend-data': patch
+'@aws-amplify/plugin-types': patch
+'@aws-amplify/backend': patch
+'@aws-amplify/sandbox': patch
+---
+
+Bump baseline CDK version to 2.132.0 to support AWS SDK bundling
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/auth-construct/package.json b/packages/auth-construct/package.json
@@ -24,7 +24,7 @@
     "@aws-sdk/util-arn-parser": "^3.465.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }
diff --git a/packages/backend-auth/package.json b/packages/backend-auth/package.json
@@ -27,7 +27,7 @@
     "@aws-amplify/platform-core": "^1.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }
diff --git a/packages/backend-data/package.json b/packages/backend-data/package.json
@@ -23,7 +23,7 @@
     "@aws-amplify/platform-core": "^1.0.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   },
   "dependencies": {
diff --git a/packages/backend-deployer/package.json b/packages/backend-deployer/package.json
@@ -24,7 +24,7 @@
     "tsx": "^4.6.1"
   },
   "peerDependencies": {
-    "aws-cdk": "^2.127.0",
+    "aws-cdk": "^2.132.0",
     "typescript": "^5.0.0"
   }
 }
diff --git a/packages/backend-function/package.json b/packages/backend-function/package.json
@@ -31,7 +31,7 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }
diff --git a/packages/backend-function/src/factory.ts b/packages/backend-function/src/factory.ts
@@ -306,6 +306,7 @@ class AmplifyFunction
         bundling: {
           format: OutputFormat.ESM,
           banner: bannerCode,
+          bundleAwsSDK: true,
           inject: shims,
           loader: {
             '.node': 'file',
diff --git a/packages/backend-output-storage/package.json b/packages/backend-output-storage/package.json
@@ -23,6 +23,6 @@
     "@aws-amplify/platform-core": "^1.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0"
+    "aws-cdk-lib": "^2.132.0"
   }
 }
diff --git a/packages/backend-platform-test-stubs/package.json b/packages/backend-platform-test-stubs/package.json
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }
diff --git a/packages/backend-storage/package.json b/packages/backend-storage/package.json
@@ -27,7 +27,7 @@
     "@aws-amplify/platform-core": "^1.0.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -39,7 +39,7 @@
     "lodash.snakecase": "^4.1.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -13,6 +13,7 @@
     "@aws-amplify/platform-core": "^1.0.1",
     "@aws-sdk/client-accessanalyzer": "^3.465.0",
     "@aws-sdk/client-amplify": "^3.465.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.602.0",
     "@aws-sdk/client-cloudformation": "^3.465.0",
     "@aws-sdk/client-cognito-identity": "^3.465.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.465.0",
@@ -24,7 +25,7 @@
     "@smithy/shared-ini-file-loader": "^2.2.5",
     "aws-amplify": "^6.0.16",
     "aws-appsync-auth-link": "^3.0.7",
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0",
     "execa": "^8.0.1",
     "fs-extra": "^11.1.1",
diff --git a/packages/integration-tests/src/test-in-memory/data_storage_auth_with_triggers.test.ts b/packages/integration-tests/src/test-in-memory/data_storage_auth_with_triggers.test.ts
@@ -52,6 +52,7 @@ void it('data storage auth with triggers', () => {
   assertExpectedLogicalIds(templates.defaultNodeFunc, 'AWS::Lambda::Function', [
     'defaultNodeFunctionlambda5C194062',
     'echoFunclambdaE17DCA46',
+    'funcWithAwsSdklambda5F770AD7',
     'funcWithSsmlambda6A8824A1',
     'handler2lambda1B9C7EFF',
     'node16Functionlambda97ECC775',
diff --git a/packages/integration-tests/src/test-project-setup/data_storage_auth_with_triggers.ts b/packages/integration-tests/src/test-project-setup/data_storage_auth_with_triggers.ts
@@ -200,9 +200,16 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
       (name) => name.includes('funcWithSsm')
     );
 
+    const funcWithAwsSdk = await this.resourceFinder.findByBackendIdentifier(
+      backendId,
+      'AWS::Lambda::Function',
+      (name) => name.includes('funcWithAwsSdk')
+    );
+
     assert.equal(defaultNodeLambda.length, 1);
     assert.equal(node16Lambda.length, 1);
     assert.equal(funcWithSsm.length, 1);
+    assert.equal(funcWithAwsSdk.length, 1);
 
     const expectedResponse = {
       s3TestContent: 'this is some test content',
@@ -214,6 +221,7 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
     await this.checkLambdaResponse(defaultNodeLambda[0], expectedResponse);
     await this.checkLambdaResponse(node16Lambda[0], expectedResponse);
     await this.checkLambdaResponse(funcWithSsm[0], 'It is working');
+    await this.checkLambdaResponse(funcWithAwsSdk[0], 'It is working');
 
     const bucketName = await this.resourceFinder.findByBackendIdentifier(
       backendId,
diff --git a/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/func-src/handler_with_aws_sdk.ts b/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/func-src/handler_with_aws_sdk.ts
@@ -0,0 +1,26 @@
+// Import handful of SDKs we're using in tests.
+import {
+  BedrockRuntimeClient,
+  ConverseCommand,
+} from '@aws-sdk/client-bedrock-runtime';
+import { CloudFormationClient } from '@aws-sdk/client-cloudformation';
+import { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity';
+import { IAMClient } from '@aws-sdk/client-iam';
+import { S3Client } from '@aws-sdk/client-s3';
+
+/**
+ * This function asserts that customer can import and use AWS SDK packages.
+ * I.e. asserts that the bundling AWS SDK does break functions.
+ */
+export const handler = async () => {
+  new BedrockRuntimeClient();
+  new ConverseCommand({
+    messages: [],
+    modelId: 'testModel',
+  });
+  new CloudFormationClient();
+  new CognitoIdentityClient();
+  new IAMClient();
+  new S3Client();
+  return 'It is working';
+};
diff --git a/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/function.ts b/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/function.ts
@@ -39,3 +39,8 @@ export const funcWithSsm = defineFunction({
   name: 'funcWithSsm',
   entry: './func-src/handler_with_ssm.ts',
 });
+
+export const funcWithAwsSdk = defineFunction({
+  name: 'funcWithAwsSdk',
+  entry: './func-src/handler_with_aws_sdk.ts',
+});
diff --git a/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/test_factories.ts b/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/test_factories.ts
@@ -1,5 +1,10 @@
 import { data } from './data/resource.js';
-import { defaultNodeFunc, funcWithSsm, node16Func } from './function.js';
+import {
+  defaultNodeFunc,
+  funcWithSsm,
+  funcWithAwsSdk,
+  node16Func,
+} from './function.js';
 import { storage } from './storage/resource.js';
 import { auth } from './auth/resource.js';
 
@@ -10,4 +15,5 @@ export const dataStorageAuthWithTriggers = {
   data,
   node16Func,
   funcWithSsm,
+  funcWithAwsSdk,
 };
diff --git a/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/hotswap-update-files/function.ts b/packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/hotswap-update-files/function.ts
@@ -41,3 +41,8 @@ export const funcWithSsm = defineFunction({
   name: 'funcWithSsm',
   entry: './func-src/handler_with_ssm.ts',
 });
+
+export const funcWithAwsSdk = defineFunction({
+  name: 'funcWithAwsSdk',
+  entry: './func-src/handler_with_aws_sdk.ts',
+});
diff --git a/packages/plugin-types/package.json b/packages/plugin-types/package.json
@@ -11,7 +11,7 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0",
     "@aws-sdk/types": "^3.465.0"
   },
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -39,6 +39,6 @@
     "@types/parse-gitignore": "^1.0.0"
   },
   "peerDependencies": {
-    "aws-cdk": "^2.127.0"
+    "aws-cdk": "^2.132.0"
   }
 }
diff --git a/templates/construct/package.json b/templates/construct/package.json
@@ -18,7 +18,7 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.127.0",
+    "aws-cdk-lib": "^2.132.0",
     "constructs": "^10.0.0"
   }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@aws-amplify/backend-function': minor
 +---
++
 +Bundle locally available AWS SDK packages by default
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"@aws-sdk/util-arn-parser": "^3.465.0"`
`25`	`25`	`},`
`26`	`26`	`"peerDependencies": {`
`27`		`- "aws-cdk-lib": "^2.127.0",`
	`27`	`+ "aws-cdk-lib": "^2.132.0",`
`28`	`28`	`"constructs": "^10.0.0"`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"@aws-amplify/platform-core": "^1.0.0"`
`28`	`28`	`},`
`29`	`29`	`"peerDependencies": {`
`30`		`- "aws-cdk-lib": "^2.127.0",`
	`30`	`+ "aws-cdk-lib": "^2.132.0",`
`31`	`31`	`"constructs": "^10.0.0"`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"uuid": "^9.0.1"`
`32`	`32`	`},`
`33`	`33`	`"peerDependencies": {`
`34`		`- "aws-cdk-lib": "^2.127.0",`
	`34`	`+ "aws-cdk-lib": "^2.132.0",`
`35`	`35`	`"constructs": "^10.0.0"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`"@aws-amplify/platform-core": "^1.0.0"`
`24`	`24`	`},`
`25`	`25`	`"peerDependencies": {`
`26`		`- "aws-cdk-lib": "^2.127.0"`
	`26`	`+ "aws-cdk-lib": "^2.132.0"`
`27`	`27`	`}`
`28`	`28`	`}`