address CRs

Author: AaronZyLee

packages/amplify-e2e-core/src/init/deleteProject.ts

@@ -6,37 +6,16 @@ import { getBackendAmplifyMeta } from '../utils';
  * Runs `amplify delete`
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const deleteProject = async (cwd: string, profileConfig?: any, usingLatestCodebase = false): Promise<void> => {
+export const deleteProject = async (cwd: string, profileConfig?: any, usingLatestCodebase = false, noOutputTimeout: number = 1000 * 60 * 20): Promise<void> => {
   // Read the meta from backend otherwise it could fail on non-pushed, just initialized projects
-  try {
-    const { StackName: stackName, Region: region } = getBackendAmplifyMeta(cwd).providers.awscloudformation;
-    await retry(
-      () => describeCloudFormationStack(stackName, region, profileConfig),
-      stack => stack.StackStatus.endsWith('_COMPLETE') || stack.StackStatus.endsWith('_FAILED'),
-    );
-
-    const noOutputTimeout = 1000 * 60 * 20; // 20 minutes;
-    return spawn(getCLIPath(usingLatestCodebase), ['delete'], { cwd, stripColors: true, noOutputTimeout })
-      .wait('Are you sure you want to continue?')
-      .sendYes()
-      .wait('Project deleted locally.')
-      .runAsync();
-  } catch (e) {
-    console.log('Error on deleting project at:', cwd);
-  }
-};
-
-export const amplifyDeleteWithLongerTimeout = (cwd: string, usingLatestCodebase = false): Promise<void> => new Promise((resolve, reject) => {
-  const noOutputTimeout = 1000 * 60 * 30; // 30 minutes;
-  spawn(getCLIPath(usingLatestCodebase), ['delete'], { cwd, stripColors: true, noOutputTimeout })
+  const { StackName: stackName, Region: region } = getBackendAmplifyMeta(cwd).providers.awscloudformation;
+  await retry(
+    () => describeCloudFormationStack(stackName, region, profileConfig),
+    stack => stack.StackStatus.endsWith('_COMPLETE') || stack.StackStatus.endsWith('_FAILED'),
+  );
+  return spawn(getCLIPath(usingLatestCodebase), ['delete'], { cwd, stripColors: true, noOutputTimeout })
     .wait('Are you sure you want to continue?')
     .sendConfirmYes()
     .wait('Project deleted locally.')
-    .run((err: Error) => {
-      if (!err) {
-        resolve();
-      } else {
-        reject(err);
-      }
-    });
-});
+    .runAsync();
+};

packages/amplify-e2e-tests/src/__tests__/api_6a.test.ts

@@ -16,6 +16,8 @@ const projName = 'apitest';
 let projRoot;
 beforeEach(async () => {
   projRoot = await createNewProjectDir(projName);
+  await initJSProjectWithProfile(projRoot, { name: projName });
+  await addApiWithoutSchema(projRoot, { transformerVersion: 2 });
 });
 afterEach(async () => {
   await deleteProject(projRoot);
@@ -24,8 +26,6 @@ afterEach(async () => {
 
 describe('amplify rebuild api', () => {
   it('recreates single table', async () => {
-    await initJSProjectWithProfile(projRoot, { name: projName });
-    await addApiWithoutSchema(projRoot, { transformerVersion: 2 });
     await amplifyPush(projRoot);
     const projMeta = getProjectMeta(projRoot);
     const apiId = projMeta?.api?.[projName]?.output?.GraphQLAPIIdOutput;
@@ -37,8 +37,6 @@ describe('amplify rebuild api', () => {
     await testTableAfterRebuildApi(apiId, region, 'Todo');
   });
   it('recreates tables for relational models', async () => {
-    await initJSProjectWithProfile(projRoot, { name: projName });
-    await addApiWithoutSchema(projRoot, { transformerVersion: 2 });
     await updateApiSchema(projRoot, projName, 'relational_models_v2.graphql');
     await amplifyPush(projRoot);
     const projMeta = getProjectMeta(projRoot);

packages/amplify-e2e-tests/src/__tests__/api_6c.test.ts

@@ -7,7 +7,7 @@ import {
   rebuildApi,
   getProjectMeta,
   updateApiSchema,
-  amplifyDeleteWithLongerTimeout,
+  deleteProject
 } from '@aws-amplify/amplify-e2e-core';
 import { testTableAfterRebuildApi, testTableBeforeRebuildApi } from '../rebuild-test-helpers';
 
@@ -18,7 +18,7 @@ beforeEach(async () => {
   projRoot = await createNewProjectDir(projName);
 });
 afterEach(async () => {
-  await amplifyDeleteWithLongerTimeout(projRoot);
+  await deleteProject(projRoot, undefined, false, 1000 * 60 * 30);
   deleteProjectDir(projRoot);
 });