From c7e7b90e615da54dd1849435d63068cbe095b55a Mon Sep 17 00:00:00 2001
From: Ammar <56042290+ammarkarachi@users.noreply.github.com>
Date: Wed, 9 Mar 2022 15:47:49 -0800
Subject: [PATCH] fix(cli): spinner hiding prompt (#9875)

---
 packages/amplify-cli-core/package.json                        | 1 +
 packages/amplify-cli-core/src/index.ts                        | 1 +
 packages/amplify-cli-core/src/spinner/index.ts                | 3 +++
 .../src/export-resources.ts                                   | 4 +---
 .../src/resource-package/resource-packager.ts                 | 3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 packages/amplify-cli-core/src/spinner/index.ts

diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
index 2edbd2a5d84..c668c8f810a 100644
--- a/packages/amplify-cli-core/package.json
+++ b/packages/amplify-cli-core/package.json
@@ -39,6 +39,7 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "open": "^8.4.0",
+    "ora": "^4.0.3",
     "proxy-agent": "^5.0.0",
     "semver": "^7.3.5",
     "typescript-json-schema": "~0.52.0",
diff --git a/packages/amplify-cli-core/src/index.ts b/packages/amplify-cli-core/src/index.ts
index dbd3e61984e..f0ca838f30d 100644
--- a/packages/amplify-cli-core/src/index.ts
+++ b/packages/amplify-cli-core/src/index.ts
@@ -31,6 +31,7 @@ export * from './category-interfaces';
 export * from './customPoliciesUtils';
 export * from './utils/doc-links';
 export * from './utils/gql-transformer-version';
+export * from './spinner';
 
 // Temporary types until we can finish full type definition across the whole CLI
 
diff --git a/packages/amplify-cli-core/src/spinner/index.ts b/packages/amplify-cli-core/src/spinner/index.ts
new file mode 100644
index 00000000000..1ae4e7ce4ec
--- /dev/null
+++ b/packages/amplify-cli-core/src/spinner/index.ts
@@ -0,0 +1,3 @@
+import ora, { Ora } from 'ora';
+
+export const spinner : Ora = new (ora as any)();
diff --git a/packages/amplify-provider-awscloudformation/src/export-resources.ts b/packages/amplify-provider-awscloudformation/src/export-resources.ts
index b16d0f9b90f..19a3e72360c 100644
--- a/packages/amplify-provider-awscloudformation/src/export-resources.ts
+++ b/packages/amplify-provider-awscloudformation/src/export-resources.ts
@@ -1,10 +1,9 @@
-import { $TSAny, $TSContext, JSONUtilities, PathConstants, stateManager } from 'amplify-cli-core';
+import { $TSAny, $TSContext, JSONUtilities, PathConstants, stateManager, spinner } from 'amplify-cli-core';
 import { ResourceExport } from './resource-package/resource-export';
 import { ResourceDefinition, StackIncludeDetails, StackParameters } from './resource-package/types';
 import * as path from 'path';
 import { printer, prompter } from 'amplify-prompts';
 import * as fs from 'fs-extra';
-import Ora from 'ora';
 const backup = 'backup';
 import _ from 'lodash';
 import rimraf from 'rimraf';
@@ -31,7 +30,6 @@ export async function run(context: $TSContext, resourceDefinition: $TSAny[], exp
     return;
   }
 
-  const spinner = Ora('Exporting...');
   spinner.start();
   try {
     const resourceExport = new ResourceExport(context, amplifyExportFolder);
diff --git a/packages/amplify-provider-awscloudformation/src/resource-package/resource-packager.ts b/packages/amplify-provider-awscloudformation/src/resource-package/resource-packager.ts
index b686c18dbe8..e06a202b1c1 100644
--- a/packages/amplify-provider-awscloudformation/src/resource-package/resource-packager.ts
+++ b/packages/amplify-provider-awscloudformation/src/resource-package/resource-packager.ts
@@ -7,6 +7,7 @@ import {
   readCFNTemplate,
   stateManager,
   writeCFNTemplate,
+  spinner,
 } from 'amplify-cli-core';
 import _ from 'lodash';
 import { legacyLayerMigration, prePushLambdaLayerPrompt } from '../lambdaLayerInvocations';
@@ -106,7 +107,9 @@ export abstract class ResourcePackager {
     )) {
       await legacyLayerMigration(this.context, lambdaLayerResource.resourceName);
     }
+    spinner.stop();
     await prePushLambdaLayerPrompt(this.context, resources);
+    spinner.start();
     return resources;
   }