refactor: e2es and anything else that remains (#14236)

* refactor: e2e-core

* refactor: e2e tests aside from resource clean up

* refactor: cleanup scripts

* fix: run sequentially

* fix: sequential

* chore: adjust node config

* refactor: remove aws.js file, update category-hosting

* refactor: amplify-container-hosting

* refactor: dynamodb scan

* chore: remove dynamo-scan-v2

* chore: remove deps on v2

* chore: dedupe

* Revert "chore: adjust node config"

This reverts commit b9a0472.

* Revert "fix: sequential"

This reverts commit 921f45e.

* Revert "fix: run sequentially"

This reverts commit 65d79de.

* chore: increase node space

* chore: increase node space

* fix: double pinpoint

* chore: debug

* fix: bucket endpoint

* fix: run clean up sequentially, layer2, debugging custom-resource

* fix: balance between squential and parallel

* fix: updating cleanup script, parallelism, missing cloudformation config

* fix: credentials fallback

* chore: remove unused import

* fix: string

* fix: replace build with buildID to take up less memory

* chore: final adjustments

* chore: remove global-gc

* chore: upgrade sdk v3 packages

* fix: adjust package versions

---------

Co-authored-by: Vieltojarvi <[email protected]>
Co-authored-by: aws-amplify-bot <[email protected]>

Author: 3 people

packages/amplify-category-hosting/__tests__/lib/S3AndCloudFront/helpers/cloudfront-manager.test.js

@@ -62,23 +62,19 @@ describe('cloudfront-manager', () => {
 
   const mockcftInvalidationData = {};
 
-  const mockInvalidateMethod = jest.fn(() => {
-    return {
-      promise: () => Promise.resolve(mockcftInvalidationData),
-    };
-  });
+  const mockSendMethod = jest.fn(() => Promise.resolve(mockcftInvalidationData));
 
-  class mockCloudFront {
+  class mockCloudFrontClient {
     constructor() {
-      this.createInvalidation = mockInvalidateMethod;
+      this.send = mockSendMethod;
     }
   }
 
   test('invalidateCloudFront', async () => {
-    const mockCloudFrontClient = async (context, action) => Promise.resolve(new mockCloudFront());
-    const result = await cloudFrontManager.invalidateCloudFront(mockContext, mockCloudFrontClient);
+    const mockCloudFrontClientFactory = async (context, action) => Promise.resolve(new mockCloudFrontClient());
+    const result = await cloudFrontManager.invalidateCloudFront(mockContext, mockCloudFrontClientFactory);
     expect(result).toBe(mockContext);
-    expect(mockInvalidateMethod).toBeCalled();
+    expect(mockSendMethod).toBeCalled();
     expect(mockContext.exeInfo.cftInvalidationData).toEqual(mockcftInvalidationData);
   });
 });

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/cloudfront-manager.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk');
 const constants = require('../../constants');
-const CloudFront = require('aws-sdk/clients/cloudfront');
+const { CloudFrontClient, CreateInvalidationCommand } = require('@aws-sdk/client-cloudfront');
 
 const providerName = 'awscloudformation';
 
@@ -28,7 +28,8 @@ async function invalidate(context, cloudFrontClient = getCloudFrontClient) {
     };
 
     try {
-      const data = await cloudFront.createInvalidation(invalidateParams).promise();
+      const command = new CreateInvalidationCommand(invalidateParams);
+      const data = await cloudFront.send(command);
       context.print.info('CloudFront invalidation request sent successfuly.');
       context.print.info(chalk.green(CloudFrontSecureURL));
       context.exeInfo.cftInvalidationData = data;
@@ -45,7 +46,7 @@ async function getCloudFrontClient(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new CloudFront(config);
+  return new CloudFrontClient(config);
 }
 
 module.exports = {

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/file-uploader.js

@@ -3,7 +3,7 @@ const sequential = require('promise-sequential');
 const fileScanner = require('./file-scanner');
 const constants = require('../../constants');
 const { uploadFile } = require('./upload-file');
-const S3 = require('aws-sdk/clients/s3');
+const { S3Client } = require('@aws-sdk/client-s3');
 
 const serviceName = 'S3AndCloudFront';
 const providerName = 'awscloudformation';
@@ -43,7 +43,7 @@ async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new S3(config);
+  return new S3Client(config);
 }
 
 function getHostingBucketName(context) {

packages/amplify-category-hosting/lib/S3AndCloudFront/helpers/upload-file.js

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const mime = require('mime-types');
+const { Upload } = require('@aws-sdk/lib-storage');
 
 async function uploadFile(s3Client, hostingBucketName, distributionDirPath, filePath, hasCloudFront) {
   let relativeFilePath = path.relative(distributionDirPath, filePath);
@@ -19,7 +20,12 @@ async function uploadFile(s3Client, hostingBucketName, distributionDirPath, file
     uploadParams.ACL = 'public-read';
   }
 
-  const data = await s3Client.upload(uploadParams).promise();
+  const upload = new Upload({
+    client: s3Client,
+    params: uploadParams,
+  });
+
+  const data = await upload.done();
 
   return data;
 }

packages/amplify-category-hosting/package.json

@@ -23,7 +23,9 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.3",
     "@aws-amplify/amplify-prompts": "2.8.7",
-    "aws-sdk": "^2.1692.0",
+    "@aws-sdk/client-cloudfront": "^3.919.0",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/lib-storage": "^3.919.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "mime-types": "^2.1.26",

packages/amplify-category-notifications/package.json

@@ -31,7 +31,7 @@
     "@aws-amplify/amplify-prompts": "2.8.7",
     "@aws-amplify/amplify-provider-awscloudformation": "8.11.14",
     "@aws-sdk/client-iam": "^3.919.0",
-    "@aws-sdk/client-pinpoint": "^3.919.0",
+    "@aws-sdk/client-pinpoint": "3.901.0",
     "@smithy/node-http-handler": "^4.4.3",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-console-hosting/package.json

@@ -12,7 +12,6 @@
     "@aws-sdk/client-amplify": "^3.919.0",
     "@aws-sdk/client-s3": "^3.919.0",
     "archiver": "^7.0.1",
-    "aws-sdk": "^2.1692.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
     "execa": "^5.1.1",

packages/amplify-container-hosting/package.json

@@ -29,6 +29,8 @@
     "@aws-amplify/amplify-category-api": "^5.15.1",
     "@aws-amplify/amplify-cli-core": "4.4.3",
     "@aws-amplify/amplify-environment-parameters": "1.9.22",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/lib-storage": "^3.919.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "mime-types": "^2.1.26",

packages/amplify-container-hosting/src/lib/ElasticContainer/file-uploader.js

@@ -1,13 +1,14 @@
 const fs = require('fs-extra');
 const mime = require('mime-types');
 const constants = require('../constants');
-const S3 = require('aws-sdk/clients/s3');
+const { S3Client } = require('@aws-sdk/client-s3');
+const { Upload } = require('@aws-sdk/lib-storage');
 
 export async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[constants.providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new S3(config);
+  return new S3Client(config);
 }
 
 export async function uploadFile(s3Client, bucketName, filePath, fileKey) {
@@ -20,7 +21,12 @@ export async function uploadFile(s3Client, bucketName, filePath, fileKey) {
     ContentType: contentType || 'text/plain',
   };
 
-  const data = await s3Client.upload(uploadParams).promise();
+  const upload = new Upload({
+    client: s3Client,
+    params: uploadParams,
+  });
+
+  const data = await upload.done();
 
   return data;
 }

packages/amplify-e2e-core/package.json

@@ -23,13 +23,30 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.3",
-    "@aws-sdk/client-pinpoint": "^3.919.0",
+    "@aws-sdk/client-amplifybackend": "^3.919.0",
+    "@aws-sdk/client-amplifyuibuilder": "^3.919.0",
+    "@aws-sdk/client-appsync": "^3.919.0",
+    "@aws-sdk/client-cloudformation": "^3.919.0",
+    "@aws-sdk/client-cloudwatch-events": "^3.919.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.919.0",
+    "@aws-sdk/client-cognito-identity": "^3.919.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.919.0",
+    "@aws-sdk/client-dynamodb": "^3.919.0",
+    "@aws-sdk/client-iam": "^3.919.0",
+    "@aws-sdk/client-kinesis": "^3.919.0",
+    "@aws-sdk/client-lambda": "^3.919.0",
+    "@aws-sdk/client-lex-model-building-service": "^3.919.0",
+    "@aws-sdk/client-location": "^3.919.0",
+    "@aws-sdk/client-pinpoint": "3.901.0",
+    "@aws-sdk/client-rekognition": "^3.919.0",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/client-ssm": "^3.919.0",
     "@aws-sdk/client-sts": "^3.919.0",
     "@aws-sdk/credential-providers": "^3.919.0",
+    "@aws-sdk/lib-dynamodb": "^3.919.0",
     "amplify-headless-interface": "1.17.8",
     "aws-amplify": "^5.3.16",
     "aws-appsync": "^4.1.1",
-    "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "dotenv": "^8.2.0",
     "execa": "^5.1.1",