heroku 10.13.2 → 10.14.0

package/lib/commands/pg/diagnose.js

@@ -5,8 +5,8 @@ const core_1 = require("@oclif/core");
 const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("@oclif/core/lib/util");
 const tsheredoc_1 = require("tsheredoc");
-const fetcher_1 = require("../../lib/pg/fetcher");
-const host_1 = require("../../lib/pg/host");
+const heroku_cli_util_2 = require("@heroku/heroku-cli-util");
+const host_1 = require("@heroku/heroku-cli-util/dist/utils/pg/host");
 const util_2 = require("../../lib/pg/util");
 const color_1 = require("@heroku-cli/color");
 const uuid_validate_1 = require("../../lib/utils/uuid-validate");
@@ -82,11 +82,12 @@ class Diagnose extends command_1.Command {
         return base_params;
     }
     async generateReport(database, app) {
-        const attachment = await (0, fetcher_1.getAttachment)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_2.utils.pg.DatabaseResolver(this.heroku);
+        const attachment = await dbResolver.getAttachment(app, database);
         const { addon: db } = attachment;
         const { body: config } = await this.heroku.get(`/apps/${app}/config-vars`);
-        const { url } = (0, util_2.getConnectionDetails)(attachment, config);
-        const dbName = (0, util_2.getConfigVarNameFromAttachment)(attachment, config);
+        const { url } = dbResolver.getConnectionDetails(attachment, config);
+        const dbName = heroku_cli_util_2.utils.pg.psql.getConfigVarNameFromAttachment(attachment, config);
         const body = await this.generateParams(url, db, dbName);
         const { body: report } = await this.heroku.post('/reports', { hostname: PGDIAGNOSE_HOST, body });
         return report;

package/lib/commands/pg/info.js

@@ -4,10 +4,10 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const host_1 = require("../../lib/pg/host");
 const fetcher_1 = require("../../lib/pg/fetcher");
 const util_1 = require("../../lib/pg/util");
 const nls_1 = require("../../nls");
+const heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 function displayDB(db, app) {
     var _a, _b, _c, _d, _e;
     if (db.addon.attachment_names) {
@@ -47,7 +47,9 @@ class Info extends command_1.Command {
         let addons;
         const { body: config } = await this.heroku.get(`/apps/${app}/config-vars`);
         if (db) {
-            addons = await Promise.all([(0, fetcher_1.getAddon)(this.heroku, app, db)]);
+            const dbResolver = new heroku_cli_util_2.utils.pg.DatabaseResolver(this.heroku);
+            const { addon } = await dbResolver.getAttachment(app, db);
+            addons = [addon];
         }
         else {
             addons = await (0, fetcher_1.all)(this.heroku, app);
@@ -58,7 +60,7 @@ class Info extends command_1.Command {
         }
         let dbs = await Promise.all(addons.map(async (addon) => {
             const pgResponse = await this.heroku.get(`/client/v11/databases/${addon.id}`, {
-                hostname: (0, host_1.default)(),
+                hostname: heroku_cli_util_2.utils.pg.host(),
             })
                 .catch(error => {
                 if (error.statusCode !== 404)

package/lib/commands/pg/kill.js

@@ -2,20 +2,21 @@
 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 Kill extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Kill);
         const { app, force } = flags;
-        const { pid } = args;
-        const db = await (0, fetcher_1.database)(this.heroku, app, args.database);
+        const { pid, database } = args;
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const db = await dbResolver.getDatabase(app, database);
+        const psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         const query = (0, tsheredoc_1.default) `
       SELECT ${force ? 'pg_terminate_backend' : 'pg_cancel_backend'}(${Number.parseInt(pid, 10)});
     `;
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await psqlService.execQuery(query);
         core_1.ux.log(output);
     }
 }

package/lib/commands/pg/killall.js

@@ -2,16 +2,16 @@
 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 host_1 = require("../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../nls");
 class Killall extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Killall);
         const { app } = flags;
         core_1.ux.action.start('Terminating connections for all credentials');
-        const database = await (0, fetcher_1.getAddon)(this.heroku, app, args.database);
-        await this.heroku.post(`/client/v11/databases/${database.id}/connection_reset`, { hostname: (0, host_1.default)() });
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon } = await dbResolver.getAttachment(app, args.database);
+        await this.heroku.post(`/client/v11/databases/${addon.id}/connection_reset`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

package/lib/commands/pg/links/create.js

@@ -5,8 +5,7 @@ const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
 const resolve_1 = require("../../../lib/addons/resolve");
-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 nls_1 = require("../../../nls");
 class Create extends command_1.Command {
@@ -19,8 +18,9 @@ class Create extends command_1.Command {
                 throw new Error('Remote database must be heroku-redis or heroku-postgresql');
             return addon;
         };
-        const [db, target] = await Promise.all([
-            (0, fetcher_1.getAddon)(this.heroku, app, args.database),
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const [{ addon: db }, target] = await Promise.all([
+            dbResolver.getAttachment(app, args.database),
             service(args.remote),
         ]);
         if ((0, util_1.essentialPlan)(db))
@@ -33,11 +33,13 @@ class Create extends command_1.Command {
                 target: target.name,
                 as: flags.as,
             },
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_1.utils.pg.host(),
         });
-        if (link.message) {
-            throw new Error(link.message);
-        }
+        // This doesn't exist according to Shogun's link serializer. May it be that the original idea was to use to catch
+        // a Data API error and then show an re-throw the error here?
+        // if (link.message) {
+        //   throw new Error(link.message)
+        // }
         core_1.ux.action.stop(`done, ${color_1.default.cyan(link.name)}`);
     }
 }

package/lib/commands/pg/links/destroy.js

@@ -3,18 +3,18 @@ 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 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");
-const host_1 = require("../../../lib/pg/host");
 const nls_1 = require("../../../nls");
 class Destroy extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Destroy);
         const { app, confirm } = flags;
         const { database, link } = 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.essentialPlan)(db))
             throw new Error('pg:links isn’t available for Essential-tier databases.');
         await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
@@ -24,7 +24,7 @@ class Destroy extends command_1.Command {
       This may have adverse effects for software written against the ${color_1.default.cyan(link)} schema.
     `));
         core_1.ux.action.start(`Destroying link ${color_1.default.cyan(link)} from ${color_1.default.yellow(db.name)}`);
-        await this.heroku.delete(`/client/v11/databases/${db.id}/links/${encodeURIComponent(link)}`, { hostname: (0, host_1.default)() });
+        await this.heroku.delete(`/client/v11/databases/${db.id}/links/${encodeURIComponent(link)}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

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

@@ -5,7 +5,6 @@ const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 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 nls_1 = require("../../../nls");
 class Index extends command_1.Command {
     async run() {
@@ -13,29 +12,36 @@ class Index extends command_1.Command {
         const { app } = flags;
         const { database } = args;
         let dbs;
-        if (database)
-            dbs = await Promise.all([(0, fetcher_1.getAddon)(this.heroku, app, database)]);
+        if (database) {
+            const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+            const { addon } = await dbResolver.getAttachment(app, database);
+            dbs = [addon];
+        }
         else
             dbs = await (0, fetcher_1.all)(this.heroku, app);
         if (dbs.length === 0)
             throw new Error(`No databases on ${color_1.default.app(app)}`);
         dbs = await Promise.all(dbs.map(async (db) => {
-            const { body: links } = await this.heroku.get(`/client/v11/databases/${db.id}/links`, { hostname: (0, host_1.default)() });
+            const { body: links } = await this.heroku.get(`/client/v11/databases/${db.id}/links`, { hostname: heroku_cli_util_1.utils.pg.host() });
             db.links = links;
             return db;
         }));
         let once;
         dbs.forEach(db => {
+            var _a, _b;
             if (once)
                 core_1.ux.log();
             else
                 once = true;
             heroku_cli_util_1.hux.styledHeader(color_1.default.yellow(db.name));
-            if (db.links.message)
-                return core_1.ux.log(db.links.message);
-            if (db.links.length === 0)
+            // This doesn't exist according to Shogun's link serializer. May it be that the original idea was to use Promise.allSettled
+            // and capture here and show only the error message if an error was returned for some database? Currently a CLI error is
+            // thrown instead, because Promise.all will reject if any of the promises reject and there's no catch block for that.
+            // if (db.links?.message)
+            //   return ux.log(db.links.message)
+            if (((_a = db.links) === null || _a === void 0 ? void 0 : _a.length) === 0)
                 return core_1.ux.log('No data sources are linked into this database');
-            db.links.forEach((link) => {
+            (_b = db.links) === null || _b === void 0 ? void 0 : _b.forEach((link) => {
                 var _a, _b;
                 core_1.ux.log(` * ${color_1.default.cyan(link.name)}`);
                 const remoteAttachmentName = ((_a = link.remote) === null || _a === void 0 ? void 0 : _a.attachment_name) || '';

package/lib/commands/pg/locks.js

@@ -2,15 +2,16 @@
 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 Locks extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Locks);
         const { app, truncate } = flags;
-        const db = await (0, fetcher_1.database)(this.heroku, app, args.database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const db = await dbResolver.getDatabase(app, args.database);
+        const psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         const query = (0, tsheredoc_1.default) `
       SELECT
         pg_stat_activity.pid,
@@ -30,7 +31,7 @@ class Locks extends command_1.Command {
         AND pg_locks.mode = 'ExclusiveLock'
         AND pg_stat_activity.pid <> pg_backend_pid() order by query_start;
     `;
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await psqlService.execQuery(query);
         core_1.ux.log(output);
     }
     truncatedQueryString(truncate) {

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

@@ -2,19 +2,19 @@
 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
-const host_1 = require("../../../lib/pg/host");
 const nls_1 = require("../../../nls");
 class Index extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Index);
         const { app } = 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.essentialPlan)(db))
             core_1.ux.error('pg:maintenance isn’t available for Essential-tier databases.');
-        const { body: info } = await this.heroku.get(`/client/v11/databases/${db.id}/maintenance`, { hostname: (0, host_1.default)() });
+        const { body: info } = await this.heroku.get(`/client/v11/databases/${db.id}/maintenance`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.log(info.message);
     }
 }

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

@@ -3,16 +3,16 @@ 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../../lib/pg/util");
-const host_1 = require("../../../lib/pg/host");
 const nls_1 = require("../../../nls");
 class Run extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Run);
         const { app, force } = 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.essentialPlan)(db))
             core_1.ux.error("pg:maintenance isn't available for Essential-tier databases.");
         core_1.ux.action.start(`Starting maintenance for ${color_1.default.yellow(db.name)}`);
@@ -21,7 +21,7 @@ class Run extends command_1.Command {
             if (!appInfo.maintenance)
                 core_1.ux.error('Application must be in maintenance mode or run with --force');
         }
-        const { body: response } = await this.heroku.post(`/client/v11/databases/${db.id}/maintenance`, { hostname: (0, host_1.default)() });
+        const { body: response } = await this.heroku.post(`/client/v11/databases/${db.id}/maintenance`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop(response.message || 'done');
     }
 }

package/lib/commands/pg/maintenance/window.js

@@ -3,9 +3,8 @@ 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 host_1 = require("../../../lib/pg/host");
 const util_1 = require("../../../lib/pg/util");
-const fetcher_1 = require("../../../lib/pg/fetcher");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../../nls");
 class Window extends command_1.Command {
@@ -13,14 +12,15 @@ class Window extends command_1.Command {
         const { args, flags } = await this.parse(Window);
         const { database, window } = args;
         const { app } = flags;
-        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.essentialPlan)(db))
             core_1.ux.error("pg:maintenance isn't available for Essential-tier databases.");
         if (!window.match(/^[A-Za-z]{2,10} \d\d?:[03]0$/))
             core_1.ux.error('Window must be "Day HH:MM" where MM is 00 or 30');
         core_1.ux.action.start(`Setting maintenance window for ${color_1.default.yellow(db.name)} to ${color_1.default.cyan(window)}`);
         const { body: response } = await this.heroku.put(`/client/v11/databases/${db.id}/maintenance_window`, {
-            body: { description: window }, hostname: (0, host_1.default)(),
+            body: { description: window }, hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop(response.message || 'done');
     }

package/lib/commands/pg/outliers.d.ts

@@ -1,5 +1,4 @@
 import { Command } from '@heroku-cli/command';
-import { getConnectionDetails } from '../../lib/pg/util';
 export default class Outliers extends Command {
     static topic: string;
     static description: string;
@@ -13,7 +12,8 @@ export default class Outliers extends Command {
     static args: {
         database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
+    private psqlService;
     run(): Promise<void>;
-    protected ensurePGStatStatement(db: ReturnType<typeof getConnectionDetails>): Promise<void>;
+    protected ensurePGStatStatement(): Promise<void>;
     protected outliersQuery(version: string | undefined, limit: number, truncate: boolean): string;
 }

package/lib/commands/pg/outliers.js

@@ -2,7 +2,7 @@
 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const psql_1 = require("../../lib/pg/psql");
 const tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../nls");
@@ -10,11 +10,13 @@ class Outliers extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Outliers);
         const { app, reset, truncate, num } = flags;
-        const db = await (0, fetcher_1.database)(this.heroku, app, args.database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const db = await dbResolver.getDatabase(app, args.database);
+        this.psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         const version = await (0, psql_1.fetchVersion)(db);
-        await this.ensurePGStatStatement(db);
+        await this.ensurePGStatStatement();
         if (reset) {
-            await (0, psql_1.exec)(db, 'SELECT pg_stat_statements_reset();');
+            await this.psqlService.execQuery('SELECT pg_stat_statements_reset();');
             return;
         }
         let limit = 10;
@@ -27,10 +29,10 @@ class Outliers extends command_1.Command {
             }
         }
         const query = this.outliersQuery(version, limit, truncate);
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await this.psqlService.execQuery(query);
         core_1.ux.log(output);
     }
-    async ensurePGStatStatement(db) {
+    async ensurePGStatStatement() {
         const query = (0, tsheredoc_1.default) `
       SELECT exists(
         SELECT 1
@@ -39,7 +41,7 @@ class Outliers extends command_1.Command {
         WHERE e.extname = 'pg_stat_statements' AND n.nspname IN ('public', 'heroku_ext')
       ) AS available;
     `;
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await this.psqlService.execQuery(query);
         if (!output.includes('t')) {
             core_1.ux.error((0, tsheredoc_1.default) `
         pg_stat_statements extension need to be installed first.

package/lib/commands/pg/promote.js

@@ -5,8 +5,8 @@ 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const fetcher_1 = require("../../lib/pg/fetcher");
-const host_1 = require("../../lib/pg/host");
 const nls_1 = require("../../nls");
 class Promote extends command_1.Command {
     async run() {
@@ -14,7 +14,8 @@ class Promote extends command_1.Command {
         const { flags, args } = await this.parse(Promote);
         const { force, app } = flags;
         const { database } = args;
-        const attachment = await (0, fetcher_1.getAttachment)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const attachment = await dbResolver.getAttachment(app, database);
         core_1.ux.action.start(`Ensuring an alternate alias for existing ${color_1.default.green('DATABASE_URL')}`);
         const { body: attachments } = await this.heroku.get(`/apps/${app}/addon-attachments`);
         const current = attachments.find(a => a.name === 'DATABASE');
@@ -50,7 +51,7 @@ class Promote extends command_1.Command {
         }
         if (!force) {
             const { body: status } = await this.heroku.get(`/client/v11/databases/${attachment.addon.id}/wait_status`, {
-                hostname: (0, host_1.default)(),
+                hostname: heroku_cli_util_1.utils.pg.host(),
             });
             if (status['waiting?']) {
                 core_1.ux.error((0, tsheredoc_1.default)(`
@@ -95,7 +96,7 @@ class Promote extends command_1.Command {
             core_1.ux.action.stop();
         }
         const { body: promotedDatabaseDetails } = await this.heroku.get(`/client/v11/databases/${attachment.addon.id}`, {
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_1.utils.pg.host(),
         });
         if (promotedDatabaseDetails.following) {
             const unfollowLeaderCmd = `heroku pg:unfollow ${attachment.addon.name}`;

package/lib/commands/pg/ps.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 psql_1 = require("../../lib/pg/psql");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../nls");
 class Ps extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Ps);
         const { database: databaseName } = args;
         const { verbose, app } = flags;
-        const db = await (0, fetcher_1.database)(this.heroku, app, databaseName);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const db = await dbResolver.getDatabase(app, databaseName);
+        const psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         const num = Math.random();
         const waitingMarker = `${num}${num}`;
         const waitingQuery = (0, tsheredoc_1.default)(`
@@ -23,7 +24,7 @@ class Ps extends command_1.Command {
            AND TABLE_NAME = 'pg_stat_activity'
            AND COLUMN_NAME = 'waiting')
     `);
-        const waitingOutput = await (0, psql_1.exec)(db, waitingQuery);
+        const waitingOutput = await psqlService.execQuery(waitingQuery);
         const waiting = waitingOutput.includes(waitingMarker) ? 'waiting' : 'wait_event IS NOT NULL AS waiting';
         const query = (0, tsheredoc_1.default)(`SELECT pid,
            state,
@@ -36,7 +37,7 @@ class Ps extends command_1.Command {
       AND pid <> pg_backend_pid()
     ORDER BY query_start DESC
     `);
-        const output = await (0, psql_1.exec)(db, query);
+        const output = await psqlService.execQuery(query);
         process.stdout.write(output);
     }
 }

package/lib/commands/pg/psql.js

@@ -3,17 +3,18 @@ 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 psql_1 = require("../../lib/pg/psql");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../nls");
+const psql_1 = require("../../lib/pg/psql");
 class Psql extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Psql);
         const { app, command, credential, file } = flags;
         const namespace = credential ? `credential:${credential}` : undefined;
         let db;
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
         try {
-            db = await (0, fetcher_1.database)(this.heroku, app, args.database, namespace);
+            db = await dbResolver.getDatabase(app, args.database, namespace);
         }
         catch (error) {
             if (namespace && error instanceof Error && error.message === "Couldn't find that addon.") {
@@ -21,9 +22,10 @@ class Psql extends command_1.Command {
             }
             throw error;
         }
+        const psqlService = new heroku_cli_util_1.utils.pg.PsqlService(db);
         console.error(`--> Connecting to ${color_1.default.yellow(db.attachment.addon.name)}`);
         if (command) {
-            const output = await (0, psql_1.exec)(db, command);
+            const output = await psqlService.execQuery(command);
             process.stdout.write(output);
         }
         else if (file) {

package/lib/commands/pg/pull.d.ts

@@ -1,5 +1,5 @@
 import { Command } from '@heroku-cli/command';
-import { ConnectionDetails } from '../../lib/pg/util';
+import { ConnectionDetails } from '@heroku/heroku-cli-util';
 export default class Pull extends Command {
     static topic: string;
     static description: string;

package/lib/commands/pg/pull.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 util_1 = require("../../lib/pg/util");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const push_pull_1 = require("../../lib/pg/push_pull");
 const node_child_process_1 = require("node:child_process");
 const nls_1 = require("../../nls");
@@ -15,8 +14,9 @@ class Pull extends command_1.Command {
         const { flags, args } = await this.parse(Pull);
         const { app, 'exclude-table-data': excludeTableData } = flags;
         const exclusions = (0, push_pull_1.parseExclusions)(excludeTableData);
-        const source = await (0, fetcher_1.database)(this.heroku, app, args.source);
-        const target = (0, util_1.parsePostgresConnectionString)(args.target);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const source = await dbResolver.getDatabase(app, args.source);
+        const target = heroku_cli_util_1.utils.pg.DatabaseResolver.parsePostgresConnectionString(args.target);
         core_1.ux.log(`Pulling ${color_1.default.cyan(source.attachment.addon.name)} to ${color_1.default.addon(args.target)}`);
         await this.pull(source, target, exclusions);
         core_1.ux.log('Pulling complete.');

package/lib/commands/pg/push.d.ts

@@ -1,5 +1,5 @@
 import { Command } from '@heroku-cli/command';
-import { ConnectionDetails } from '../../lib/pg/util';
+import { ConnectionDetails } from '@heroku/heroku-cli-util';
 export default class Push extends Command {
     static topic: string;
     static description: string;

package/lib/commands/pg/push.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 util_1 = require("../../lib/pg/util");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const push_pull_1 = require("../../lib/pg/push_pull");
 const node_child_process_1 = require("node:child_process");
 const nls_1 = require("../../nls");
@@ -15,8 +14,9 @@ class Push extends command_1.Command {
         const { flags, args } = await this.parse(Push);
         const { app, 'exclude-table-data': excludeTableData } = flags;
         const exclusions = (0, push_pull_1.parseExclusions)(excludeTableData);
-        const source = (0, util_1.parsePostgresConnectionString)(args.source);
-        const target = await (0, fetcher_1.database)(this.heroku, app, args.target);
+        const source = heroku_cli_util_1.utils.pg.DatabaseResolver.parsePostgresConnectionString(args.source);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const target = await dbResolver.getDatabase(app, args.target);
         core_1.ux.log(`Pushing ${color_1.default.cyan(args.source)} to ${color_1.default.addon(target.attachment.addon.name)}`);
         await this.push(source, target, exclusions);
         core_1.ux.log('Pushing complete.');

package/lib/commands/pg/reset.js

@@ -4,15 +4,15 @@ const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const confirmCommand_1 = require("../../lib/confirmCommand");
-const host_1 = require("../../lib/pg/host");
-const fetcher_1 = require("../../lib/pg/fetcher");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../nls");
 class Reset extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Reset);
         const { app, confirm, extensions } = flags;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, args.database);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, args.database);
         let extensionsArray;
         if (extensions) {
             extensionsArray = extensions.split(',')
@@ -26,7 +26,7 @@ class Reset extends command_1.Command {
     `));
         core_1.ux.action.start(`Resetting ${color_1.default.addon(db.name)}`);
         await this.heroku.put(`/client/v11/databases/${db.id}/reset`, {
-            body: { extensions: extensionsArray }, hostname: (0, host_1.default)(),
+            body: { extensions: extensionsArray }, hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop();
     }