format response

Author: nilamuthu

packages/cli/src/commands/pg/upgrade/prepare.ts

@@ -4,8 +4,8 @@ import {Args, ux} from '@oclif/core'
 import heredoc from 'tsheredoc'
 import {getAddon} from '../../../lib/pg/fetcher'
 import pgHost from '../../../lib/pg/host'
-import {legacyEssentialPlan, essentialNumPlan} from '../../../lib/pg/util'
-import {PgDatabase} from '../../../lib/pg/types'
+import {legacyEssentialPlan, essentialNumPlan, formatResponseWithCommands} from '../../../lib/pg/util'
+import {PgDatabase, PgUpgradeError, PgUpgradeResponse} from '../../../lib/pg/types'
 import confirmCommand from '../../../lib/confirmCommand'
 import {nls} from '../../../nls'
 
@@ -52,9 +52,14 @@ export default class Upgrade extends Command {
         This command prepares the upgrade for ${color.addon(db.name)} to the latest supported PostgreSQL version and schedules to upgrade it during the next available maintenance window.
       `))
 
-    const data = {version}
-    ux.action.start(`Preparing upgrade on ${color.addon(db.name)}`)
-    await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/prepare`, {hostname: pgHost(), body: data})
-    ux.action.stop(`done\nYour database is scheduled for upgrade during your next available maintenance window.\nRun ${color.cmd('heroku pg:upgrade:wait')} to track its status.\nYou can also run this upgrade manually before the maintenance window with ${color.cmd('heroku pg:upgrade:run')}. You can only run the upgrade after it's fully prepared, which can take up to a day.`)
+    try {
+      const data = {version}
+      ux.action.start(`Preparing upgrade on ${color.addon(db.name)}`)
+      const {body : response} = await this.heroku.post<PgUpgradeResponse>(`/client/v11/databases/${db.id}/upgrade/prepare`, {hostname: pgHost(), body: data})
+      ux.action.stop('done\n' + formatResponseWithCommands(response.message))
+    } catch (error) {
+      const response = error as PgUpgradeError
+      ux.error(formatResponseWithCommands(response.body.message) + `\n\nError ID: ${response.body.id}`)
+    }
   }
 }

packages/cli/src/lib/pg/types.ts

@@ -167,6 +167,18 @@ export type PgDatabaseTenant = {
 
 export type PgDatabase = PgDatabaseService & PgDatabaseTenant
 
+export type PgUpgradeResponse = {
+  message: string
+}
+
+export type PgUpgradeError = {
+  status: number,
+  body: {
+    id: string,
+    message: string,
+  }
+}
+
 export type AddOnWithPlan = Required<Heroku.AddOnAttachment['addon']> & {plan: Required<Heroku.AddOn['plan']>}
 export type AddOnAttachmentWithConfigVarsAndPlan = Required<Heroku.AddOnAttachment> & {
   config_vars: Heroku.AddOn['config_vars']

packages/cli/src/lib/pg/util.ts

@@ -40,6 +40,10 @@ export function getConfigVarNameFromAttachment(attachment: Required<AddOnAttachm
   return getConfigVarName(configVars)
 }
 
+export function formatResponseWithCommands(response: string): string {
+  return response.replace(/`(.*?)`/g, (_, word) => color.cmd(word))
+}
+
 export function presentCredentialAttachments(app: string, credAttachments: Required<AddOnAttachment>[], credentials: CredentialsInfo, cred: string) {
   const isForeignApp = (attOrAddon: Required<AddOnAttachment>) => attOrAddon.app.name === app ? 0 : 1
   const comparators = [