Revert problematic PRs (#4803)

* feat(amplify-provider-awscloudformation): add region ca-central-1

* fix test

* Revert "Add region ca-central-1 (#4796)"

This reverts commit af29f35.

* Revert "feat: add check for extra command line args provided with amplify delete (#4576)"

This reverts commit 48b27b7.

* Revert "perf: fulfill promises to upload files to S3 concurrently (#4575)"

This reverts commit 9fbee8a.

* Revert "fix(cli): remove unnecessary stack trace log when adding services (#4610)"

This reverts commit 56efb32.

* Revert "fix test"

This reverts commit 50a8073fbbdb56931191912938fb50f542197832.

Co-authored-by: UnleashedMind <zhoweimi@186590ce137f.ant.amazon.com>

packages/amplify-category-analytics/index.js

@@ -78,6 +78,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-api/index.js

@@ -22,7 +22,7 @@ async function migrate(context, serviceName) {
             if (providerController) {
               if (!serviceName || serviceName === amplifyMeta[category][resourceName].service) {
                 migrateResourcePromises.push(
-                  providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName),
+                  providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName)
                 );
               }
             }
@@ -149,7 +149,7 @@ async function getPermissionPolicies(context, resourceOpsMapping) {
           context,
           amplifyMeta[category][resourceName].service,
           resourceName,
-          resourceOpsMapping[resourceName],
+          resourceOpsMapping[resourceName]
         );
         permissionPolicies.push(policy);
         resourceAttributes.push({ resourceName, attributes, category });
@@ -171,6 +171,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-auth/index.js

@@ -307,6 +307,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-auth/provider-utils/awscloudformation/utils/trigger-file-uploader.js

@@ -2,6 +2,7 @@ const { readdirSync, existsSync } = require('fs');
 const { createReadStream } = require('fs-extra');
 const Ora = require('ora');
 const mime = require('mime-types');
+const sequential = require('promise-sequential');
 const { getAuthResourceName } = require('../../../utils/getAuthResourceName');
 
 const providerName = 'awscloudformation';
@@ -29,12 +30,15 @@ async function uploadFiles(context) {
       return null;
     }
     const fileList = readdirSync(assetPath);
-    const uploadFileTasks = fileList.map((file) => uploadFile(s3Client, bucketName, `${assetPath}/${file}`, file));
+    const uploadFileTasks = [];
+    fileList.forEach(file => {
+      uploadFileTasks.push(async () => await uploadFile(s3Client, bucketName, `${assetPath}/${file}`, file));
+    });
 
     const spinner = new Ora('Uploading files...');
     try {
       spinner.start();
-      await Promise.all(uploadFileTasks);
+      await sequential(uploadFileTasks);
       spinner.succeed('Uploaded files successfully.');
     } catch (e) {
       spinner.fail('Error has occurred during file upload.');

packages/amplify-category-function/src/index.ts

@@ -163,6 +163,7 @@ export async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

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

@@ -2,6 +2,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const Ora = require('ora');
 const mime = require('mime-types');
+const sequential = require('promise-sequential');
 const fileScanner = require('./file-scanner');
 const constants = require('../../constants');
 
@@ -14,6 +15,7 @@ async function run(context, distributionDirPath) {
   const { output } = context.exeInfo.amplifyMeta[category][serviceName];
   const fileList = fileScanner.scan(context, distributionDirPath, WebsiteConfiguration);
 
+  const uploadFileTasks = [];
   const s3Client = await getS3Client(context, 'update');
   const hostingBucketName = getHostingBucketName(context);
 
@@ -25,14 +27,14 @@ async function run(context, distributionDirPath) {
     cloudFrontS3CanonicalUserId = originAccessIdentity.S3CanonicalUserId;
   }
 
-  const uploadFileTasks = fileList.map((filePath) =>
-    uploadFile(s3Client, hostingBucketName, distributionDirPath, filePath, cloudFrontS3CanonicalUserId)
-  );
+  fileList.forEach(filePath => {
+    uploadFileTasks.push(() => uploadFile(s3Client, hostingBucketName, distributionDirPath, filePath, cloudFrontS3CanonicalUserId));
+  });
 
   const spinner = new Ora('Uploading files...');
   try {
     spinner.start();
-    await Promise.all(uploadFileTasks);
+    await sequential(uploadFileTasks);
     spinner.succeed('Uploaded files successfully.');
   } catch (e) {
     spinner.fail('Error has occurred during file upload.');

packages/amplify-category-interactions/index.js

@@ -12,7 +12,7 @@ async function migrate(context) {
           const providerController = require(`./provider-utils/${amplifyMeta[category][resourceName].providerPlugin}/index`);
           if (providerController) {
             migrateResourcePromises.push(
-              providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName),
+              providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName)
             );
           } else {
             context.print.error(`Provider not configured for ${category}: ${resourceName}`);
@@ -42,7 +42,7 @@ async function getPermissionPolicies(context, resourceOpsMapping) {
           context,
           amplifyMeta[category][resourceName].service,
           resourceName,
-          resourceOpsMapping[resourceName],
+          resourceOpsMapping[resourceName]
         );
         permissionPolicies.push(policy);
         resourceAttributes.push({ resourceName, attributes, category });
@@ -64,6 +64,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-notifications/index.js

@@ -27,6 +27,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-predictions/commands/predictions/remove.js

@@ -68,7 +68,7 @@ module.exports = {
         }
       })
       .catch(err => {
-        context.print.error(err.message);
+        context.print.info(err.stack);
         context.print.error('An error occurred when removing the predictions resource');
         context.usageData.emitError(err);
       });

packages/amplify-category-predictions/index.js

@@ -62,6 +62,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-storage/index.js

@@ -29,7 +29,7 @@ async function migrate(context) {
           const providerController = require(`./provider-utils/${amplifyMeta[category][resourceName].providerPlugin}/index`);
           if (providerController) {
             migrateResourcePromises.push(
-              providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName),
+              providerController.migrateResource(context, projectPath, amplifyMeta[category][resourceName].service, resourceName)
             );
           } else {
             context.print.error(`Provider not configured for ${category}: ${resourceName}`);
@@ -68,7 +68,7 @@ async function getPermissionPolicies(context, resourceOpsMapping) {
           context,
           service,
           resourceName,
-          resourceOpsMapping[resourceName],
+          resourceOpsMapping[resourceName]
         );
         permissionPolicies.push(policy);
         resourceAttributes.push({ resourceName, attributes, category });
@@ -90,6 +90,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }

packages/amplify-category-xr/index.js

@@ -94,6 +94,7 @@ async function executeAmplifyCommand(context) {
   } else {
     commandPath = path.join(commandPath, category, context.input.command);
   }
+
   const commandModule = require(commandPath);
   await commandModule.run(context);
 }