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

Author: sbosio

…kages/cli/src/oldCommands/pg/unfollow.ts packages/cli/src/commands/pg/unfollow.tspackages/cli/src/oldCommands/pg/unfollow.ts renamed to packages/cli/src/commands/pg/unfollow.ts packages/cli/src/oldCommands/pg/unfollow.ts renamed to packages/cli/src/commands/pg/unfollow.ts

@@ -1,18 +1,18 @@
-/*
-import color from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import * as Heroku from '@heroku-cli/schema'
-import {utils} from '@heroku/heroku-cli-util'
-import {databaseNameFromUrl} from '../../lib/pg/util'
-import confirmCommand from '../../lib/confirmCommand'
-import {PgDatabase} from '../../lib/pg/types'
-import heredoc from 'tsheredoc'
-import {nls} from '../../nls'
+import {utils, color} from '@heroku/heroku-cli-util'
+import {databaseNameFromUrl} from '../../lib/pg/util.js'
+import ConfirmCommand from '../../lib/confirmCommand.js'
+import {PgDatabase} from '../../lib/pg/types.js'
+import tsheredoc from 'tsheredoc'
+import {nls} from '../../nls.js'
+
+const heredoc = tsheredoc.default
 
 export default class Unfollow extends Command {
-  static topic = 'pg';
-  static description = 'stop a replica from following and make it a writeable database';
+  static topic = 'pg'
+  static description = 'stop a replica from following and make it a writeable database'
   static flags = {
     confirm: flags.string({char: 'c'}),
     app: flags.app({required: true}),
@@ -33,7 +33,7 @@ export default class Unfollow extends Command {
       ux.error(`${color.addon(db.name)} is not a follower`)
     const {body: configVars} = await this.heroku.get<Heroku.ConfigVars>(`/apps/${app}/config-vars`)
     const origin = databaseNameFromUrl(replica.following as string, configVars)
-    await confirmCommand(app, confirm, heredoc(`
+    await new ConfirmCommand().confirm(app, confirm, heredoc(`
       Destructive action
       ${color.addon(db.name)} will become writeable and no longer follow ${origin}. This cannot be undone.
     `))
@@ -42,4 +42,3 @@ export default class Unfollow extends Command {
     ux.action.stop()
   }
 }
-*/

…s/cli/src/oldCommands/pg/vacuum-stats.ts …ages/cli/src/commands/pg/vacuum-stats.tspackages/cli/src/oldCommands/pg/vacuum-stats.ts renamed to packages/cli/src/commands/pg/vacuum-stats.ts packages/cli/src/oldCommands/pg/vacuum-stats.ts renamed to packages/cli/src/commands/pg/vacuum-stats.ts

@@ -1,13 +1,14 @@
-/*
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import {utils} from '@heroku/heroku-cli-util'
-import heredoc from 'tsheredoc'
-import {nls} from '../../nls'
+import tsheredoc from 'tsheredoc'
+import {nls} from '../../nls.js'
+
+const heredoc = tsheredoc.default
 
 export default class VacuumStats extends Command {
-  static topic = 'pg';
-  static description = 'show dead rows and whether an automatic vacuum is expected to be triggered';
+  static topic = 'pg'
+  static description = 'show dead rows and whether an automatic vacuum is expected to be triggered'
   static flags = {
     app: flags.app({required: true}),
     remote: flags.remote(),
@@ -63,7 +64,6 @@ export default class VacuumStats extends Command {
       ORDER BY 1
     `)
     const output = await psqlService.execQuery(query)
-    ux.log(output)
+    ux.stdout(output)
   }
 }
-*/

packages/cli/src/oldCommands/pg/wait.ts packages/cli/src/commands/pg/wait.tspackages/cli/src/oldCommands/pg/wait.ts renamed to packages/cli/src/commands/pg/wait.ts

@@ -1,13 +1,11 @@
-/*
-import color from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import debug from 'debug'
-import {ExtendedAddonAttachment, utils} from '@heroku/heroku-cli-util'
-import notify from '../../lib/notify'
-import {PgStatus} from '../../lib/pg/types'
+import {utils, pg, color} from '@heroku/heroku-cli-util'
+import notify from '../../lib/notify.js'
+import {PgStatus} from '../../lib/pg/types.js'
 import {HTTPError} from '@heroku/http-call'
-import {nls} from '../../nls'
+import {nls} from '../../nls.js'
 
 const wait = (ms: number) => new Promise(resolve => {
   setTimeout(resolve, ms)
@@ -33,7 +31,7 @@ export default class Wait extends Command {
     const dbName = args.database
     const pgDebug = debug('pg')
 
-    const waitFor = async (db: ExtendedAddonAttachment['addon']) => {
+    const waitFor = async (db: pg.ExtendedAddonAttachment['addon']) => {
       let interval = waitInterval && Number.parseInt(waitInterval, 10)
       if (!interval || interval < 0) interval = 5
       let status
@@ -79,7 +77,7 @@ export default class Wait extends Command {
       }
     }
 
-    let dbs: ExtendedAddonAttachment['addon'][]
+    let dbs: pg.ExtendedAddonAttachment['addon'][]
     if (dbName) {
       const dbResolver = new utils.pg.DatabaseResolver(this.heroku)
       const {addon} = await dbResolver.getAttachment(app, dbName)
@@ -94,4 +92,3 @@ export default class Wait extends Command {
     }
   }
 }
-*/

