heroku 11.0.0-alpha.10 → 11.0.0-alpha.12

package/lib/lib/pg/util.js

@@ -1,218 +1,104 @@
-export {};
-/*
-import color from '@heroku-cli/color'
-import type {AddOnAttachment} from '@heroku-cli/schema'
-import {ux} from '@oclif/core'
-import debug from 'debug'
-import {renderAttachment} from '../../commands/addons'
-import {multiSortCompareFn} from '../utils/multisort'
-import {getBastion} from './bastion'
-import type {AddOnAttachmentWithConfigVarsAndPlan, CredentialsInfo} from './types'
-import {env} from 'process'
-import {Server} from 'net'
-
-export function getConfigVarName(configVars: string[]): string {
-  const connStringVars = configVars.filter(cv => (cv.endsWith('_URL')))
-  if (connStringVars.length === 0) throw new Error('Database URL not found for this addon')
-  return connStringVars[0]
+import { color, hux, utils, } from '@heroku/heroku-cli-util';
+import { renderAttachment } from '../../commands/addons/index.js';
+import { multiSortCompareFn } from '../utils/multisort.js';
+export function essentialPlan(addon) {
+    return utils.pg.isEssentialDatabase(addon) || utils.pg.isLegacyEssentialDatabase(addon);
 }
-
-export const essentialNumPlan = (addon: AddOnAttachmentWithConfigVarsAndPlan) => Boolean(addon?.plan?.name?.split(':')[1].match(/^essential/))
-export const legacyEssentialPlan = (addon: AddOnAttachmentWithConfigVarsAndPlan) => Boolean(addon?.plan?.name?.split(':')[1].match(/(dev|basic|mini)$/))
-
-export function essentialPlan(addon: AddOnAttachmentWithConfigVarsAndPlan) {
-  return essentialNumPlan(addon) || legacyEssentialPlan(addon)
+export function formatResponseWithCommands(response) {
+    return response.replaceAll(/`(.*?)`/g, (_, word) => color.code(word));
 }
-
-export function getConfigVarNameFromAttachment(attachment: Required<AddOnAttachment & {
-  addon: AddOnAttachmentWithConfigVarsAndPlan
-}>, config: Record<string, string> = {}): string {
-  const configVars = attachment.config_vars?.filter((cv: string) => {
-    return config[cv]?.startsWith('postgres://')
-  }) ?? []
-  if (configVars.length === 0) {
-    ux.error(`No config vars found for ${attachment.name}; perhaps they were removed as a side effect of ${color.cmd('heroku rollback')}? Use ${color.cmd('heroku addons:attach')} to create a new attachment and then ${color.cmd('heroku addons:detach')} to remove the current attachment.`)
-  }
-
-  const configVarName = `${attachment.name}_URL`
-  if (configVars.includes(configVarName) && configVarName in config) {
-    return configVarName
-  }
-
-  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 = [
-    (a: Required<AddOnAttachment>, b: Required<AddOnAttachment>) => {
-      const fa = isForeignApp(a)
-      const fb = isForeignApp(b)
-      return fa < fb ? -1 : (fb < fa ? 1 : 0)
-    },
-    (a: Required<AddOnAttachment>, b: Required<AddOnAttachment>) => a.name.localeCompare(b.name),
-    (a: Required<AddOnAttachment>, b: Required<AddOnAttachment>) => a.app?.name?.localeCompare(b.app?.name ?? '') ?? 0,
-  ]
-  credAttachments.sort(multiSortCompareFn(comparators))
-  // render each attachment under the credential
-  const attLines = credAttachments.map(function (attachment, idx) {
-    const isLast = (idx === credAttachments.length - 1)
-    return renderAttachment(attachment, app, isLast)
-  })
-
-  const rotationLines = []
-  const credentialStore = credentials.find(a => a.name === cred)
-  if (credentialStore?.state === 'rotating') {
-    const formatted = credentialStore?.credentials.map(credential => {
-      return {
-        user: credential.user,
-        state: credential.state,
-        connections: credential.connections,
-      }
-    })
-    // eslint-disable-next-line no-eq-null, eqeqeq
-    const connectionInformationAvailable = formatted.some(c => c.connections != null)
-    if (connectionInformationAvailable) {
-      const prefix = '       '
-      rotationLines.push(`${prefix}Usernames currently active for this credential:`)
-      ux.table(formatted, {
-        user: {
-          get(row: typeof formatted[0]) {
-            return `${prefix}${row.user}`
-          },
-        },
-        state: {
-          get(row) {
-            return row.state === 'revoking' ? 'waiting for no connections to be revoked' : row.state
-          },
-        },
-        connections: {
-          get(row) {
-            return `${row.connections} connections`
-          },
+export function presentCredentialAttachments(app, credAttachments, credentials, cred) {
+    const isForeignApp = (attOrAddon) => attOrAddon.app.name === app ? 0 : 1;
+    const comparators = [
+        (a, b) => {
+            const fa = isForeignApp(a);
+            const fb = isForeignApp(b);
+            return fa < fb ? -1 : (fb < fa ? 1 : 0);
         },
-      }, {
-        'no-header': true,
-        printLine(line: unknown): void {
-          rotationLines.push(line)
-        },
-      })
+        (a, b) => a.name.localeCompare(b.name),
+        (a, b) => a.app?.name?.localeCompare(b.app?.name ?? '') ?? 0,
+    ];
+    credAttachments.sort(multiSortCompareFn(comparators));
+    // render each attachment under the credential
+    const attLines = credAttachments.map((attachment, idx) => {
+        const isLast = (idx === credAttachments.length - 1);
+        return renderAttachment(attachment, app, isLast);
+    });
+    const rotationLines = [];
+    const credentialStore = credentials.find(a => a.name === cred);
+    if (credentialStore?.state === 'rotating') {
+        const formatted = credentialStore?.credentials.map(credential => ({
+            connections: credential.connections,
+            state: credential.state,
+            user: credential.user,
+        }));
+        // eslint-disable-next-line no-eq-null, eqeqeq
+        const connectionInformationAvailable = formatted.some(c => c.connections != null);
+        if (connectionInformationAvailable) {
+            const prefix = '       ';
+            rotationLines.push(`${prefix}Usernames currently active for this credential:`);
+            const printLine = (line) => {
+                rotationLines.push(line);
+            };
+            hux.table(formatted, {
+                connections: {
+                    get(row) {
+                        return `${row.connections} connections`;
+                    },
+                },
+                state: {
+                    get(row) {
+                        return row.state === 'revoking' ? 'waiting for no connections to be revoked' : row.state;
+                    },
+                },
+                user: {
+                    get(row) {
+                        return `${prefix}${row.user}`;
+                    },
+                },
+            }, {
+                printLine,
+            });
+        }
     }
-  }
-
-  return [cred, ...attLines, ...rotationLines].join('\n')
-}
-
-export type ConnectionDetails = {
-  user: string
-  password: string
-  database: string
-  host: string
-  port: string
-  pathname: string
-  url: string
-  bastionKey?: string
-  bastionHost?: string
-  _tunnel?: Server
+    return [cred, ...attLines, ...rotationLines].join('\n');
 }
-
-export type ConnectionDetailsWithAttachment = ConnectionDetails & {
-  attachment: Required<AddOnAttachment & {addon: AddOnAttachmentWithConfigVarsAndPlan}>
-}
-
-export const getConnectionDetails = (attachment: Required<AddOnAttachment & {
-  addon: AddOnAttachmentWithConfigVarsAndPlan
-}>, configVars: Record<string, string> = {}): ConnectionDetailsWithAttachment => {
-  const connStringVar = getConfigVarNameFromAttachment(attachment, configVars)
-
-  // remove _URL from the end of the config var name
-  const baseName = connStringVar.slice(0, -4)
-
-  // build the default payload for non-bastion dbs
-  debug(`Using "${connStringVar}" to connect to your database…`)
-
-  const conn = parsePostgresConnectionString(configVars[connStringVar])
-
-  const payload: ConnectionDetailsWithAttachment = {
-    user: conn.user,
-    password: conn.password,
-    database: conn.database,
-    host: conn.host,
-    port: conn.port,
-    pathname: conn.pathname,
-    url: conn.url,
-    attachment,
-  }
-
-  // If bastion creds exist, graft it into the payload
-  const bastion = getBastion(configVars, baseName)
-  if (bastion) {
-    Object.assign(payload, bastion)
-  }
-
-  return payload
-}
-
-export const bastionKeyPlan = (a: AddOnAttachmentWithConfigVarsAndPlan) => Boolean(a.plan.name.match(/private/))
-
-export const configVarNamesFromValue = (config: Record<string, string>, value: string) => {
-  const keys: string[] = []
-  for (const key of Object.keys(config)) {
-    const configVal = config[key]
-    if (configVal === value) {
-      keys.push(key)
-    } else if (configVal.startsWith('postgres://')) {
-      try {
-        const configURL = new URL(configVal)
-        const ourURL = new URL(value)
-        const components: (keyof URL)[] = ['protocol', 'hostname', 'port', 'pathname']
-        if (components.every(component => ourURL[component] === configURL[component])) {
-          keys.push(key)
+export const configVarNamesFromValue = (config, value) => {
+    const keys = [];
+    for (const key of Object.keys(config)) {
+        const configVal = config[key];
+        if (configVal === value) {
+            keys.push(key);
+        }
+        else if (configVal.startsWith('postgres://')) {
+            try {
+                const configURL = new URL(configVal);
+                const ourURL = new URL(value);
+                const components = ['protocol', 'hostname', 'port', 'pathname'];
+                if (components.every(component => ourURL[component] === configURL[component])) {
+                    keys.push(key);
+                }
+            }
+            catch {
+                // ignore -- this is not a valid URL so not a matching URL
+            }
         }
-      } catch {
-        // ignore -- this is not a valid URL so not a matching URL
-      }
     }
-  }
-
-  const comparator = (a: string, b: string) => {
-    const isDatabaseUrlA = Number(a === 'DATABASE_URL')
-    const isDatabaseUrlB = Number(b === 'DATABASE_URL')
-    return isDatabaseUrlA < isDatabaseUrlB ? -1 : (isDatabaseUrlB < isDatabaseUrlA ? 1 : 0)
-  }
-
-  return keys.sort(comparator)
-}
-
-export const databaseNameFromUrl = (uri: string, config: Record<string, string>) => {
-  const names = configVarNamesFromValue(config, uri)
-  let name = names.pop()
-  while (names.length > 0 && name === 'DATABASE_URL') name = names.pop()
-  if (name) {
-    return color.configVar(name.replace(/_URL$/, ''))
-  }
-
-  const conn = parsePostgresConnectionString(uri)
-  return `${conn.host}:${conn.port}${conn.pathname}`
-}
-
-export const parsePostgresConnectionString = (db: string): ConnectionDetails => {
-  const dbPath = db.match(/:\/\//) ? db : `postgres:///${db}`
-  const url = new URL(dbPath)
-  const {username, password, hostname, pathname, port} = url
-
-  return {
-    user: username,
-    password,
-    database: pathname.charAt(0) === '/' ? pathname.slice(1) : pathname,
-    host: hostname,
-    port: port || env.PGPORT || (hostname && '5432'),
-    pathname,
-    url: dbPath,
-  }
-}
-*/
+    const comparator = (a, b) => {
+        const isDatabaseUrlA = Number(a === 'DATABASE_URL');
+        const isDatabaseUrlB = Number(b === 'DATABASE_URL');
+        return isDatabaseUrlA < isDatabaseUrlB ? -1 : (isDatabaseUrlB < isDatabaseUrlA ? 1 : 0);
+    };
+    return keys.sort(comparator);
+};
+export const databaseNameFromUrl = (uri, config) => {
+    const names = configVarNamesFromValue(config, uri);
+    let name = names.pop();
+    while (names.length > 0 && name === 'DATABASE_URL')
+        name = names.pop();
+    if (name) {
+        return color.name(name.replace(/_URL$/, ''));
+    }
+    const conn = utils.pg.DatabaseResolver.parsePostgresConnectionString(uri);
+    return `${conn.host}:${conn.port}${conn.pathname}`;
+};

