@heroku/skynet 1.11.0 → 1.13.0

package/commands/allowlist/add.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const SkynetAPI = require('../../lib/skynet')
 

package/commands/allowlist/remove.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const SkynetAPI = require('../../lib/skynet')
 

package/commands/allowlists.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../lib/command')
 const SkynetAPI = require('../lib/skynet')
 

package/commands/categories/add.js

@@ -0,0 +1,40 @@
+const cli = require('@heroku/heroku-cli-util')
+const command = require('../../lib/command')
+const sudo = require('../../lib/sudo')
+const SkynetAPI = require('../../lib/skynet')
+
+async function run (context) {
+  sudo()
+  const skynet = new SkynetAPI(context.auth.password)
+  await cli.action(
+      `adding ${cli.color.cyan(
+          context.flags.name
+      )} to categories`,
+      skynet.addCategory(context.flags.name, context.flags.description)
+  )
+}
+
+module.exports = {
+  topic: 'skynet',
+  command: 'categories:add',
+  description: '(requires sudo) Adds a category for use when suspending or deprovisioning',
+  help: `Examples:
+    $ heroku skynet:add -n Cryptominer -d Abusers running cryptomining on the platform`,
+  flags: [
+    {
+      name: 'name',
+      char: 'n',
+      description: 'The name of the category',
+      hasValue: true,
+      required: true
+    },
+    {
+      name: 'description',
+      char: 'd',
+      description: 'The description of the category',
+      hasValue: true,
+      required: true
+    }
+  ],
+  run: command(run)
+}

package/commands/{categories.js → categories/get.js}

