heroku 11.9.0 → 11.10.0-beta.0

package/CHANGELOG.md

@@ -4,6 +4,36 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
+## [11.10.0-beta.0](https://github.com/heroku/cli/compare/v11.9.0...v11.10.0-beta.0) (2026-08-18)
+
+
+### Features
+
+* add --json flag to heroku buildpacks and subcommands (W-23597909, [#1637](https://github.com/heroku/cli/issues/1637)) ([#3842](https://github.com/heroku/cli/issues/3842)) ([6f56a6f](https://github.com/heroku/cli/commit/6f56a6f6ec38d50d885992a3fdf30d985313e910))
+* add --no-cache flag to container:push (W-23597904, [#1390](https://github.com/heroku/cli/issues/1390)) ([#3840](https://github.com/heroku/cli/issues/3840)) ([91a0c42](https://github.com/heroku/cli/commit/91a0c422a35bd8d7fc58df5d8308bebb70b2f389))
+* add reviewapps:create and reviewapps:wait commands ([#3816](https://github.com/heroku/cli/issues/3816)) ([8ca1582](https://github.com/heroku/cli/commit/8ca1582757aabd950df43531a7f1d3fc579d6a38))
+* **ci:** add not-in-git-repo guard to ci:run and ci:rerun (W-23597902, [#1761](https://github.com/heroku/cli/issues/1761)) ([#3843](https://github.com/heroku/cli/issues/3843)) ([3d21957](https://github.com/heroku/cli/commit/3d2195700420276d61385a6213b7989ae8dc8d1b))
+* enable psql for classic shield ([#3861](https://github.com/heroku/cli/issues/3861)) ([2f0ced0](https://github.com/heroku/cli/commit/2f0ced0daa3d9aada870bd5ac679f7e3663c2dc4))
+* infer --pipeline from heroku.remote git config in CI commands (W-23597910, [#1318](https://github.com/heroku/cli/issues/1318)) ([#3845](https://github.com/heroku/cli/issues/3845)) ([4a0a9b4](https://github.com/heroku/cli/commit/4a0a9b40ec51bf90b2dc11d76c32315aa2e7753f))
+* **pg,redis:** add --as flag to pg:promote and redis:promote (W-23597911, [#1819](https://github.com/heroku/cli/issues/1819)) ([#3841](https://github.com/heroku/cli/issues/3841)) ([8271d51](https://github.com/heroku/cli/commit/8271d5128b214bddafa8a04059496fa0074facc2))
+
+
+### Bug Fixes
+
+* flag value autocompletion (PR [#3686](https://github.com/heroku/cli/issues/3686) recreation) ([#3866](https://github.com/heroku/cli/issues/3866)) ([30ac7e2](https://github.com/heroku/cli/commit/30ac7e22c00c53c99b1996bb5ab8cdab0f2e4aa0))
+* update `access` commands (list, update, add) to Utilize Permission Chain Directly. ([#3856](https://github.com/heroku/cli/issues/3856)) ([be14b93](https://github.com/heroku/cli/commit/be14b9365eaba2058fd94f41891399a0c758347e))
+
+
+### Miscellaneous Chores
+
+* **deps:** bump actions/download-artifact from 7 to 8 ([#3549](https://github.com/heroku/cli/issues/3549)) ([f951097](https://github.com/heroku/cli/commit/f951097e96fc10a50c7b5438ea158462ad5b0bfc))
+* **deps:** bump actions/upload-artifact from 6 to 7 ([#3550](https://github.com/heroku/cli/issues/3550)) ([427d743](https://github.com/heroku/cli/commit/427d743f20f83705dd75c5948a799288e870255e))
+
+
+### Code Refactoring
+
+* remove useless step in Ubuntu install script (PR [#2020](https://github.com/heroku/cli/issues/2020) recreation) ([#3865](https://github.com/heroku/cli/issues/3865)) ([c919b30](https://github.com/heroku/cli/commit/c919b30d36e3c47a194c99fb1c79e60588bfb186))
+
 ## [11.9.0](https://github.com/heroku/cli/compare/v11.8.1...v11.9.0) (2026-08-04)
 
 

package/dist/commands/access/add.js

@@ -1,7 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { getOwner, isTeamApp } from '../../lib/team-utils.js';
+import { getOwner } from '../../lib/team-utils.js';
 export default class AccessAdd extends Command {
     static args = {
         email: Args.string({ description: 'email address of the team member', required: true }),
@@ -23,8 +23,8 @@ export default class AccessAdd extends Command {
         const { body: appInfo } = await this.heroku.get(`/apps/${appName}`);
         let output = `Adding ${color.user(email)} access to the app ${color.app(appName)}`;
         let teamFeatures = [];
-        if (isTeamApp(appInfo?.owner?.email)) {
-            const teamName = getOwner(appInfo?.owner?.email);
+        if (appInfo?.team) {
+            const teamName = appInfo.team.name ?? getOwner(appInfo?.owner?.email);
             const teamFeaturesRequest = await this.heroku.get(`/teams/${teamName}/features`);
             teamFeatures = teamFeaturesRequest.body;
         }

package/dist/commands/access/index.js

@@ -3,7 +3,7 @@ import { HerokuAPIError } from '@heroku-cli/command/lib/api-client.js';
 import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core/ux';
 import { lazyModuleLoader } from '../../lib/lazy-module-loader.js';
-import { getOwner, isTeamApp } from '../../lib/team-utils.js';
+import { getOwner } from '../../lib/team-utils.js';
 export default class AccessIndex extends Command {
     static description = 'list who has access to an app';
     static flags = {
@@ -18,8 +18,8 @@ export default class AccessIndex extends Command {
         const { app: appName, json } = flags;
         const { body: app } = await this.heroku.get(`/apps/${appName}`);
         let { body: collaborators } = await this.heroku.get(`/apps/${appName}/collaborators`);
-        if (isTeamApp(app.owner?.email)) {
-            const teamName = getOwner(app.owner?.email);
+        if (app.team) {
+            const teamName = app.team.name ?? getOwner(app.owner?.email);
             try {
                 const { body: members } = await this.heroku.get(`/teams/${teamName}/members`);
                 let admins = members.filter(member => member.role === 'admin');
@@ -39,7 +39,7 @@ export default class AccessIndex extends Command {
         if (json)
             printJSON(collaborators);
         else
-            printAccess(app, collaborators, _);
+            printAccess(collaborators, _);
     }
 }
 function buildCollaboratorsArray(collaboratorsRaw, admins, _) {
@@ -63,8 +63,8 @@ function buildTableColumns(showPermissions) {
     }
     return baseColumns;
 }
-function printAccess(app, collaborators, _) {
-    const showPermissions = isTeamApp(app.owner?.email);
+function printAccess(collaborators, _) {
+    const showPermissions = collaborators.some((c) => c.permissions !== undefined);
     collaborators = _.chain(collaborators)
         .sortBy((c) => c.email || c.user.email)
         .reject((c) => /herokumanager\.com$/.test(c.user.email))

package/dist/commands/access/update.js

@@ -1,7 +1,6 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
-import { isTeamApp } from '../../lib/team-utils.js';
 export default class Update extends Command {
     static args = {
         email: Args.string({ description: 'email address of the team member', required: true }),
@@ -22,7 +21,7 @@ export default class Update extends Command {
         const appName = flags.app;
         let permissions = flags.permissions.split(',');
         const { body: appInfo } = await this.heroku.get(`/apps/${appName}`);
-        if (!isTeamApp(appInfo?.owner?.email))
+        if (!appInfo?.team)
             this.error(`Error: cannot update permissions. The app ${color.app(appName)} is not owned by a team`);
         permissions.push('view');
         permissions = [...new Set(permissions.sort())];

package/dist/commands/autocomplete/options.js

@@ -118,7 +118,7 @@ export default class Options extends AutocompleteBase {
             // variable arg (strict: false)
             if (!Klass.strict) {
                 cacheKey = cmdArgs[0] && cmdArgs[0].name.toLowerCase();
-                cacheCompletion = this.findCompletion(cacheKey, id);
+                cacheCompletion = this.findCompletion(id, cacheKey);
                 if (!cacheCompletion)
                     this.throwError(`Cannot complete variable arg position for ${id}`);
             }
@@ -132,7 +132,7 @@ export default class Options extends AutocompleteBase {
         }
         // try to auto-populate the completion object
         if (!cacheCompletion) {
-            cacheCompletion = this.findCompletion(cacheKey, id);
+            cacheCompletion = this.findCompletion(id, cacheKey);
         }
         return { cacheCompletion, cacheKey };
     }

package/dist/commands/buildpacks/add.d.ts

@@ -7,6 +7,7 @@ export default class Add extends Command {
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         index: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/buildpacks/add.js

@@ -1,4 +1,5 @@
 import { Command, flags as Flags } from '@heroku-cli/command';
+import { hux } from '@heroku/heroku-cli-util';
 import { Args } from '@oclif/core';
 import { BuildpackCommand } from '../../lib/buildpacks/buildpacks.js';
 export default class Add extends Command {
@@ -15,6 +16,7 @@ export default class Add extends Command {
             char: 'i',
             description: 'the 1-based index of the URL in the list of URLs',
         }),
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
         remote: Flags.remote(),
     };
     async run() {
@@ -35,6 +37,11 @@ export default class Add extends Command {
             spliceIndex = (foundIndex === -1) ? buildpacks.length : foundIndex;
         }
         const buildpackUpdates = await buildpackCommand.mutate(flags.app, buildpacks, spliceIndex, args.buildpack, 'add');
-        buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'added');
+        if (flags.json) {
+            hux.styledJSON(buildpackUpdates);
+        }
+        else {
+            buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'added');
+        }
     }
 }

package/dist/commands/buildpacks/clear.d.ts

@@ -3,6 +3,7 @@ export default class Clear extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/buildpacks/clear.js

@@ -4,11 +4,12 @@ export default class Clear extends Command {
     static description = 'clear all buildpacks set on the app';
     static flags = {
         app: Flags.app({ required: true }),
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
         remote: Flags.remote(),
     };
     async run() {
         const { flags } = await this.parse(Clear);
         const buildpackCommand = new BuildpackCommand(this.heroku);
-        await buildpackCommand.clear(flags.app, 'clear', 'cleared');
+        await buildpackCommand.clear(flags.app, 'clear', 'cleared', flags.json);
     }
 }

package/dist/commands/buildpacks/index.d.ts

@@ -3,6 +3,7 @@ export default class Index extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/buildpacks/index.js

@@ -6,6 +6,7 @@ export default class Index extends Command {
     static description = 'list the buildpacks on an app';
     static flags = {
         app: Flags.app({ required: true }),
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
         remote: Flags.remote(),
     };
     async run() {
@@ -18,7 +19,10 @@ export default class Index extends Command {
         });
         const isFirApp = getGeneration(app) === 'fir';
         const buildpacks = await buildpacksCommand.fetch(flags.app, isFirApp);
-        if (buildpacks.length === 0) {
+        if (flags.json) {
+            hux.styledJSON(buildpacks);
+        }
+        else if (buildpacks.length === 0) {
             this.log(`${color.app(flags.app)} has no Buildpacks.`);
         }
         else {

package/dist/commands/buildpacks/info.d.ts

@@ -4,5 +4,8 @@ export default class Info extends Command {
         buildpack: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
+    static flags: {
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/buildpacks/info.js

@@ -1,4 +1,4 @@
-import { Command } from '@heroku-cli/command';
+import { Command, flags as Flags } from '@heroku-cli/command';
 import { BuildpackRegistry } from '@heroku/buildpack-registry';
 import { hux } from '@heroku/heroku-cli-util';
 import { Args, ux } from '@oclif/core';
@@ -11,8 +11,11 @@ export default class Info extends Command {
         }),
     };
     static description = 'fetch info about a buildpack';
+    static flags = {
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
+    };
     async run() {
-        const { args } = await this.parse(Info);
+        const { args, flags } = await this.parse(Info);
         const registry = new BuildpackRegistry();
         const validationResult = BuildpackRegistry.isValidBuildpackSlug(args.buildpack);
         if (!validationResult.isOk) {
@@ -29,8 +32,13 @@ export default class Info extends Command {
                 }
             },
             Ok(buildpack) {
-                hux.styledHeader(args.buildpack);
-                hux.styledObject(buildpack, ['description', 'category', 'license', 'support', 'source', 'readme']);
+                if (flags.json) {
+                    hux.styledJSON(buildpack);
+                }
+                else {
+                    hux.styledHeader(args.buildpack);
+                    hux.styledObject(buildpack, ['description', 'category', 'license', 'support', 'source', 'readme']);
+                }
             },
         }, result);
     }

package/dist/commands/buildpacks/remove.d.ts

@@ -7,6 +7,7 @@ export default class Remove extends Command {
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         index: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/buildpacks/remove.js

@@ -1,4 +1,5 @@
 import { Command, flags as Flags } from '@heroku-cli/command';
+import { hux } from '@heroku/heroku-cli-util';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
 import { BuildpackCommand } from '../../lib/buildpacks/buildpacks.js';
@@ -15,6 +16,7 @@ export default class Remove extends Command {
             char: 'i',
             description: 'the 1-based index of the URL to remove from the list of URLs',
         }),
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
         remote: Flags.remote(),
     };
     async run() {
@@ -43,11 +45,16 @@ export default class Remove extends Command {
             ux.error('Buildpack not found. Nothing was removed.', { exit: 1 });
         }
         if (buildpacks.length === 1) {
-            await buildpackCommand.clear(flags.app, 'remove', 'removed');
+            await buildpackCommand.clear(flags.app, 'remove', 'removed', flags.json);
         }
         else {
             const buildpackUpdates = await buildpackCommand.mutate(flags.app, buildpacks, spliceIndex, args.buildpack, 'remove');
-            buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'removed');
+            if (flags.json) {
+                hux.styledJSON(buildpackUpdates);
+            }
+            else {
+                buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'removed');
+            }
         }
     }
 }

package/dist/commands/buildpacks/set.d.ts

@@ -7,6 +7,7 @@ export default class Set extends Command {
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         index: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/buildpacks/set.js

@@ -1,4 +1,5 @@
 import { Command, flags as Flags } from '@heroku-cli/command';
+import { hux } from '@heroku/heroku-cli-util';
 import { Args } from '@oclif/core';
 import { BuildpackCommand } from '../../lib/buildpacks/buildpacks.js';
 export default class Set extends Command {
@@ -15,6 +16,7 @@ export default class Set extends Command {
             char: 'i',
             description: 'the 1-based index of the URL in the list of URLs',
         }),
+        json: Flags.boolean({ char: 'j', description: 'output in json format' }),
         remote: Flags.remote(),
     };
     async run() {
@@ -35,6 +37,11 @@ export default class Set extends Command {
             spliceIndex = (foundIndex === -1) ? buildpacks.length : foundIndex;
         }
         const buildpackUpdates = await buildpackCommand.mutate(flags.app, buildpacks, spliceIndex, args.buildpack, 'set');
-        buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'set');
+        if (flags.json) {
+            hux.styledJSON(buildpackUpdates);
+        }
+        else {
+            buildpackCommand.displayUpdate(flags.app, flags.remote || '', buildpackUpdates, 'set');
+        }
     }
 }

package/dist/commands/ci/rerun.js

@@ -1,6 +1,7 @@
 import { Command, flags } from '@heroku-cli/command';
 import * as color from '@heroku/heroku-cli-util/color';
 import { Args, ux } from '@oclif/core';
+import { gitService } from '../../lib/ci/git.js';
 import { getPipeline } from '../../lib/ci/pipelines.js';
 import { createSourceBlob } from '../../lib/ci/source.js';
 import { displayAndExit } from '../../lib/ci/test-run.js';
@@ -20,6 +21,9 @@ export default class CiReRun extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(CiReRun);
+        if (!gitService.inGitRepo()) {
+            this.error(`You can't run ${color.command('heroku ci:rerun')} outside of your app's git repository.`);
+        }
         const pipeline = await getPipeline(flags, this.heroku);
         let sourceTestRun;
         if (args.number) {

package/dist/commands/ci/run.js

@@ -18,6 +18,9 @@ export default class CiRun extends Command {
     };
     async run() {
         const { flags } = await this.parse(CiRun);
+        if (!gitService.inGitRepo()) {
+            this.error(`You can't run ${color.command('heroku ci:run')} outside of your app's git repository.`);
+        }
         const pipeline = await getPipeline(flags, this.heroku);
         const commit = await gitService.readCommit('HEAD');
         ux.action.start('Preparing source');

package/dist/commands/container/push.d.ts

@@ -7,6 +7,7 @@ export default class Push extends Command {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         arg: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'context-path': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'no-cache': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         recursive: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/container/push.js

@@ -18,6 +18,7 @@ export default class Push extends Command {
         app: flags.app({ required: true }),
         arg: flags.string({ description: 'set build-time variables' }),
         'context-path': flags.string({ description: 'path to use as build context (defaults to Dockerfile dir)' }),
+        'no-cache': flags.boolean({ description: 'don\'t use cache when building the image' }),
         recursive: flags.boolean({ char: 'R', description: 'pushes Dockerfile.<process> found in current and subdirectories' }),
         remote: flags.remote({ char: 'r' }),
         verbose: flags.boolean({ char: 'v' }),
@@ -27,7 +28,7 @@ export default class Push extends Command {
     dockerHelper = new DockerHelper();
     async run() {
         const { argv: processTypes, flags } = await this.parse(Push);
-        const { app, arg, 'context-path': contextPath, recursive, verbose } = flags;
+        const { app, arg, 'context-path': contextPath, 'no-cache': noCache, recursive, verbose } = flags;
         if (verbose) {
             debug.enabled = true;
         }
@@ -59,6 +60,7 @@ export default class Push extends Command {
                     arch: this.config.arch,
                     buildArgs,
                     dockerfile: job.dockerfile,
+                    noCache,
                     path: contextPath,
                     resource: job.resource,
                 });

package/dist/commands/data/pg/psql.d.ts

@@ -1,5 +1,4 @@
 import { Command } from '@heroku-cli/command';
-import { DynoOpts } from '../../../lib/run/dyno.js';
 export default class DataPgPsql extends Command {
     static args: {
         database: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
@@ -14,5 +13,4 @@ export default class DataPgPsql extends Command {
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
-    runThroughOneOffDyno(opts: DynoOpts): Promise<void>;
 }

package/dist/commands/data/pg/psql.js

@@ -1,8 +1,8 @@
 import { Command, flags as Flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
-import { Args, ux } from '@oclif/core';
+import { Args } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
-import Dyno from '../../../lib/run/dyno.js';
+import { runPsqlThroughOneOffDyno } from '../../../lib/pg/one-off-dyno.js';
 const heredoc = tsheredoc.default;
 export default class DataPgPsql extends Command {
     static args = {
@@ -38,35 +38,18 @@ export default class DataPgPsql extends Command {
     async run() {
         const { args, flags } = await this.parse(DataPgPsql);
         const { database: databaseArg } = args;
-        const { app, 'channel-binding': channelBinding, command, file } = flags;
+        const { 'channel-binding': channelBinding, command, file } = flags;
         const dbResolver = new utils.pg.DatabaseResolver(this.heroku);
-        const db = await dbResolver.getDatabase(app, databaseArg);
-        if (utils.pg.isAdvancedPrivateDatabase(db.attachment.addon)) {
-            if (file)
-                ux.error('You can\'t use the --file flag on private networked Advanced databases.', { exit: 1 });
-            let psqlCommand;
-            if (command) {
-                psqlCommand = `psql -c "${command.replaceAll('"', String.raw `\"`)}" --set sslmode=require `
-                    + `--set channel_binding=${channelBinding} $${db.attachment.name}_URL`;
-            }
-            else {
-                const prompt = `${db.attachment.app.name}::${db.attachment.name}%R%# `;
-                psqlCommand = `psql --set PROMPT1="${prompt}" --set PROMPT2="${prompt}" --set sslmode=require `
-                    + `--set channel_binding=${channelBinding} $${db.attachment.name}_URL`;
-            }
-            const opts = {
-                app,
-                attach: true,
-                command: psqlCommand,
-                env: `PGAPPNAME='psql ${command ? 'non-' : ''}interactive';PGSSLMODE=require;PGCHANNELBINDING=${channelBinding}`,
-                'exit-code': true,
+        const db = await dbResolver.getDatabase(flags.app, databaseArg);
+        if (utils.pg.isPrivateNetworkDatabase(db.attachment.addon)) {
+            return runPsqlThroughOneOffDyno({
+                channelBinding: channelBinding,
+                command,
+                db,
+                file,
                 heroku: this.heroku,
-                'no-tty': false,
                 notificationSubtitle: 'heroku data:pg:psql',
-                notify: false,
-                showStatus: false,
-            };
-            return this.runThroughOneOffDyno(opts);
+            });
         }
         const psqlService = new utils.pg.PsqlService(db);
         console.error(`--> Connecting to ${color.yellow(db.attachment.addon.name)}`);
@@ -85,19 +68,4 @@ export default class DataPgPsql extends Command {
         else
             await psqlService.interactiveSession(cmdArgs);
     }
-    async runThroughOneOffDyno(opts) {
-        const dyno = new Dyno(opts);
-        try {
-            await dyno.start();
-        }
-        catch (error) {
-            const dynoError = error;
-            if (dynoError.exitCode) {
-                ux.error(dynoError.message, { code: String(dynoError.exitCode), exit: dynoError.exitCode });
-            }
-            else {
-                throw error;
-            }
-        }
-    }
 }

package/dist/commands/pg/promote.d.ts

@@ -6,6 +6,7 @@ export default class Promote extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        as: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };

package/dist/commands/pg/promote.js

@@ -13,13 +13,14 @@ export default class Promote extends Command {
     static description = 'sets DATABASE as your DATABASE_URL';
     static flags = {
         app: flags.app({ required: true }),
+        as: flags.string({ description: 'name for the database attachment' }),
         force: flags.boolean({ char: 'f' }),
         remote: flags.remote(),
     };
     static topic = 'pg';
     async run() {
         const { args, flags } = await this.parse(Promote);
-        const { app, force } = flags;
+        const { app, as, force } = flags;
         const { database } = args;
         const dbResolver = new utils.pg.DatabaseResolver(this.heroku);
         const attachment = await dbResolver.getAttachment(app, database);
@@ -79,7 +80,7 @@ export default class Promote extends Command {
                 addon: { name: attachment.addon.name },
                 app: { name: app },
                 confirm: app,
-                name: 'DATABASE',
+                name: as || 'DATABASE',
                 namespace: attachment.namespace || null,
             },
         });

package/dist/commands/pg/psql.d.ts

@@ -7,6 +7,7 @@ export default class Psql extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'channel-binding': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         command: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         credential: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         file: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/pg/psql.js

@@ -1,7 +1,10 @@
 import { Command, flags } from '@heroku-cli/command';
 import { color, utils } from '@heroku/heroku-cli-util';
 import { Args } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+import { runPsqlThroughOneOffDyno } from '../../lib/pg/one-off-dyno.js';
 import { nls } from '../../nls.js';
+const heredoc = tsheredoc.default;
 export default class Psql extends Command {
     static aliases = ['psql'];
     static args = {
@@ -10,6 +13,14 @@ export default class Psql extends Command {
     static description = 'open a psql shell to the database';
     static flags = {
         app: flags.app({ required: true }),
+        'channel-binding': flags.string({
+            default: 'require',
+            description: heredoc('override the default channel binding behavior (required). '
+                + 'Can be "disable" to disable channel binding if you run into compatibility issues with your libpq version '
+                + 'or if it was compiled without SSL support.'),
+            hidden: true,
+            options: ['disable', 'require'],
+        }),
         command: flags.string({ char: 'c', description: 'SQL command to run' }),
         credential: flags.string({ description: 'credential to use' }),
         file: flags.string({ char: 'f', description: 'SQL file to run' }),
@@ -17,7 +28,7 @@ export default class Psql extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Psql);
-        const { app, command, credential, file } = flags;
+        const { app, 'channel-binding': channelBinding, command, credential, file } = flags;
         const namespace = credential ? `credential:${credential}` : undefined;
         let db;
         const dbResolver = new utils.pg.DatabaseResolver(this.heroku);
@@ -30,18 +41,32 @@ export default class Psql extends Command {
             }
             throw error;
         }
+        if (utils.pg.isPrivateNetworkDatabase(db.attachment.addon)) {
+            return runPsqlThroughOneOffDyno({
+                channelBinding: channelBinding,
+                command,
+                db,
+                file,
+                heroku: this.heroku,
+                notificationSubtitle: 'heroku pg:psql',
+            });
+        }
         const psqlService = new utils.pg.PsqlService(db);
         console.error(`--> Connecting to ${color.datastore(db.attachment.addon.name)}`);
+        const cmdArgs = [
+            '--set',
+            `channel_binding=${channelBinding}`,
+        ];
         if (command) {
-            const output = await psqlService.execQuery(command);
+            const output = await psqlService.execQuery(command, cmdArgs);
             process.stdout.write(output);
         }
         else if (file) {
-            const output = await psqlService.execFile(file);
+            const output = await psqlService.execFile(file, cmdArgs);
             process.stdout.write(output);
         }
         else {
-            await psqlService.interactiveSession();
+            await psqlService.interactiveSession(cmdArgs);
         }
     }
 }

package/dist/commands/redis/promote.d.ts

@@ -6,6 +6,7 @@ export default class Promote extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        as: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static topic: string;