Merge branch 'v11.0.0' into sbosio/reconcile-util-functions

Author: sbosio

package-lock.json

@@ -1,11 +1,13 @@
-
 import {color} from '@heroku/heroku-cli-util'
 import {Command, flags} from '@heroku-cli/command'
+import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
 import createAddon from '../../lib/addons/create_addon.js'
+import * as util from '../../lib/addons/util.js'
 import notify from '../../lib/notify.js'
+
 const heredoc = tsheredoc.default
 
 function parseConfig(args: string[]) {
@@ -46,9 +48,9 @@ export default class Create extends Command {
   }
 
   static description = heredoc`
-  Create a new add-on resource.
+    Create a new add-on resource.
 
-  In order to add additional config items, please place them at the end of the command after a double-dash (--).
+    In order to add additional config items, please place them at the end of the command after a double-dash (--).
   `
 
   static examples = [
@@ -76,15 +78,13 @@ export default class Create extends Command {
 
   static strict = false
 
-  static topic = 'addons'
-
   public async run(): Promise<void> {
     this.allowArbitraryFlags = true
     const {args, flags, ...restParse} = await this.parse(Create)
     const {app, as, confirm, name, wait} = flags
     const servicePlan = args['service:plan']
-    const argv = (restParse.argv as string[])
     // oclif duplicates specified args in argv
+    const argv = (restParse.argv as string[])
       .filter(arg => arg !== servicePlan)
 
     if (restParse.nonExistentFlags && restParse.nonExistentFlags.length > 0) {
@@ -93,9 +93,9 @@ export default class Create extends Command {
     }
 
     const config = parseConfig(argv)
-    let addon
+    let addon: Heroku.AddOn
     try {
-      addon = await createAddon(this.heroku, app, servicePlan, confirm, wait, {config, name, as})
+      addon = await createAddon(this.heroku, app, servicePlan, confirm, wait, {as, config, name})
       if (wait) {
         Create.notifier(`heroku addons:create ${addon.name}`, 'Add-on successfully provisioned')
       }
@@ -109,6 +109,6 @@ export default class Create extends Command {
 
     await this.config.runHook('recache', {addon, app, type: 'addon'})
     // eslint-disable-next-line no-unsafe-optional-chaining
-    ux.stdout(`Use ${color.code('heroku addons:docs ' + addon?.addon_service?.name || '')} to view documentation`)
+    ux.stdout(`Run ${color.code('heroku addons:docs ' + addon?.addon_service?.name || '')} to view documentation.`)
   }
 }

packages/cli/src/commands/addons/create.ts

@@ -1,11 +1,10 @@
-import {color} from '@heroku/heroku-cli-util'
+import {color, utils} from '@heroku/heroku-cli-util'
 import {Command, flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 import {Args} from '@oclif/core'
 import _ from 'lodash'
 
 import destroyAddon from '../../lib/addons/destroy_addon.js'
-import {resolveAddon} from '../../lib/addons/resolve.js'
 import ConfirmCommand from '../../lib/confirmCommand.js'
 import notify from '../../lib/notify.js'
 
@@ -36,8 +35,9 @@ export default class Destroy extends Command {
     const {argv, flags} = await this.parse(Destroy)
     const {app, confirm, wait} = flags
     const force = flags.force || process.env.HEROKU_FORCE === '1'
+    const addonResolver = new utils.AddonResolver(this.heroku)
 
-    const addons = await Promise.all(argv.map((name: string) => resolveAddon(this.heroku, app, name as string)))
+    const addons = await Promise.all(argv.map((name: string) => addonResolver.resolve(name as string, app)))
     for (const addon of addons) {
       // prevent deletion of add-on when context.app is set but the addon is attached to a different app
       const addonApp = addon.app?.name

packages/cli/src/commands/addons/destroy.ts

@@ -1,8 +1,8 @@
-/*
 import {Command, flags} from '@heroku-cli/command'
-import {Args} from '@oclif/core'
+import {Args, ux} from '@oclif/core'
 import {utils} from '@heroku/heroku-cli-util'
-import {nls} from '../../nls'
+
+import {nls} from '../../nls.js'
 
 const query = `
 WITH constants AS (
@@ -68,16 +68,16 @@ ORDER BY raw_waste DESC, bloat DESC
 `
 
 export default class Bloat extends Command {
-  static topic = 'pg';
-  static description = 'show table and index bloat in your database ordered by most wasteful';
+  static description = 'show table and index bloat in your database ordered by most wasteful'
+  static topic = 'pg'
+  static args = {
+    database: Args.string({description: `${nls('pg:database:arg:description')} ${nls('pg:database:arg:description:default:suffix')}`}),
+  }
+
   static flags = {
     app: flags.app({required: true}),
     remote: flags.remote(),
-  };
-
-  static args = {
-    database: Args.string({description: `${nls('pg:database:arg:description')} ${nls('pg:database:arg:description:default:suffix')}`}),
-  };
+  }
 
   public async run(): Promise<void> {
     const {flags, args} = await this.parse(Bloat)
@@ -86,7 +86,6 @@ export default class Bloat extends Command {
     const db = await dbResolver.getDatabase(app, args.database)
     const psqlService = new utils.pg.PsqlService(db)
     const output = await psqlService.execQuery(query)
-    process.stdout.write(output)
+    ux.stdout(output)
   }
 }
-*/