@@ -1,7 +1,7 @@
-const cli = require('heroku-cli-util')
-const command = require('../lib/command')
-const sudo = require('../lib/sudo')
-const SkynetAPI = require('../lib/skynet')
+const cli = require('@heroku/heroku-cli-util')
+const command = require('../../lib/command')
+const sudo = require('../../lib/sudo')
+const SkynetAPI = require('../../lib/skynet')
 
 async function run (context) {
   sudo()

package/commands/categories/remove.js

@@ -0,0 +1,33 @@
+const cli = require('@heroku/heroku-cli-util')
+const command = require('../../lib/command')
+const sudo = require('../../lib/sudo')
+const SkynetAPI = require('../../lib/skynet')
+
+async function run (context) {
+  sudo()
+  const skynet = new SkynetAPI(context.auth.password)
+  await cli.action(
+      `removing ${cli.color.cyan(
+          context.flags.name
+      )} from categories`,
+      skynet.removeCategory(context.flags.name)
+  )
+}
+
+module.exports = {
+  topic: 'skynet',
+  command: 'categories:remove',
+  description: '(requires sudo) Removes a category from Skynet',
+  help: `Examples:
+    $ heroku skynet:add -n Cryptominer`,
+  flags: [
+    {
+      name: 'name',
+      char: 'n',
+      description: 'The name of the category',
+      hasValue: true,
+      required: true
+    }
+  ],
+  run: command(run)
+}

package/commands/deprovision.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../lib/command')
 const sudo = require('../lib/sudo')
 const SkynetAPI = require('../lib/skynet')
@@ -10,7 +10,7 @@ async function run (context) {
   const user = context.flags.user || process.env.HEROKU_USER
   const notes = context.flags.notes
   const category = context.flags.category
-  const force = context.flags.bypass
+  const force = context.flags.bypass || process.env.HEROKU_FORCE === '1'
 
   const notify = notifyOption.set(context.flags.notify, context.flags['no-notify'])
   const notificationStatus = (notify) ? 'enabled' : 'disabled'
@@ -34,7 +34,7 @@ module.exports = {
     { name: 'user', char: 'u', description: 'user to deprovision', 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: 'bypass the allowlist', hasValue: false, required: false },
+    { name: 'bypass', description: 'force suspension, bypassing skynet safety checks', hasValue: false, required: false },
     { name: 'notify', description: 'send user suspension email notification', hasValue: false, required: false },
     { name: 'no-notify', description: 'skip user suspension email notification', hasValue: false, required: false }
   ],

package/commands/suspend/app-owner.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
@@ -12,7 +12,8 @@ async function run (context) {
   const file = context.flags.infile
   const notes = context.flags.notes
   const category = context.flags.category
-  const force = context.flags.bypass
+  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: 'bypass the allowlist', 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/apps.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
@@ -10,7 +10,7 @@ async function run (context) {
     context.flags.app,
     context.flags.notes,
     context.flags.category,
-    context.flags.bypass
+    context.flags.bypass || process.env.HEROKU_FORCE === '1'
   )
   response = JSON.parse(response)
   cli.log(
@@ -25,33 +25,10 @@ module.exports = {
   help: `Examples:
     $ heroku skynet:suspend:app -a test-app -c "category" -n "helpful suspend message"`,
   flags: [
-    {
-      name: 'app',
-      char: 'a',
-      description: 'app to suspend',
-      hasValue: true,
-      required: true
-    },
-    {
-      name: 'notes',
-      char: 'n',
-      description: 'suspend notes',
-      hasValue: true,
-      required: true
-    },
-    {
-      name: 'category',
-      char: 'c',
-      description: 'suspension category',
-      hasValue: true,
-      required: true
-    },
-    {
-      name: 'bypass',
-      description: 'force suspension',
-      hasValue: false,
-      required: false
-    }
+    { name: 'app', char: 'a', description: 'app to suspend', hasValue: true, required: true },
+    { name: 'notes', char: 'n', description: 'suspend notes', hasValue: true, required: true },
+    { name: 'category', char: 'c', description: 'suspension category', hasValue: true, required: true },
+    { name: 'bypass', description: 'force suspension, bypassing skynet safety checks', hasValue: false, required: false }
   ],
   run: command(run)
 }

package/commands/suspend/user.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
@@ -20,8 +20,9 @@ async function run (context) {
   const file = context.flags.infile
   const notes = context.flags.notes
   const category = context.flags.category
-  const force = context.flags.bypass
+  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}`)
 
@@ -69,10 +70,11 @@ module.exports = {
     { name: 'infile', char: 'i', description: 'file of users to suspend', 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: 'bypass the allowlist', hasValue: false, required: false },
+    { 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/commands/suspensions.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../lib/command')
 const sudo = require('../lib/sudo')
 const SkynetAPI = require('../lib/skynet')

package/commands/unsuspend/apps.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')

package/commands/unsuspend/user.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')

package/commands/userpass/add.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const SkynetAPI = require('../../lib/skynet')
 

package/commands/userpass/remove.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 const command = require('../../lib/command')
 const SkynetAPI = require('../../lib/skynet')
 

package/index.js

@@ -13,7 +13,9 @@ exports.commands = [
   require('./commands/unsuspend/apps.js'),
   require('./commands/unsuspend/user.js'),
   require('./commands/deprovision.js'),
-  require('./commands/categories.js'),
+  require('./commands/categories/add.js'),
+  require('./commands/categories/get.js'),
+  require('./commands/categories/remove.js'),
   require('./commands/allowlist/add.js'),
   require('./commands/allowlist/remove.js'),
   require('./commands/allowlists.js'),

package/lib/command.js

@@ -1,4 +1,4 @@
-const cli = require('heroku-cli-util')
+const cli = require('@heroku/heroku-cli-util')
 
 module.exports = fn =>
   cli.command((context, client) =>

package/lib/skynet.js

@@ -32,6 +32,23 @@ module.exports = class SkynetAPI {
     })
   }
 
+  addCategory (name, description) {
+    const body = {
+      category: name,
+      description: description
+    }
+    return this.request('/categories', {
+      method: 'POST',
+      form: body
+    })
+  }
+
+  removeCategory (name) {
+    return this.request(`/categories/${name}`, {
+      method: 'DELETE'
+    })
+  }
+
   allowlists () {
     return this.request('/whitelist', {
       method: 'GET'
@@ -46,16 +63,14 @@ module.exports = class SkynetAPI {
 
     return this.request('/whitelist', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
   removeAllowlist (appOrUserEmail) {
     return this.request(`/whitelist/${appOrUserEmail}`, {
       method: 'DELETE',
-      body: {},
-      json: true
+      json: {}
     })
   }
 
@@ -67,8 +82,7 @@ module.exports = class SkynetAPI {
 
     return this.request('/userpass/remove', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
@@ -80,24 +94,23 @@ module.exports = class SkynetAPI {
 
     return this.request('/userpass/add', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
-  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', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
@@ -112,45 +125,42 @@ module.exports = class SkynetAPI {
 
     return this.request('/suspend/app', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
   unsuspendApp (app, category, notes) {
     return this.request(`/suspensions/app/${app}?category=${category}&reason=${notes}`, {
       method: 'DELETE',
-      body: {},
-      json: true
+      json: {}
     })
   }
 
-  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', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
   unsuspendUser (user, category, notes) {
     return this.request(`/suspensions/user/${user}?category=${category}&reason=${notes}`, {
       method: 'DELETE',
-      body: {},
-      json: true
+      json: {}
     })
   }
 
-  bulkSuspendUsers (users, notes, category, notify, force = false) {
+  bulkSuspendUsers (users, notes, category, notify, force = false, deprovision = false) {
     const body = {
       value: users,
       reason: notes,
@@ -158,29 +168,29 @@ module.exports = class SkynetAPI {
       category: category,
       bulk: 'true',
       force: force,
-      notify: notify
+      notify: notify,
+      deprovision: deprovision
     }
 
     return this.request('/suspend/user', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
-  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', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 
@@ -196,8 +206,7 @@ module.exports = class SkynetAPI {
 
     return this.request('/deprovision', {
       method: 'POST',
-      body: body,
-      form: true
+      form: body
     })
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",
@@ -21,8 +21,8 @@
     "npm": ">=10"
   },
   "dependencies": {
-    "got": "^9.6.0",
-    "heroku-cli-util": "^6.2.8",
+    "@heroku/heroku-cli-util": "^8.0.12",
+    "got": "^11.8.5",
     "split": "^1.0.0"
   },
   "devDependencies": {
@@ -31,7 +31,7 @@
     "mocha": "^9.2.2",
     "mockdate": "^2.0.1",
     "nock": "^12.0.3",
-    "np": "^7.6.3",
+    "np": "^10.0.5",
     "standard": "^16.0.4",
     "unexpected": "^12.0.3"
   },