Handle deployment cancellation (#3823)

Co-authored-by: Max <8418866+rdev@users.noreply.github.com>
vercel · Feb 26, 2020 · fd964f8 · fd964f8
1 parent 1656c98
commit fd964f8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/packages/now-cli/src/commands/deploy/latest.js b/packages/now-cli/src/commands/deploy/latest.js
@@ -566,6 +566,11 @@ export default async function main(
       return 1;
     }
 
+    if (deployment.readyState === 'CANCELED') {
+      output.log('The deployment has been canceled');
+      return 1;
+    }
+
     const deploymentResponse = await getDeploymentByIdOrHost(
       now,
       contextName,

diff --git a/packages/now-cli/src/util/deploy/process-deployment.ts b/packages/now-cli/src/util/deploy/process-deployment.ts
@@ -202,6 +202,13 @@ export default async function processDeployment({
       }
     }
 
+    if (event.type === 'canceled') {
+      if (buildSpinner) {
+        buildSpinner();
+      }
+      return event.payload;
+    }
+
     if (event.type === 'ready') {
       if (queuedSpinner) {
         queuedSpinner();

diff --git a/packages/now-client/src/check-deployment-status.ts b/packages/now-client/src/check-deployment-status.ts
@@ -77,6 +77,15 @@ export async function* checkDeploymentStatus(
       yield { type: 'building', payload: deploymentUpdate };
     }
 
+    if (
+      deploymentUpdate.readyState === 'CANCELED' &&
+      !finishedEvents.has('canceled')
+    ) {
+      debug('Deployment state changed to CANCELED');
+      finishedEvents.add('canceled');
+      yield { type: 'canceled', payload: deploymentUpdate };
+    }
+
     if (isReady(deploymentUpdate) && !finishedEvents.has('ready')) {
       debug('Deployment state changed to READY');
       finishedEvents.add('ready');

diff --git a/packages/now-client/src/utils/index.ts b/packages/now-client/src/utils/index.ts
@@ -29,6 +29,7 @@ const EVENTS_ARRAY = [
   'error',
   'notice',
   'tip',
+  'canceled',
 ] as const;
 
 export type DeploymentEventType = (typeof EVENTS_ARRAY)[number];