heroku 10.13.2-beta.0 → 10.13.3-beta.0

package/lib/commands/pg/settings/index.js

@@ -5,7 +5,7 @@ const core_1 = require("@oclif/core");
 const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const resolve_1 = require("../../../lib/addons/resolve");
 const util_1 = require("../../../lib/pg/util");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../../nls");
 class Index extends command_1.Command {
     async run() {
@@ -15,7 +15,7 @@ class Index extends command_1.Command {
         const db = await (0, resolve_1.addonResolver)(this.heroku, app, database || 'DATABASE_URL');
         if ((0, util_1.essentialPlan)(db))
             core_1.ux.error('You can’t perform this operation on Essential-tier databases.');
-        const { body: settings } = await this.heroku.get(`/postgres/v0/databases/${db.id}/config`, { hostname: (0, host_1.default)() });
+        const { body: settings } = await this.heroku.get(`/postgres/v0/databases/${db.id}/config`, { hostname: heroku_cli_util_2.utils.pg.host() });
         heroku_cli_util_1.hux.styledHeader(db.name);
         const remapped = {};
         Object.keys(settings).forEach(k => {

package/lib/commands/pg/unfollow.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
-const fetcher_1 = require("../../lib/pg/fetcher");
-const host_1 = require("../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../lib/pg/util");
 const confirmCommand_1 = require("../../lib/confirmCommand");
 const tsheredoc_1 = require("tsheredoc");
@@ -13,8 +12,9 @@ class Unfollow extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Unfollow);
         const { app, confirm } = flags;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, args.database);
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, args.database);
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if (!replica.following)
             core_1.ux.error(`${color_1.default.addon(db.name)} is not a follower`);
         const { body: configVars } = await this.heroku.get(`/apps/${app}/config-vars`);
@@ -24,7 +24,7 @@ class Unfollow extends command_1.Command {
       ${color_1.default.addon(db.name)} will become writeable and no longer follow ${origin}. This cannot be undone.
     `));
         core_1.ux.action.start(`${color_1.default.addon(db.name)} unfollowing`);
-        await this.heroku.put(`/client/v11/databases/${db.id}/unfollow`, { hostname: (0, host_1.default)() });
+        await this.heroku.put(`/client/v11/databases/${db.id}/unfollow`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

package/lib/commands/pg/upgrade/cancel.js

@@ -4,8 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
@@ -14,12 +13,13 @@ class Upgrade extends command_1.Command {
         const { flags, args } = await this.parse(Upgrade);
         const { app, confirm } = flags;
         const { database } = args;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, database);
         if ((0, util_1.legacyEssentialPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
         if ((0, util_1.essentialNumPlan)(db))
             core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:cancel')} on Essential-tier databases. You can only use this command on Standard-tier and higher leader databases.`);
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if (replica.following)
             core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:cancel')} on follower databases. You can only use this command on Standard-tier and higher leader databases.`);
         await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
@@ -30,7 +30,7 @@ class Upgrade extends command_1.Command {
     `));
         try {
             core_1.ux.action.start(`Cancelling upgrade on ${color_1.default.addon(db.name)}`);
-            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/cancel`, { hostname: (0, host_1.default)(), body: {} });
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/cancel`, { hostname: heroku_cli_util_1.utils.pg.host(), body: {} });
             core_1.ux.action.stop('done\n' + (0, util_1.formatResponseWithCommands)(response.body.message));
         }
         catch (error) {

package/lib/commands/pg/upgrade/dryrun.js

@@ -4,8 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
@@ -14,13 +13,14 @@ class Upgrade extends command_1.Command {
         const { flags, args } = await this.parse(Upgrade);
         const { app, version, confirm } = flags;
         const { database } = args;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, database);
         if ((0, util_1.legacyEssentialPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
         if ((0, util_1.essentialNumPlan)(db))
             core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:dryrun')} on Essential-tier databases. You can only use this command on Standard-tier and higher leader databases.`);
         const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if (replica.following)
             core_1.ux.error(`You can't use ${color_1.default.cmd('pg:upgrade:dryrun')} on follower databases. You can only use this command on Standard-tier and higher leader databases.`);
         await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
@@ -29,7 +29,7 @@ class Upgrade extends command_1.Command {
         try {
             const data = { version };
             core_1.ux.action.start(`Starting a test upgrade on ${color_1.default.addon(db.name)}`);
-            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/dry_run`, { hostname: (0, host_1.default)(), body: data });
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/dry_run`, { hostname: heroku_cli_util_1.utils.pg.host(), body: data });
             core_1.ux.action.stop('done\n' + (0, util_1.formatResponseWithCommands)(response.body.message));
         }
         catch (error) {

package/lib/commands/pg/upgrade/index.js

@@ -4,8 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
@@ -14,11 +13,12 @@ class Upgrade extends command_1.Command {
         const { flags, args } = await this.parse(Upgrade);
         const { app, version, confirm } = flags;
         const { database } = args;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, database);
         if ((0, util_1.legacyEssentialPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade')} on Essential-tier databases and follower databases on Standard-tier and higher plans.`);
         const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if (replica.following) {
             const { body: configVars } = await this.heroku.get(`/apps/${app}/config-vars`);
             const origin = (0, util_1.databaseNameFromUrl)(replica.following, configVars);
@@ -49,7 +49,7 @@ class Upgrade extends command_1.Command {
         try {
             const data = { version };
             core_1.ux.action.start(`Starting upgrade on ${color_1.default.addon(db.name)}`);
-            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade`, { hostname: (0, host_1.default)(), body: data });
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade`, { hostname: heroku_cli_util_1.utils.pg.host(), body: data });
             core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
         }
         catch (error) {

package/lib/commands/pg/upgrade/prepare.js

@@ -4,8 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
@@ -14,13 +13,14 @@ class Upgrade extends command_1.Command {
         const { flags, args } = await this.parse(Upgrade);
         const { app, version, confirm } = flags;
         const { database } = args;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, database);
         if ((0, util_1.legacyEssentialPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
         if ((0, util_1.essentialNumPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade:prepare')} on Standard-tier and higher leader databases. For Essential-tier databases, use ${color_1.default.cmd('heroku pg:upgrade:run')} instead.`);
         const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if (replica.following)
             core_1.ux.error(`You can only use ${color_1.default.cmd('heroku pg:upgrade:prepare')} on Standard-tier and higher leader databases. For follower databases, use ${color_1.default.cmd('heroku pg:upgrade:run')} instead.`);
         await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
@@ -30,7 +30,7 @@ class Upgrade extends command_1.Command {
         try {
             const data = { version };
             core_1.ux.action.start(`Preparing upgrade on ${color_1.default.addon(db.name)}`);
-            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/prepare`, { hostname: (0, host_1.default)(), body: data });
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/prepare`, { hostname: heroku_cli_util_1.utils.pg.host(), body: data });
             core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
         }
         catch (error) {

package/lib/commands/pg/upgrade/run.js

@@ -4,8 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
@@ -14,11 +13,12 @@ class Upgrade extends command_1.Command {
         const { flags, args } = await this.parse(Upgrade);
         const { app, version, confirm } = flags;
         const { database } = args;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, database);
         if ((0, util_1.legacyEssentialPlan)(db))
             core_1.ux.error(`You can only use ${color_1.default.cmd('pg:upgrade:*')} commands on Essential-* and higher plans.`);
         const versionPhrase = version ? (0, tsheredoc_1.default)(`Postgres version ${version}`) : (0, tsheredoc_1.default)('the latest supported Postgres version');
-        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+        const { body: replica } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         if ((0, util_1.essentialNumPlan)(db)) {
             await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
         Destructive action
@@ -48,7 +48,7 @@ class Upgrade extends command_1.Command {
         try {
             const data = { version };
             core_1.ux.action.start(`Starting upgrade on ${color_1.default.addon(db.name)}`);
-            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/run`, { hostname: (0, host_1.default)(), body: data });
+            const response = await this.heroku.post(`/client/v11/databases/${db.id}/upgrade/run`, { hostname: heroku_cli_util_1.utils.pg.host(), body: data });
             core_1.ux.action.stop((0, tsheredoc_1.default)(`done\n${(0, util_1.formatResponseWithCommands)(response.body.message)}`));
         }
         catch (error) {

package/lib/commands/pg/upgrade/wait.js

@@ -5,8 +5,7 @@ const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const debug_1 = require("debug");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../../lib/pg/fetcher");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const notify_1 = require("../../../lib/notify");
 const http_call_1 = require("@heroku/http-call");
 const nls_1 = require("../../../nls");
@@ -28,7 +27,7 @@ class Wait extends command_1.Command {
             const notFoundMessage = 'Waiting to provision...';
             while (true) {
                 try {
-                    ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/upgrade/wait_status`, { hostname: (0, host_1.default)() }));
+                    ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/upgrade/wait_status`, { hostname: heroku_cli_util_1.utils.pg.host() }));
                 }
                 catch (error) {
                     if (error instanceof http_call_1.HTTPError && (!retries || error.statusCode !== 404)) {
@@ -63,9 +62,15 @@ class Wait extends command_1.Command {
                 await wait(interval * 1000);
             }
         };
+        // This is actually incorrect, if we're only using one db we should make the database arg required and
+        // just use the resolver to get the add-on to be waited on.
+        // This looks similar to other implementations where you also can wait on all databases from the same app.
+        // Maybe it was initially thought to implement this in the future, but it was never implemented.
         let dbs = [];
         if (dbName) {
-            dbs = [await (0, fetcher_1.getAddon)(this.heroku, app, dbName)];
+            const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+            const { addon } = await dbResolver.getAttachment(app, dbName);
+            dbs = [addon];
         }
         else {
             core_1.ux.error((0, tsheredoc_1.default)('You must provide a database. Run `--help` for more information on the command.'));

package/lib/commands/pg/vacuum-stats.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
-const fetcher_1 = require("../../lib/pg/fetcher");
-const psql_1 = require("../../lib/pg/psql");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../nls");
 class VacuumStats extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(VacuumStats);
-        const db = await (0, fetcher_1.database)(this.heroku, flags.app, args.database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const db = await dbResolver.getDatabase(flags.app, args.database);
+        const psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         const query = (0, tsheredoc_1.default)(`
       WITH table_opts AS (
         SELECT
@@ -50,7 +51,7 @@ class VacuumStats extends command_1.Command {
           INNER JOIN vacuum_settings ON pg_class.oid = vacuum_settings.oid
       ORDER BY 1
     `);
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await psqlService.execQuery(query);
         core_1.ux.log(output);
     }
 }

package/lib/commands/pg/wait.js

@@ -4,8 +4,8 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const debug_1 = require("debug");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const fetcher_1 = require("../../lib/pg/fetcher");
-const host_1 = require("../../lib/pg/host");
 const notify_1 = require("../../lib/notify");
 const nls_1 = require("../../nls");
 const wait = (ms) => new Promise(resolve => {
@@ -27,7 +27,7 @@ class Wait extends command_1.Command {
             const notFoundMessage = 'Waiting to provision...';
             while (true) {
                 try {
-                    ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/wait_status`, { hostname: (0, host_1.default)() }));
+                    ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/wait_status`, { hostname: heroku_cli_util_1.utils.pg.host() }));
                 }
                 catch (error) {
                     const httpError = error;
@@ -55,9 +55,11 @@ class Wait extends command_1.Command {
                 await wait(interval * 1000);
             }
         };
-        let dbs = [];
+        let dbs;
         if (dbName) {
-            dbs = [await (0, fetcher_1.getAddon)(this.heroku, app, dbName)];
+            const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+            const { addon } = await dbResolver.getAttachment(app, dbName);
+            dbs = [addon];
         }
         else {
             dbs = await (0, fetcher_1.all)(this.heroku, app);

package/lib/commands/run/detached.d.ts

@@ -10,6 +10,7 @@ export default class RunDetached extends Command {
         size: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         tail: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         type: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-launcher': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/run/detached.js

@@ -14,7 +14,7 @@ class RunDetached extends command_1.Command {
         const opts = {
             heroku: this.heroku,
             app: flags.app,
-            command: (0, helpers_1.buildCommand)(argv),
+            command: await (0, helpers_1.buildCommandWithLauncher)(this.heroku, flags.app, argv, flags['no-launcher']),
             size: flags.size,
             type: flags.type,
             env: flags.env,
@@ -50,4 +50,8 @@ RunDetached.flags = {
     size: command_1.flags.string({ char: 's', description: 'dyno size', completion: completions_1.DynoSizeCompletion }),
     tail: command_1.flags.boolean({ char: 't', description: 'continually stream logs' }),
     type: command_1.flags.string({ description: 'process type', completion: completions_1.ProcessTypeCompletion }),
+    'no-launcher': command_1.flags.boolean({
+        description: 'don’t prepend ‘launcher’ before a command',
+        default: false,
+    }),
 };

package/lib/commands/run/index.d.ts

@@ -13,6 +13,7 @@ export default class Run extends Command {
         'no-tty': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         listen: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'no-notify': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-launcher': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/run/index.js

@@ -11,12 +11,13 @@ class Run extends command_1.Command {
     async run() {
         const { argv, flags } = await this.parse(Run);
         const command = (0, helpers_1.revertSortedArgs)(process.argv, argv);
+        const builtCommand = await (0, helpers_1.buildCommandWithLauncher)(this.heroku, flags.app, command, flags['no-launcher']);
         const opts = {
             'exit-code': flags['exit-code'],
             'no-tty': flags['no-tty'],
             app: flags.app,
             attach: true,
-            command: (0, helpers_1.buildCommand)(command),
+            command: builtCommand,
             env: flags.env,
             heroku: this.heroku,
             listen: flags.listen,
@@ -45,7 +46,7 @@ class Run extends command_1.Command {
     }
 }
 exports.default = Run;
-Run.description = 'run a one-off process inside a heroku dyno\nShows a notification if the dyno takes more than 20 seconds to start.';
+Run.description = 'run a one-off process inside a heroku dyno\nShows a notification if the dyno takes more than 20 seconds to start.\nHeroku automatically prepends ‘launcher’ to the command on CNB apps (use --no-launcher to disable).';
 Run.examples = [
     '$ heroku run bash',
     '$ heroku run -s standard-2x -- myscript.sh -a arg1 -s arg2',
@@ -62,4 +63,8 @@ Run.flags = {
     'no-tty': command_1.flags.boolean({ description: 'force the command to not run in a tty' }),
     listen: command_1.flags.boolean({ description: 'listen on a local port', hidden: true }),
     'no-notify': command_1.flags.boolean({ description: 'disables notification when dyno is up (alternatively use HEROKU_NOTIFICATIONS=0)' }),
+    'no-launcher': command_1.flags.boolean({
+        description: 'don’t prepend ‘launcher’ before a command',
+        default: false,
+    }),
 };

package/lib/commands/run/inside.js

@@ -12,14 +12,9 @@ class RunInside extends command_1.Command {
         const { args, argv, flags } = await this.parse(RunInside);
         const { dyno_name: dynoName } = args;
         const { app: appName, 'exit-code': exitCode, listen, 'no-launcher': noLauncher } = flags;
-        const prependLauncher = !noLauncher;
-        const { body: app } = await this.heroku.get(`/apps/${appName}`, {
-            headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
-        });
-        const appStackIsCnb = app.stack.name === 'cnb';
         const opts = {
             app: appName,
-            command: (0, helpers_1.buildCommand)(argv.slice(1), appStackIsCnb && prependLauncher),
+            command: await (0, helpers_1.buildCommandWithLauncher)(this.heroku, appName, argv.slice(1), noLauncher),
             dyno: dynoName,
             'exit-code': exitCode,
             heroku: this.heroku,

package/lib/lib/addons/resolve.d.ts

@@ -1,21 +1,20 @@
 import { APIClient } from '@heroku-cli/command';
 import type { AddOnAttachment } from '@heroku-cli/schema';
-import type { AddOnAttachmentWithConfigVarsAndPlan } from '../pg/types';
-export declare const appAddon: (heroku: APIClient, app: string, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
-export declare const addonResolver: (heroku: APIClient, app: string | undefined, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
+import type { ExtendedAddon } from '../pg/types';
+import type { ExtendedAddonAttachment } from '@heroku/heroku-cli-util';
+export declare const appAddon: (heroku: APIClient, app: string, id: string, options?: AddOnAttachment) => Promise<ExtendedAddon>;
+export declare const addonResolver: (heroku: APIClient, app: string | undefined, id: string, options?: AddOnAttachment) => Promise<ExtendedAddon>;
 export declare const appAttachment: (heroku: APIClient, app: string | undefined, id: string, options?: {
     addon_service?: string;
     namespace?: string;
-}) => Promise<AddOnAttachment & {
-    addon: AddOnAttachmentWithConfigVarsAndPlan;
-}>;
+}) => Promise<ExtendedAddonAttachment>;
 export declare const attachmentResolver: (heroku: APIClient, app: string | undefined, id: string, options?: {
     addon_service?: string;
     namespace?: string;
 }) => Promise<void | AddOnAttachment>;
 export declare function resolveAddon(...args: Parameters<typeof addonResolver>): ReturnType<typeof addonResolver>;
 export declare namespace resolveAddon {
-    var cache: Map<string, Promise<AddOnAttachmentWithConfigVarsAndPlan>>;
+    var cache: Map<string, Promise<ExtendedAddon>>;
 }
 export declare class NotFound extends Error {
     readonly statusCode = 404;

package/lib/lib/pg/backups.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const color_1 = require("@heroku-cli/color");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
-const host_1 = require("./host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const bytes = require("bytes");
 function prefix(transfer) {
     if (transfer.from_type === 'pg_dump') {
@@ -46,7 +46,7 @@ class Backups {
                 return Number.parseInt(m[1], 10);
             m = name.match(/^o[ab]\d+$/);
             if (m) {
-                const { body: transfers } = await this.heroku.get(`/client/v11/apps/${this.app}/transfers`, { hostname: (0, host_1.default)() });
+                const { body: transfers } = await this.heroku.get(`/client/v11/apps/${this.app}/transfers`, { hostname: heroku_cli_util_1.utils.pg.host() });
                 const transfer = transfers.find(t => this.name(t) === name);
                 if (transfer)
                     return transfer.num;
@@ -117,7 +117,7 @@ class Backups {
             const url = verbose ? verboseUrl : quietUrl;
             while (failures < 21) {
                 try {
-                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(url, { hostname: (0, host_1.default)() })));
+                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(url, { hostname: heroku_cli_util_1.utils.pg.host() })));
                 }
                 catch (error) {
                     if (failures++ > 20) {
@@ -143,7 +143,7 @@ class Backups {
                         break;
                     }
                     // logs is undefined unless verbose=true is passed
-                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(verboseUrl, { hostname: (0, host_1.default)() })));
+                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(verboseUrl, { hostname: heroku_cli_util_1.utils.pg.host() })));
                     throw new Error((0, tsheredoc_1.default)(`
           An error occurred and the backup did not finish.
 

package/lib/lib/pg/fetcher.d.ts

@@ -1,39 +1,8 @@
 import { APIClient } from '@heroku-cli/command';
-import type { AddOnAttachment } from '@heroku-cli/schema';
 import * as Heroku from '@heroku-cli/schema';
-import type { AddOnAttachmentWithConfigVarsAndPlan, AddOnWithRelatedData } from './types';
+import { ExtendedAddonAttachment } from '@heroku/heroku-cli-util';
 export declare function arbitraryAppDB(heroku: APIClient, app: string): Promise<Heroku.AddOn>;
-export declare function all(heroku: APIClient, app_id: string): Promise<AddOnWithRelatedData[]>;
-export declare function getAttachment(heroku: APIClient, app: string, db?: string, namespace?: string): Promise<Required<AddOnAttachment & {
-    addon: AddOnAttachmentWithConfigVarsAndPlan;
+export declare function all(heroku: APIClient, app_id: string): Promise<Array<ExtendedAddonAttachment['addon'] & {
+    attachment_names?: string[];
 }>>;
-export declare function getAddon(heroku: APIClient, app: string, db?: string): Promise<{
-    id: string;
-    name: string;
-    app: {
-        [k: string]: any;
-        id?: string | undefined;
-        name?: string | undefined;
-    };
-} & Required<AddOnAttachment> & {
-    config_vars: string[] | undefined;
-    addon: Required<{
-        id: string;
-        name: string;
-        app: {
-            [k: string]: any;
-            id?: string | undefined;
-            name?: string | undefined;
-        };
-    }> & {
-        attachment_names?: string[] | undefined;
-        links?: import("./types").Link[] | undefined;
-        plan: Required<{
-            [k: string]: any;
-            id?: string | undefined;
-            name?: string | undefined;
-        } | undefined>;
-    };
-}>;
-export declare function database(heroku: APIClient, app: string, db?: string, namespace?: string): Promise<import("./util").ConnectionDetailsWithAttachment>;
 export declare function getRelease(heroku: APIClient, appName: string, id: string): Promise<Heroku.Release>;