@heroku/skynet 1.12.0 → 1.14.0

package/commands/suspend/app-owner.js

@@ -13,6 +13,7 @@ async function run (context) {
   const notes = context.flags.notes
   const category = context.flags.category
   const force = context.flags.bypass || process.env.HEROKU_FORCE === '1'
+  const deprovision = context.flags.deprovision
 
   if (app && file) {
     throw new Error('Either --app or --infile must be passed, but not both')
@@ -23,7 +24,7 @@ async function run (context) {
     const chunks = utils.arrayChunks(apps, chunkSize)
     for (const chunk of chunks) {
       cli.log('Suspending app owners: ' + chunk.join())
-      const response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category)
+      const response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category, deprovision)
       cli.log(`${cli.color.cyan(response.status)}. ${response.message}`)
       cli.log()
     }
@@ -32,8 +33,8 @@ async function run (context) {
       throw new Error('Required flag: --owner OWNER or --infile FILE')
     }
 
-    let response = await cli.action(`Deprovisioning app owner of ${cli.color.cyan(app)}`,
-      skynet.suspendAppOwner(app, notes, category, force))
+    let response = await cli.action(`Suspending app owner of ${cli.color.cyan(app)}`,
+      skynet.suspendAppOwner(app, notes, category, force, deprovision))
     response = JSON.parse(response)
     cli.log(`${cli.color.cyan(response.status)}. ${response.message}`)
   }
@@ -50,7 +51,8 @@ module.exports = {
     { name: 'infile', char: 'i', description: 'file of apps that require owner suspension', hasValue: true },
     { name: 'category', char: 'c', description: 'suspension category', hasValue: true, required: true },
     { name: 'notes', char: 'n', description: 'suspend notes', hasValue: true, required: true },
-    { name: 'bypass', description: 'force suspension, bypassing skynet safety checks', hasValue: false, required: false }
+    { name: 'bypass', description: 'force suspension, bypassing skynet safety checks', hasValue: false, required: false },
+    { name: 'deprovision', char: 'd', description: 'put user into the fast resource deletion flow', hasValue: false, required: false }
   ],
   run: command(run)
 }

package/commands/suspend/user.js

@@ -22,6 +22,7 @@ async function run (context) {
   const category = context.flags.category
   const force = context.flags.bypass || process.env.HEROKU_FORCE === '1'
   const unverify = context.flags.unverify
+  const deprovision = context.flags.deprovision
 
   const notify = notifyOption.set(context.flags.notify, context.flags['no-notify'])
   const notificationStatus = (notify) ? 'enabled' : 'disabled'
@@ -35,7 +36,7 @@ async function run (context) {
     const chunks = utils.arrayChunks(users, chunkSize)
     for (const chunk of chunks) {
       cli.log('Suspending users: ' + chunk.join())
-      const response = await skynet.bulkSuspendUsers(chunk.join(), notes, category, notify, force)
+      const response = await skynet.bulkSuspendUsers(chunk.join(), notes, category, notify, force, deprovision)
       cli.log(`${response}. Notification ${notificationStatus}`)
       cli.log()
     }
@@ -48,7 +49,7 @@ async function run (context) {
       throw new Error('Required flag: --user USER or --infile FILE')
     }
 
-    let response = await skynet.suspendUser(user, notes, category, notify, force)
+    let response = await skynet.suspendUser(user, notes, category, notify, force, deprovision)
     response = JSON.parse(response)
     cli.log(`Suspending user ${user}...\n${response.status}. ${response.message}. Notification ${notificationStatus}`)
 
@@ -72,7 +73,8 @@ module.exports = {
     { name: 'bypass', description: 'force suspension, bypassing skynet safety checks', hasValue: false, required: false },
     { name: 'no-notify', description: 'skip user suspension email notification', hasValue: false, required: false },
     { name: 'notify', description: 'send user suspension email notification', hasValue: false, required: false },
-    { name: 'unverify', description: 'unverifies a user account, removes all billing info', hasValue: false, required: false }
+    { name: 'unverify', description: 'unverifies a user account, removes all billing info', hasValue: false, required: false },
+    { name: 'deprovision', char: 'd', description: 'put user into the fast resource deletion flow', hasValue: false, required: false }
   ],
   run: command(run)
 }

package/lib/skynet.js

@@ -33,13 +33,12 @@ module.exports = class SkynetAPI {
   }
 
   addCategory (name, description) {
-    const body = {
-      category: name,
-      description: description
-    }
     return this.request('/categories', {
       method: 'POST',
-      form: body
+      json: {
+        category: name,
+        description: description
+      }
     })
   }
 
@@ -98,13 +97,14 @@ module.exports = class SkynetAPI {
     })
   }
 
-  suspendAppOwner (app, notes, category, force = false) {
+  suspendAppOwner (app, notes, category, force = false, deprovision = false) {
     const body = {
       value: app,
       reason: notes,
       method: 'skynet-cli',
       category: category,
-      force: force
+      force: force,
+      deprovision: deprovision
     }
 
     return this.request('/suspend/app-owner', {
@@ -135,14 +135,15 @@ module.exports = class SkynetAPI {
     })
   }
 
-  suspendUser (user, notes, category, notify, force = false) {
+  suspendUser (user, notes, category, notify, force = false, deprovision = false) {
     const body = {
       value: user,
       reason: notes,
       method: 'skynet-cli',
       category: category,
       force: force,
-      notify: notify
+      notify: notify,
+      deprovision: deprovision
     }
 
     return this.request('/suspend/user', {
@@ -158,7 +159,7 @@ module.exports = class SkynetAPI {
     })
   }
 
-  bulkSuspendUsers (users, notes, category, notify, force = false) {
+  bulkSuspendUsers (users, notes, category, notify, force = false, deprovision = false) {
     const body = {
       value: users,
       reason: notes,
@@ -166,7 +167,8 @@ module.exports = class SkynetAPI {
       category: category,
       bulk: 'true',
       force: force,
-      notify: notify
+      notify: notify,
+      deprovision: deprovision
     }
 
     return this.request('/suspend/user', {
@@ -175,13 +177,14 @@ module.exports = class SkynetAPI {
     })
   }
 
-  bulkSuspendAppOwner (apps, notes, category) {
+  bulkSuspendAppOwner (apps, notes, category, deprovision = false) {
     const body = {
       value: apps,
       reason: notes,
       method: 'skynet-cli',
       category: category,
-      bulk: 'true'
+      bulk: 'true',
+      deprovision: deprovision
     }
 
     return this.request('/suspend/app-owner', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",