Don't return error in destroyServer_ if droplet doesn't exist

Author: gitlaura

src/cloud/digitalocean/provisioner.ts

@@ -132,10 +132,11 @@ class Provisioner {
     return this.doRequest_('GET', 'droplets').then((resp: any) => {
       // Find and delete the server with the same name
       return this.getDroplet_(name);
-    }).then((resp :any) => {
+    }).then((resp: any) => {
       this.state_.cloud = this.state_.cloud || {};
       this.state_.cloud.vm = this.state_.cloud.vm || resp.droplet;
       // Make sure there are no actions in progress before deleting
+      this.sendStatus_('CLOUD_WAITING_VM');
       return this.waitDigitalOceanActions_();
     }).then(() => {
       return this.doRequest_('DELETE', 'droplets/' + this.state_.cloud.vm.id);
@@ -147,6 +148,12 @@ class Provisioner {
       } else {
         return Promise.reject(new Error('error deleting droplet'));
       }
+    }).catch((e: any) => {
+      if (e.errcode === 'VM_DNE') {
+        // Don't return an error if droplet doesn't exist
+        return Promise.resolve<void>();
+      }
+      return Promise.reject(e);
     });
   }
 

src/cloud/install/freedom-module.json

@@ -15,11 +15,6 @@
         "value": ["string", "number", "string", "string"],
         "ret": "object"
       },
-      "cancel": {
-        "type": "method",
-        "value": [],
-        "ret": []
-      },
       "err": {
         "message": "string"
       },

src/cloud/install/installer.ts

@@ -24,9 +24,6 @@ const PROGRESS_PREFIX = 'CLOUD_INSTALL_PROGRESS';
 // Prefix for status updates.
 const STATUS_PREFIX = 'CLOUD_INSTALL_STATUS';
 
-// Status indicating that the installer has been canceled.
-const CANCELED_STATUS = 'CANCELED';
-
 // Retry timing for SSH connection establishment.
 const INITIAL_CONNECTION_INTERVAL_MS = 500;
 const MAX_CONNECTION_INTERVAL_MS = 10000;
@@ -36,7 +33,6 @@ const MAX_CONNECTION_INTERVAL_MS = 10000;
 // so that we have fewer paths to test.
 class CloudInstaller {
   constructor(private dispatchEvent_: (name: string, args: Object) => void) {}
-  private status_ :string = undefined;
 
   // Runs the install command via SSH, resolving with the invitation URL.
   public install = (
@@ -58,10 +54,6 @@ class CloudInstaller {
 
     let numAttempts = 0;
     return promises.retryWithExponentialBackoff(() => {
-      if (this.status_ === CANCELED_STATUS) {
-        log.debug('Canceling cloud installer...');
-        return Promise.reject(new Error('canceled'));
-      } 
       log.debug('connection attempt %1...', (++numAttempts));
       return new Promise<string>((F, R) => {
         const connection = new Client();
@@ -93,7 +85,6 @@ class CloudInstaller {
                 this.dispatchEvent_('progress', progress);
               }
             } else if (line.indexOf(STATUS_PREFIX) === 0) {
-              this.status_ = line;
               this.dispatchEvent_('status', line);
             }
           });
@@ -146,10 +137,6 @@ class CloudInstaller {
       });
     }, MAX_CONNECTION_INTERVAL_MS, INITIAL_CONNECTION_INTERVAL_MS);
   }
-
-  public cancel = () : void => {
-    this.status_ = CANCELED_STATUS;
-  }
 }
 
 export = CloudInstaller;