fix(amplify-cli): promise not resolving in lts/dubnium (#1028)

* fix(cli): resolve proper promise chain promise not awaited, resulting aws-exports not generating. fix #1051 * Update remove.js
aws-amplify · Mar 22, 2019 · 8a966be · 8a966be
1 parent cf8b0be
commit 8a966be
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/packages/amplify-category-notifications/commands/notifications/add.js b/packages/amplify-category-notifications/commands/notifications/add.js
@@ -30,7 +30,7 @@ module.exports = {
       if (channelName) {
         await pinpointHelper.ensurePinpointApp(context);
         await notificationManager.enableChannel(context, channelName);
-        multiEnvManager.writeData(context);
+        await multiEnvManager.writeData(context);
       }
     } else {
       context.print.info('All the available notification channels have already been enabled.');

diff --git a/packages/amplify-category-notifications/commands/notifications/configure.js b/packages/amplify-category-notifications/commands/notifications/configure.js
@@ -24,7 +24,7 @@ module.exports = {
 
     await pinpointHelper.ensurePinpointApp(context);
     await notificationManager.configureChannel(context, channelName);
-    multiEnvManager.writeData(context);
+    await multiEnvManager.writeData(context);
 
     return context;
   },

diff --git a/packages/amplify-category-notifications/commands/notifications/remove.js b/packages/amplify-category-notifications/commands/notifications/remove.js
@@ -39,7 +39,7 @@ module.exports = {
         if (channelName !== PinpointApp) {
           await pinpointHelper.ensurePinpointApp(context);
           await notificationManager.disableChannel(context, channelName);
-          multiEnvManager.writeData(context);
+          await multiEnvManager.writeData(context);
         } else if (pinpointHelper.isAnalyticsAdded(context)) {
           context.print.error('Execution aborted.');
           context.print.info('You have an analytics resource in your backend tied to the Amazon Pinpoint resource');
@@ -54,7 +54,7 @@ module.exports = {
           if (answer.deletePinpointApp) {
             await pinpointHelper.deletePinpointApp(context);
             context.print.info('The Pinpoint application has been successfully deleted.');
-            multiEnvManager.writeData(context);
+            await multiEnvManager.writeData(context);
           }
         }
       }

diff --git a/packages/amplify-category-notifications/lib/multi-env-manager.js b/packages/amplify-category-notifications/lib/multi-env-manager.js
@@ -9,7 +9,7 @@ async function initEnv(context) {
   if (pinpointNotificationsMeta) {
     // remove this line after init and init-push are separated.
     await pushChanges(context, pinpointNotificationsMeta);
-    writeData(context);
+    await writeData(context);
   }
   return pinpointNotificationsMeta;
 }
@@ -178,7 +178,7 @@ async function pushChanges(context, pinpointNotificationsMeta) {
   await sequential(tasks);
 }
 
-function writeData(context) {
+async function writeData(context) {
   const categoryMeta = context.exeInfo.amplifyMeta[constants.CategoryName];
   let pinpointMeta;
   if (categoryMeta) {
@@ -213,7 +213,7 @@ function writeData(context) {
   writeBackendConfig(pinpointMeta, context.amplify.pathManager.getCurrentBackendConfigFilePath());
   writeAmplifyMeta(categoryMeta, context.amplify.pathManager.getAmplifyMetaFilePath());
   writeAmplifyMeta(categoryMeta, context.amplify.pathManager.getCurentAmplifyMetaFilePath());
-  context.amplify.onCategoryOutputsChange(context);
+  await context.amplify.onCategoryOutputsChange(context);
 }
 
 function writeTeamProviderInfo(pinpointMeta, context) {

diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/on-category-outputs-change.js b/packages/amplify-cli/src/extensions/amplify-helpers/on-category-outputs-change.js
@@ -2,14 +2,14 @@ const fs = require('fs');
 const pathManager = require('./path-manager');
 const { getResourceOutputs } = require('./get-resource-outputs');
 
-function onCategoryOutputsChange(context) {
+async function onCategoryOutputsChange(context) {
   const projectConfigFilePath = pathManager.getProjectConfigFilePath();
   const projectConfig = JSON.parse(fs.readFileSync(projectConfigFilePath));
   if (projectConfig.frontend) {
     const frontendPlugins = context.amplify.getFrontendPlugins(context);
     const frontendHandlerModule =
       require(frontendPlugins[projectConfig.frontend]);
-    frontendHandlerModule.createFrontendConfigs(context, getResourceOutputs());
+    await frontendHandlerModule.createFrontendConfigs(context, getResourceOutputs());
   }
 
   const pluginNames = Object.keys(context.amplify.getCategoryPlugins(context));

diff --git a/packages/amplify-cli/src/lib/initialize-env.js b/packages/amplify-cli/src/lib/initialize-env.js
@@ -67,7 +67,7 @@ async function initializeEnv(context) {
       await sequential(providerPushTasks);
     }
     // Generate AWS exports/configurtion file
-    context.amplify.onCategoryOutputsChange(context);
+    await context.amplify.onCategoryOutputsChange(context);
     context.print.success('Initialized your environment successfully.');
   } catch (e) {
     spinner.fail('There was an error initializing your environment.');

diff --git a/packages/amplify-codegen/src/commands/add.js b/packages/amplify-codegen/src/commands/add.js
@@ -48,7 +48,7 @@ async function add(context, apiId = null) {
           apiDetails.apiKey = await selectAPIKey(apiDetails.apiKeys);
         }
 
-        updateAmplifyMeta(context, apiDetails);
+        await updateAmplifyMeta(context, apiDetails);
         break;
       } catch (e) {
         apiDetailSpinner.fail();

diff --git a/packages/amplify-codegen/src/utils/updateAmplifyMeta.js b/packages/amplify-codegen/src/utils/updateAmplifyMeta.js
@@ -1,5 +1,5 @@
 
-module.exports = (context, apiDetails) => {
+module.exports = async (context, apiDetails) => {
   const fs = context.filesystem;
 
   const appsyncMetadata = {
@@ -35,6 +35,6 @@ module.exports = (context, apiDetails) => {
   currentAmplifyMeta.api[apiDetails.name] = appsyncMetadata;
   fs.write(currentAmplifyMetaFilePath, currentAmplifyMeta);
 
-  context.amplify.onCategoryOutputsChange(context);
+  await context.amplify.onCategoryOutputsChange(context);
   context.print.success(`Successfully added API ${apiDetails.name} to your Amplify project`);
 };
diff --git a/packages/amplify-frontend-javascript/lib/frontend-config-creator.js b/packages/amplify-frontend-javascript/lib/frontend-config-creator.js
@@ -32,7 +32,7 @@ function createAmplifyConfig(context, amplifyResources) {
   }
 }
 
-function createAWSExports(context, amplifyResources) {
+async function createAWSExports(context, amplifyResources) {
   const { serviceResourceMapping } = amplifyResources;
   const configOutput = {};
 
@@ -60,11 +60,11 @@ function createAWSExports(context, amplifyResources) {
       default: break;
     }
   });
-  generateAWSExportsFile(context, configOutput);
+  await generateAWSExportsFile(context, configOutput);
   return context;
 }
 
-function generateAWSExportsFile(context, configOutput) {
+async function generateAWSExportsFile(context, configOutput) {
   const { amplify } = context;
   const pluginDir = __dirname;
   const projectPath = context.exeInfo ?
@@ -90,7 +90,7 @@ function generateAWSExportsFile(context, configOutput) {
 
   // copy over the files
   const forceOverwrite = true;
-  return amplify.copyBatch(context, copyJobs, options, forceOverwrite);
+  await amplify.copyBatch(context, copyJobs, options, forceOverwrite);
 }
 
 function getCognitoConfig(cognitoResources, projectRegion) {