packages/cli/src/oldCommands/pg/upgrade.ts

@@ -1,12 +1,10 @@
 import {stderr} from 'stdout-stderr'
 import nock from 'nock'
-// import Cmd from '../../../../src/commands/pg/unfollow'
+import Cmd from '../../../../src/commands/pg/unfollow.js'
 import runCommand from '../../../helpers/runCommand.js'
 import expectOutput from '../../../helpers/utils/expectOutput.js'
-import heredoc from 'tsheredoc'
 import * as fixtures from '../../../fixtures/addons/fixtures.js'
 
-/*
 describe('pg:unfollow', function () {
   const addon = fixtures.addons['dwh-db']
   const appName = 'myapp'
@@ -35,11 +33,6 @@ describe('pg:unfollow', function () {
       appName,
       'DATABASE',
     ])
-    expectOutput(stderr.output, heredoc(`
-      ${addon.name} unfollowing...
-      ${addon.name} unfollowing... done
-    `))
+    expectOutput(stderr.output, `${addon.name} unfollowing... done`)
   })
 })
-
-*/

packages/cli/test/unit/commands/pg/unfollow.unit.test.ts

@@ -1,25 +1,16 @@
+import Cmd from '../../../../src/commands/pg/wait.js'
 import {stdout, stderr} from 'stdout-stderr'
 import {expect} from 'chai'
 import nock from 'nock'
-import * as proxyquire from 'proxyquire'
-import heredoc from 'tsheredoc'
-// import {CLIError} from '@oclif/core/lib/errors'
+import {Errors} from '@oclif/core'
 import runCommand from '../../../helpers/runCommand.js'
 import expectOutput from '../../../helpers/utils/expectOutput.js'
 
 const all = [
   {id: 1, name: 'postgres-1', plan: {name: 'heroku-postgresql:hobby-dev'}},
   {id: 2, name: 'postgres-2', plan: {name: 'heroku-postgresql:hobby-dev'}},
 ]
-const fetcher =  {
-  all: () => Promise.resolve(all),
-}
 
-// const {default: Cmd} = proxyquire('../../../../src/commands/pg/wait', {
-//   '../../lib/pg/fetcher': fetcher,
-// })
-
-/*
 describe('pg:wait', function () {
   let pg: nock.Scope
   let api: nock.Scope
@@ -30,6 +21,7 @@ describe('pg:wait', function () {
   })
 
   afterEach(function () {
+    api.done()
     pg.done()
     nock.cleanAll()
   })
@@ -50,13 +42,13 @@ describe('pg:wait', function () {
       'DATABASE_URL',
     ])
     expect(stdout.output).to.equal('')
-    expectOutput(stderr.output, heredoc(`
-      Waiting for database postgres-1... pending
-      Waiting for database postgres-1... available
-    `))
+    expectOutput(stderr.output, 'Waiting for database postgres-1... available')
   })
 
   it('waits for all databases to be available', async function () {
+    api
+      .get('/apps/myapp/addon-attachments')
+      .reply(200, all.map(db => ({addon: db})))
     pg
       .get('/client/v11/databases/1/wait_status').reply(200, {'waiting?': false})
       .get('/client/v11/databases/2/wait_status').reply(200, {'waiting?': false})
@@ -70,14 +62,17 @@ describe('pg:wait', function () {
   })
 
   it('displays errors', async function () {
+    api
+      .get('/apps/myapp/addon-attachments')
+      .reply(200, [{addon: all[0]}])
     pg
       .get('/client/v11/databases/1/wait_status').reply(200, {'error?': true, message: 'this is an error message'})
 
     await runCommand(Cmd, [
       '--app',
       'myapp',
     ]).catch(error => {
-      const {message, oclif} = error as CLIError
+      const {message, oclif} = error as Errors.CLIError
       expect(message).to.equal('this is an error message')
       expect(oclif.exit).to.equal(1)
     })
@@ -99,11 +94,6 @@ describe('pg:wait', function () {
       'DATABASE_URL',
     ])
     expect(stdout.output).to.equal('')
-    expectOutput(stderr.output, heredoc(`
-      Waiting for database postgres-1... upgrading
-      Waiting for database postgres-1... available
-    `))
+    expectOutput(stderr.output, 'Waiting for database postgres-1... available')
   })
 })
-
-*/