fix: use prompter and handle deletions (#10122)

BREAKING CHANGE: package name update requires version bump in order to keep in sync with lerna.

.circleci/config.base.yml

@@ -1031,6 +1031,7 @@ commands:
     steps:
       - run:
           name: Scan E2E artifacts
+          no_output_timeout: 90m
           command: |
             if ! yarn ts-node .circleci/scan_artifacts.ts; then
               echo "Cleaning the repository"

packages/amplify-category-analytics/src/provider-utils/awscloudformation/cloudformation-templates/pinpoint-cloudformation-template.json

@@ -196,7 +196,11 @@
                 "          response.send(event, context, response.SUCCESS, {'message': `Successfully deleted pinpoint project`});",
                 "        })",
                 "        .catch(e=>{",
-                "          response.send(event, context, response.FAILED, {'message': `Failed to deleted Pinpoint project`, 'exception': e});",
+                "          if (e.code !== 'ParameterNotFound') {",
+                "            response.send(event, context, response.FAILED, {'message': `Failed to deleted Pinpoint project`, 'exception': e});",
+                "          } else {",
+                "            response.send(event, context, response.SUCCESS, {'message': `Successfully deleted pinpoint project`});",
+                "          }",
                 "        }); ",
                 "    }",
                 "    if (event.RequestType == 'Update') {",

packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-rds-walkthrough.ts

@@ -1,8 +1,7 @@
 import { $TSContext, $TSObject, exitOnNextTick, ResourceCredentialsNotFoundError, ResourceDoesNotExistError } from 'amplify-cli-core';
-import { printer } from 'amplify-prompts';
+import { printer, prompter } from 'amplify-prompts';
 import chalk from 'chalk';
 import { DataApiParams } from 'graphql-relational-schema-transformer';
-import inquirer from 'inquirer';
 import ora from 'ora';
 
 const spinner = ora('');
@@ -237,16 +236,13 @@ async function selectDatabase(context: $TSContext, inputs, clusterArn, secretArn
  * @param {*} choicesList
  */
 async function promptWalkthroughQuestion(inputs, questionNumber, choicesList) {
-  const question = [
-    {
+  const question = {
       type: inputs[questionNumber].type,
       name: inputs[questionNumber].key,
       message: inputs[questionNumber].question,
       choices: choicesList,
-    },
-  ];
-
-  const answer = await inquirer.prompt(question);
+    };
+  const answer = await prompter.pick(question.message, choicesList)
   return answer[inputs[questionNumber].key];
 }
 

packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-walkthrough.ts

@@ -13,7 +13,7 @@ import {
   getGraphQLTransformerAuthDocLink,
 } from 'amplify-cli-core';
 import { UpdateApiRequest } from 'amplify-headless-interface';
-import { printer } from 'amplify-prompts';
+import { printer, prompter } from 'amplify-prompts';
 import chalk from 'chalk';
 import * as fs from 'fs-extra';
 import { collectDirectivesByTypeNames, readProjectConfiguration } from 'graphql-transformer-core';
@@ -817,7 +817,7 @@ async function askUserPoolQuestions(context: $TSContext) {
 export async function askApiKeyQuestions(authSettings: $TSObject = undefined) {
   let defaultValues = {
     apiKeyExpirationDays: 7,
-    description: undefined,
+    description: '',
   };
   Object.assign(defaultValues, authSettings?.apiKeyConfig);
 
@@ -845,9 +845,13 @@ export async function askApiKeyQuestions(authSettings: $TSObject = undefined) {
     },
   ];
 
-  const apiKeyConfig = await inquirer.prompt(apiKeyQuestions);
+  const apiKeyConfig: $TSObject = {};
+  for (const apiKeyQuestion of apiKeyQuestions) {
+    apiKeyConfig[apiKeyQuestion.name] = await prompter.input(apiKeyQuestion.message, { initial: apiKeyQuestion.default as string })
+  }
   const apiKeyExpirationDaysNum = Number(apiKeyConfig.apiKeyExpirationDays);
   apiKeyConfig.apiKeyExpirationDate = Expiration.after(Duration.days(apiKeyExpirationDaysNum)).date;
+  apiKeyConfig.apiKeyExpirationDays = apiKeyExpirationDaysNum;
 
   return {
     authenticationType: 'API_KEY',

packages/amplify-category-function/src/provider-utils/awscloudformation/secrets/ssmClientWrapper.ts

@@ -93,10 +93,17 @@ export class SSMClientWrapper {
   };
 
   /**
-   * Delets all secrets in secretNames
+   * Deletes all secrets in secretNames
    */
   deleteSecrets = async (secretNames: string[]) => {
-    await this.ssmClient.deleteParameters({ Names: secretNames }).promise();
+    try {
+      await this.ssmClient.deleteParameters({ Names: secretNames }).promise();
+    } catch (err) {
+      // if the value didn't exist in the first place, consider it deleted
+      if (err.code !== 'ParameterNotFound') {
+        throw err;
+      }
+    }
   };
 }
 

packages/amplify-category-interactions/src/provider-utils/awscloudformation/function-template-dir/index.js.ejs

@@ -9,8 +9,17 @@ exports.handler = function(event, context) {
         if(process.env.ENV && process.env.ENV !== "NONE") {
             botName = botName + '_' + process.env.ENV;
         }
-        lex.deleteBot({name: botName}).promise();
-        response.send(event, context, response.SUCCESS);
+        lex.deleteBot({name: botName}).promise()
+        .then(() => {
+            response.send(event, context, response.SUCCESS);
+        })
+        .catch((err) => {
+            if (err.code !== 'ParameterNotFound') {
+                response.send(event, context, response.FAILED);
+            } else {
+                response.send(event, context, response.SUCCESS);
+            }
+        });
         return;
     }
     let newSlotTypeParams = [

packages/amplify-category-predictions/src/provider-utils/awscloudformation/assets/identifyCFNGenerate.js

@@ -472,6 +472,12 @@ function generateLambdaAccessForRekognition(identifyCFNFile, functionName, s3Res
               '        console.log("delete" + res);',
               '        console.log("response data" + JSON.stringify(res));',
               '        response.send(event, context, response.SUCCESS, res);',
+              '     }).catch(err => {',
+              '        if (err.code !== \'ParameterNotFound\') {',
+              '          response.send(event, context, response.FAILED);',
+              '        } else {',
+              '          response.send(event, context, response.SUCCESS);',
+              '        }',
               '     });',
               '    }',
               "    if (event.RequestType == 'Update' || event.RequestType == 'Create') {",

packages/amplify-category-predictions/src/provider-utils/awscloudformation/cloudformation-templates/identify-template.json.ejs

@@ -304,6 +304,12 @@
                                     "        console.log(\"delete\" + res);",
                                     "        console.log(\"response data\" + JSON.stringify(res));",
                                     "        response.send(event, context, response.SUCCESS, res);",
+                                    "     }).catch(err => {",
+                                    "        if (err.code !== 'ParameterNotFound') {",
+                                    "          response.send(event, context, response.FAILED);",
+                                    "        } else {",
+                                    "          response.send(event, context, response.SUCCESS);",
+                                    "        }",
                                     "     });",
                                     "    }",
                                     "    if (event.RequestType == 'Update' || event.RequestType == 'Create') {",

packages/amplify-cli/src/extensions/amplify-helpers/trigger-flow.ts

@@ -1,4 +1,5 @@
 import { $TSAny, $TSContext, $TSObject, exitOnNextTick, JSONUtilities } from 'amplify-cli-core';
+import { prompter } from 'amplify-prompts';
 import chalk from 'chalk';
 import * as fs from 'fs-extra';
 import * as inquirer from 'inquirer';
@@ -499,8 +500,14 @@ export const getTriggerEnvInputs = async (context, triggerPath, triggerKey, trig
             (Object.keys(currentEnvVars) && Object.keys(currentEnvVars).length === 0) ||
             !currentEnvVars[questions[j].key]
           ) {
-            const answer: any = await inquirer.prompt(questions[j].question);
-            answers[questions[j].key] = answer[questions[j].key];
+            const prompterTypeMapping = {
+              input: 'input',
+              list: 'pick',
+              confirm: 'yesOrNo',
+            }
+            const prompterFunction = prompterTypeMapping[questions[j].question.type];
+            const answer: any = await prompter[prompterFunction](questions[j].question.message);
+            answers[questions[j].key] = answer;
           }
         }
       }

packages/amplify-e2e-core/src/categories/auth.ts

@@ -106,8 +106,7 @@ export function addAuthWithGroupTrigger(cwd: string, settings: any): Promise<voi
       .send(' ')
       .sendCarriageReturn()
       .wait('Enter the name of the group to which users will be added.')
-      .send('mygroup')
-      .sendCarriageReturn()
+      .sendLine('mygroup')
       .wait('Do you want to edit your add-to-group function now?')
       .sendConfirmNo()
       .run((err: Error) => {
@@ -159,8 +158,7 @@ export function addAuthViaAPIWithTrigger(cwd: string, opts: Partial<AddApiOption
       .send(' ')
       .sendCarriageReturn()
       .wait('Enter the name of the group to which users will be added.')
-      .send('mygroup')
-      .sendCarriageReturn()
+      .sendLine('mygroup')
       .wait('Do you want to edit your add-to-group function now?')
       .sendConfirmNo()
       .wait(/.*Configure additional auth types.*/)
@@ -249,8 +247,7 @@ export function addAuthwithUserPoolGroupsViaAPIWithTrigger(cwd: string, opts: Pa
       .wait('What functionality do you want to use for Post Confirmation')
       .sendCarriageReturn()
       .wait('Enter the name of the group to which users will be added.')
-      .send('mygroup')
-      .sendCarriageReturn()
+      .sendLine('mygroup')
       .wait('Do you want to edit your add-to-group function now?')
       .sendConfirmNo()
       .wait(/.*Configure additional auth types.*/)
@@ -337,13 +334,12 @@ export function addAuthWithCustomTrigger(cwd: string, settings: any): Promise<vo
       .send(' ')
       .sendCarriageReturn()
       .wait('Enter a comma-delimited list of disallowed email domains')
-      .send('amazon.com')
-      .sendCarriageReturn()
+      .sendLine('amazon.com')
       .wait('Successfully')
       .wait(`Do you want to edit your email-filter-denylist${settings.useInclusiveTerminology === false ? '-legacy' : ''} function now?`)
-      .sendLine('n')
+      .sendConfirmNo()
       .wait('Do you want to edit your custom function now')
-      .sendLine('n')
+      .sendConfirmNo()
       .run((err: Error) => {
         if (!err) {
           resolve();
@@ -496,8 +492,7 @@ export function addAuthWithRecaptchaTrigger(cwd: string, settings: any): Promise
       .wait('Do you want to edit your captcha-create-challenge function now?')
       .sendConfirmNo()
       .wait('Enter the Google reCaptcha secret key:')
-      .send('dummykey')
-      .sendCarriageReturn()
+      .sendLine('dummykey')
       .wait('Do you want to edit your captcha-verify function now?')
       .sendConfirmNo()
       .run((err: Error) => {

packages/amplify-e2e-core/src/categories/hosting.ts

@@ -146,7 +146,10 @@ export function amplifyPublishWithUpdate(cwd: string): Promise<void> {
 
 export function amplifyPublishWithoutUpdate(cwd: string): Promise<void> {
   return new Promise((resolve, reject) => {
-    spawn(getCLIPath(), ['publish'], { cwd, stripColors: true }).run((err: Error) => {
+    spawn(getCLIPath(), ['publish'], { cwd, stripColors: true })
+    .wait('Do you still want to publish the frontend')
+    .sendConfirmYes()
+    .run((err: Error) => {
       if (!err) {
         resolve();
       } else {

packages/amplify-prompts/src/prompter.ts

@@ -65,7 +65,7 @@ class AmplifyPrompter implements Prompter {
   input = async <RS extends ReturnSize = 'one', T = string>(message: string, ...options: MaybeOptionalInputOptions<RS, T>) => {
     const opts = options?.[0] ?? ({} as InputOptions<RS, T>);
     if (isYes) {
-      if (opts.initial) {
+      if (opts.initial !== undefined) {
         return opts.initial as PromptReturn<RS, T>;
       } else {
         throw new Error(`Cannot prompt for [${message}] when '--yes' flag is set`);

packages/amplify-provider-awscloudformation/src/aws-utils/aws-lambda.ts

@@ -44,7 +44,15 @@ export class Lambda {
     const deletionPromises = [];
     for (const version of versions) {
       params.VersionNumber = version;
-      deletionPromises.push(this.lambda.deleteLayerVersion(params).promise());
+      deletionPromises.push(async () => {
+        try {
+          await this.lambda.deleteLayerVersion(params).promise();
+        } catch (err) {
+          if (err.code !== 'ParameterNotFound') {
+            throw err;
+          }
+        }
+      });
     }
 
     try {