Merge pull request #218 from rackspace/do-scrub

Make default DestroyServer for DigitalOcean scrub private data
pkgcloud · Dec 31, 2013 · 2b99678 · 2b99678
2 parents d432984 + d10d1e9
commit 2b99678
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/lib/pkgcloud/digitalocean/compute/client/servers.js b/lib/pkgcloud/digitalocean/compute/client/servers.js
@@ -141,16 +141,30 @@ exports.createServer = function createServer(options, callback) {
 //
 // ### function destroyServer(server, callback)
 // #### @server {Server|String} Server id or a server
+// #### [@options] {object} Pass optioos for deletion
+// #### [options.scrubData] Optionally disable scrubbing data (boolean),
+//        default (true) is to scrub data from Digital Ocean servers
+//
 // #### @callback {Function} f(err, serverId).
 //
 // Destroy a server in DigitalOcean.
 //
-exports.destroyServer = function destroyServer(server, callback) {
+exports.destroyServer = function destroyServer(server, options, callback) {
   var serverId = server instanceof base.Server ? server.id : server,
       self = this;
 
+  if (typeof options === 'function') {
+    callback = options;
+    options = {};
+  }
+
   this.request({
-    path: '/droplets/' + serverId + '/destroy'
+    path: '/droplets/' + serverId + '/destroy',
+    qs: {
+      scrub_data: (typeof options.scrubData === 'boolean')
+        ? (options.scrubData ? '1' : '0')
+        : '1'
+    }
   }, function (err, body, res) {
     return err ? callback(err) : callback(null, { ok: serverId }, res);
   });

diff --git a/test/common/compute/base-test.js b/test/common/compute/base-test.js
@@ -512,6 +512,7 @@ function setupDestroyMock(client, provider, servers) {
 
     servers.server
       .get('/droplets/354526/destroy?' + qs.stringify({
+        scrub_data: '1',
         client_id: account.clientId,
         api_key: account.apiKey
       }))

diff --git a/test/common/compute/signature-test.js b/test/common/compute/signature-test.js
@@ -41,9 +41,9 @@ providers.forEach(function (provider) {
       should.ok(client.rebootServer.length >= 2);
     });
 
-    it('client.destroyServer should take 2 arguments', function () {
+    it('client.destroyServer should take at least 2 arguments', function () {
       client.destroyServer.should.be.a('function');
-      client.destroyServer.should.have.length(2);
+      should.ok(client.destroyServer.length >= 2);
     });
 
     it('client.getFlavor should take 2 arguments', function () {