package/lib/lib/pipelines/disambiguate.js

@@ -1,6 +1,6 @@
 import inquirer from 'inquirer';
-import { uuidValidate } from '../utils/uuid-validate.js';
 import { findPipelineByName, getPipeline, } from '../api.js';
+import { uuidValidate } from '../utils/uuid-validate.js';
 export default async function disambiguate(heroku, pipelineIDOrName) {
     let pipeline;
     if (uuidValidate(pipelineIDOrName)) {
@@ -17,20 +17,18 @@ export default async function disambiguate(heroku, pipelineIDOrName) {
         }
         else {
             // Disambiguate
-            const choices = pipelines.map(x => {
-                return {
-                    name: new Date(x.created_at).toString(),
-                    value: x,
-                };
-            });
+            const choices = pipelines.map(x => ({
+                name: new Date(x.created_at).toString(),
+                value: x,
+            }));
             const questions = [{
-                    type: 'list',
-                    name: 'pipeline',
-                    message: `Which ${pipelineIDOrName} pipeline?`,
                     choices,
+                    message: `Which ${pipelineIDOrName} pipeline?`,
+                    name: 'pipeline',
+                    type: 'list',
                 }];
             // eslint-disable-next-line no-async-promise-executor
-            pipeline = await new Promise(async function (resolve, reject) {
+            pipeline = await new Promise(async (resolve, reject) => {
                 const answers = await inquirer.prompt(questions);
                 if (answers.pipeline) {
                     resolve(answers.pipeline);

package/lib/lib/pipelines/ownership.d.ts

@@ -2,4 +2,4 @@ import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
 import { AppWithPipelineCoupling } from '../api.js';
 export declare function warnMixedOwnership(pipelineApps: Array<AppWithPipelineCoupling>, pipeline: Heroku.Pipeline, owner: string): void;
-export declare function getOwner(heroku: APIClient, apps: Array<AppWithPipelineCoupling>, pipeline: Heroku.Pipeline): Promise<any>;
+export declare function getOwner(heroku: APIClient, apps: Array<AppWithPipelineCoupling>, pipeline: Heroku.Pipeline): Promise<string>;

package/lib/lib/pipelines/ownership.js

@@ -1,16 +1,14 @@
-import { color } from '@heroku-cli/color';
+import { color } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core';
 import { getTeam } from '../api.js';
 export function warnMixedOwnership(pipelineApps, pipeline, owner) {
-    const hasMixedOwnership = pipelineApps.some(app => {
-        return (app.owner && app.owner.id) !== pipeline.owner.id;
-    });
+    const hasMixedOwnership = pipelineApps.some(app => (app.owner && app.owner.id) !== pipeline.owner.id);
     if (hasMixedOwnership) {
         ux.stdout();
-        let message = `Some apps in this pipeline do not belong to ${color.cmd(owner)}.`;
+        let message = `Some apps in this pipeline do not belong to ${color.team(owner)}.`;
         message += '\n\nAll apps in a pipeline must have the same owner as the pipeline owner.';
         message += '\nTransfer these apps or change the pipeline owner in pipeline settings.';
-        message += `\nSee ${color.cyan('https://devcenter.heroku.com/articles/pipeline-ownership-transition')} for more info.`;
+        message += `\nSee ${color.info('https://devcenter.heroku.com/articles/pipeline-ownership-transition')} for more info.`;
         ux.warn(message);
     }
 }
@@ -21,15 +19,11 @@ export function getOwner(heroku, apps, pipeline) {
         ownerPromise = getTeam(heroku, pipeline.owner.id).then(response => response.body);
     }
     else {
-        const app = apps.find(app => {
-            return app.owner ? app.owner.id === pipeline.owner.id : false;
-        });
+        const app = apps.find(app => (app.owner ? app.owner.id === pipeline.owner.id : false));
         // If pipeline owner doesn't own any application and type is user (unlikely)
         // We return the uuid as default
         owner = app ? app.owner && app.owner.email : pipeline.owner.id;
         ownerPromise = Promise.resolve(owner);
     }
-    return ownerPromise.then(owner => {
-        return owner.name ? `${owner.name} (team)` : owner;
-    });
+    return ownerPromise.then(owner => (owner.name ? `${color.team(owner.name)} (team)` : color.user(owner)));
 }

package/lib/lib/pipelines/render-pipeline.d.ts

@@ -1,7 +1,7 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
 import { AppWithPipelineCoupling } from '../api.js';
-export default function renderPipeline(heroku: APIClient, pipeline: Heroku.Pipeline, pipelineApps: Array<AppWithPipelineCoupling>, { withOwners, showOwnerWarning }?: {
-    withOwners: boolean;
+export default function renderPipeline(heroku: APIClient, pipeline: Heroku.Pipeline, pipelineApps: Array<AppWithPipelineCoupling>, { showOwnerWarning, withOwners }?: {
     showOwnerWarning: boolean;
+    withOwners: boolean;
 }): Promise<void>;

package/lib/lib/pipelines/render-pipeline.js

@@ -1,40 +1,41 @@
-import { color } from '@heroku-cli/color';
+import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core';
-import { hux } from '@heroku/heroku-cli-util';
 import { getOwner, warnMixedOwnership } from './ownership.js';
 export default async function renderPipeline(heroku, pipeline, pipelineApps, 
 // eslint-disable-next-line unicorn/no-object-as-default-parameter
-{ withOwners, showOwnerWarning } = { withOwners: false, showOwnerWarning: false }) {
-    hux.styledHeader(pipeline.name);
+{ showOwnerWarning, withOwners } = { showOwnerWarning: false, withOwners: false }) {
+    hux.styledHeader(color.pipeline(pipeline.name));
     let owner;
     if (pipeline.owner) {
         owner = await getOwner(heroku, pipelineApps, pipeline);
         ux.stdout(`owner: ${owner}`);
     }
     ux.stdout('');
+    /* eslint-disable perfectionist/sort-objects */
     const columns = {
         name: {
-            header: 'app name',
             get(row) {
                 return color.app(row.name || '');
             },
+            header: 'app name',
         },
         'coupling.stage': {
-            header: 'stage',
             get(row) {
                 return row.pipelineCoupling.stage;
             },
+            header: 'stage',
         },
     };
+    /* eslint-enable perfectionist/sort-objects */
     if (withOwners) {
         columns['owner.email'] = {
-            header: 'owner',
             get(row) {
                 const email = row.owner && row.owner.email;
                 if (email) {
-                    return email.endsWith('@herokumanager.com') ? `${email.split('@')[0]} (team)` : email;
+                    return email.endsWith('@herokumanager.com') ? `${color.team(email.split('@')[0])} (team)` : color.user(email);
                 }
             },
+            header: 'owner',
         };
     }
     const sortByName = (a, b) => {
@@ -58,7 +59,7 @@ export default async function renderPipeline(heroku, pipeline, pipelineApps,
         .sort(sortByName);
     const apps = developmentApps.concat(reviewApps).concat(stagingApps).concat(productionApps);
     hux.table(apps, columns);
-    if (showOwnerWarning && pipeline.owner) {
+    if (showOwnerWarning && pipeline.owner && owner) {
         warnMixedOwnership(pipelineApps, pipeline, owner);
     }
 }

package/lib/lib/pipelines/setup/create-apps.js

@@ -2,12 +2,12 @@ import { ux } from '@oclif/core';
 import { createAppSetup } from '../../api.js';
 function createApp(heroku, { archiveURL, name, organization, pipeline, stage }) {
     const params = {
-        source_blob: { url: archiveURL },
         app: { name },
         pipeline_coupling: {
-            stage,
             pipeline: pipeline.id,
+            stage,
         },
+        source_blob: { url: archiveURL },
     };
     if (organization) {
         params.app.organization = organization;
@@ -20,22 +20,20 @@ function createApp(heroku, { archiveURL, name, organization, pipeline, stage })
 export default function createApps(heroku, archiveURL, pipeline, pipelineName, stagingAppName, organization) {
     const prodAppSetupPromise = createApp(heroku, {
         archiveURL,
-        pipeline,
         name: pipelineName,
-        stage: 'production',
         organization,
+        pipeline,
+        stage: 'production',
     });
     const stagingAppSetupPromise = createApp(heroku, {
         archiveURL,
-        pipeline,
         name: stagingAppName,
-        stage: 'staging',
         organization,
+        pipeline,
+        stage: 'staging',
     });
     const promises = [prodAppSetupPromise, stagingAppSetupPromise];
-    return Promise.all(promises).then(appSetups => {
-        return appSetups;
-    }, error => {
+    return Promise.all(promises).then(appSetups => appSetups, error => {
         ux.error(error, { exit: 1 });
     });
 }

package/lib/lib/pipelines/setup/get-ci-settings.js

@@ -1,4 +1,4 @@
-// import {hux} from '@heroku/heroku-cli-util'
+import { hux } from '@heroku/heroku-cli-util';
 export default async function getCISettings(yes, organization) {
     const settings = {
         ci: true,
@@ -8,7 +8,7 @@ export default async function getCISettings(yes, organization) {
         delete settings.organization;
         return settings;
     }
-    // settings.ci = await hux.confirm('Enable automatic Heroku CI test runs?')
+    settings.ci = await hux.confirm('Enable automatic Heroku CI test runs?');
     if (settings.ci && organization) {
         settings.organization = organization;
     }

package/lib/lib/pipelines/setup/get-github-token.js

@@ -1,7 +1,5 @@
 export default function getGitHubToken(kolkrabbi) {
-    return kolkrabbi.getAccount().then((account) => {
-        return account.github.token;
-    }, () => {
+    return kolkrabbi.getAccount().then((account) => account.github.token, () => {
         throw new Error('Account not connected to GitHub.');
     });
 }

package/lib/lib/pipelines/setup/get-name-and-repo.js

@@ -1,3 +1,6 @@
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { pipelineName, repoName } from './validate.js';
 function filter(obj) {
     const ret = {};
     Object.keys(obj)
@@ -12,28 +15,30 @@ export default async function getNameAndRepo(args) {
         name: '',
         repo: '',
     };
-    // if (!args.name) {
-    //   const name = await hux.prompt('Pipeline name', {
-    //     required: true,
-    //   })
-    //   const [valid, msg] = pipelineName(name)
-    //   if (valid) {
-    //     answer.name = name
-    //   } else {
-    //     ux.error(msg as string)
-    //   }
-    // }
-    // if (!args.repo) {
-    //   const repo = await hux.prompt('GitHub repository to connect to (e.g. rails/rails)', {
-    //     required: true,
-    //   })
-    //   const [valid, msg] = repoName(repo)
-    //   if (valid) {
-    //     answer.repo = repo
-    //   } else {
-    //     ux.error(msg as string)
-    //   }
-    // }
+    if (!args.name) {
+        const name = await hux.prompt('Pipeline name', {
+            required: true,
+        });
+        const [valid, msg] = pipelineName(name);
+        if (valid) {
+            answer.name = name;
+        }
+        else {
+            ux.error(msg);
+        }
+    }
+    if (!args.repo) {
+        const repo = await hux.prompt('GitHub repository to connect to (e.g. rails/rails)', {
+            required: true,
+        });
+        const [valid, msg] = repoName(repo);
+        if (valid) {
+            answer.repo = repo;
+        }
+        else {
+            ux.error(msg);
+        }
+    }
     const reply = Object.assign(filter(answer), filter(args));
     reply.name = reply.name.toLowerCase().replace(/\s/g, '-');
     return reply;

package/lib/lib/pipelines/setup/get-settings.js

@@ -1,4 +1,4 @@
-// import {hux} from '@heroku/heroku-cli-util'
+import { hux } from '@heroku/heroku-cli-util';
 const DEFAULT_SETTINGS = {
     auto_deploy: true,
     wait_for_ci: true,
@@ -21,16 +21,16 @@ export default async function getSettings(yes, branch) {
             auto_destroy: true,
         },
     };
-    // settings.auto_deploy = await hux.confirm(`Automatically deploy the ${branch} branch to staging?`)
-    // if (settings.auto_deploy) {
-    //   settings.wait_for_ci = await hux.confirm(`Wait for CI to pass before deploying the ${branch} branch to staging?`)
-    // }
-    // settings.pull_requests.enabled = await hux.confirm('Enable review apps?')
-    // if (settings.pull_requests.enabled) {
-    //   settings.pull_requests.auto_deploy = await hux.confirm('Automatically create review apps for every PR?')
-    // }
-    // if (settings.pull_requests.enabled) {
-    //   settings.pull_requests.auto_destroy = await hux.confirm('Automatically destroy idle review apps after 5 days?')
-    // }
+    settings.auto_deploy = await hux.confirm(`Automatically deploy the ${branch} branch to staging?`);
+    if (settings.auto_deploy) {
+        settings.wait_for_ci = await hux.confirm(`Wait for CI to pass before deploying the ${branch} branch to staging?`);
+    }
+    settings.pull_requests.enabled = await hux.confirm('Enable review apps?');
+    if (settings.pull_requests.enabled) {
+        settings.pull_requests.auto_deploy = await hux.confirm('Automatically create review apps for every PR?');
+    }
+    if (settings.pull_requests.enabled) {
+        settings.pull_requests.auto_destroy = await hux.confirm('Automatically destroy idle review apps after 5 days?');
+    }
     return settings;
 }

package/lib/lib/pipelines/setup/poll-app-setups.js

@@ -1,6 +1,6 @@
-import * as api from '../../api.js';
+import { color } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core';
-import { color } from '@heroku-cli/color';
+import * as api from '../../api.js';
 function wait(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -13,9 +13,7 @@ function pollAppSetup(heroku, appSetup) {
             throw new Error(`Couldn't create application ${color.app(setup.app.name)}: ${setup.failure_message}`);
         }
         return wait(1000).then(() => pollAppSetup(heroku, appSetup));
-    }).catch((error) => {
-        return ux.error(error, { exit: 1 });
-    });
+    }).catch((error) => ux.error(error, { exit: 1 }));
 }
 export default function pollAppSetups(heroku, appSetups) {
     return Promise.all(appSetups.map((appSetup) => pollAppSetup(heroku, appSetup)));