heroku 10.13.2 → 10.13.3-beta.0

package/lib/commands/pg/backups/cancel.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 host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
 class Cancel extends command_1.Command {
     async run() {
@@ -16,15 +16,15 @@ class Cancel extends command_1.Command {
             if (!num) {
                 core_1.ux.error(`Invalid Backup: ${backup_id}`);
             }
-            ({ body: transfer } = await this.heroku.get(`/client/v11/apps/${app}/transfers/${num}`, { hostname: (0, host_1.default)() }));
+            ({ body: transfer } = await this.heroku.get(`/client/v11/apps/${app}/transfers/${num}`, { hostname: heroku_cli_util_1.utils.pg.host() }));
         }
         else {
-            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: (0, host_1.default)() });
+            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: heroku_cli_util_1.utils.pg.host() });
             transfer = this.sortByCreatedAtDesc(transfers).find(t => !t.finished_at);
         }
         if (transfer) {
             core_1.ux.action.start(`Cancelling ${pgbackups.name(transfer)}`);
-            this.heroku.post(`/client/v11/apps/${app}/transfers/${transfer.uuid}/actions/cancel`, { hostname: (0, host_1.default)() });
+            this.heroku.post(`/client/v11/apps/${app}/transfers/${transfer.uuid}/actions/cancel`, { hostname: heroku_cli_util_1.utils.pg.host() });
             core_1.ux.action.stop();
         }
         else {

package/lib/commands/pg/backups/capture.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 backups_1 = require("../../../lib/pg/backups");
-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 tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../../nls");
 class Capture extends command_1.Command {
@@ -15,10 +14,11 @@ class Capture extends command_1.Command {
         const { app, 'wait-interval': waitInterval, verbose } = flags;
         const { database } = args;
         const interval = Math.max(3, Number.parseInt(waitInterval || '3', 10));
-        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);
         const pgBackupsApi = (0, backups_1.default)(app, this.heroku);
         try {
-            const { body: dbInfo } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() });
+            const { body: dbInfo } = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() });
             const dbProtected = /On/.test(((_a = dbInfo.info.find(attribute => attribute.name === 'Continuous Protection')) === null || _a === void 0 ? void 0 : _a.values[0]) || '');
             if (dbProtected) {
                 core_1.ux.warn('Continuous protection is already enabled for this database. Logical backups of large databases are likely to fail.');
@@ -35,7 +35,7 @@ class Capture extends command_1.Command {
         `, { exit: 1 });
         }
         core_1.ux.action.start(`Starting backup of ${color_1.default.yellow(db.name)}`);
-        const { body: backup } = await this.heroku.post(`/client/v11/databases/${db.id}/backups`, { hostname: (0, host_1.default)() });
+        const { body: backup } = await this.heroku.post(`/client/v11/databases/${db.id}/backups`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
         core_1.ux.log((0, tsheredoc_1.default) `
 

package/lib/commands/pg/backups/delete.js

@@ -4,7 +4,7 @@ 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
 class Delete extends command_1.Command {
     async run() {
@@ -18,7 +18,7 @@ class Delete extends command_1.Command {
         if (!num) {
             throw new Error(`Invalid Backup: ${backup_id}`);
         }
-        await this.heroku.delete(`/client/v11/apps/${app}/transfers/${num}`, { hostname: (0, host_1.default)() });
+        await this.heroku.delete(`/client/v11/apps/${app}/transfers/${num}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

package/lib/commands/pg/backups/download.js

@@ -3,7 +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 host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
 const lodash_1 = require("lodash");
 const download_1 = require("../../../lib/pg/download");
@@ -32,7 +32,7 @@ class Download extends command_1.Command {
                 throw new Error(`Invalid Backup: ${backup_id}`);
         }
         else {
-            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: (0, host_1.default)() });
+            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: heroku_cli_util_1.utils.pg.host() });
             const lastBackup = (0, lodash_1.sortBy)(transfers.filter(t => t.succeeded && t.to_type === 'gof3r'), 'created_at')
                 .pop();
             if (!lastBackup)
@@ -40,7 +40,7 @@ class Download extends command_1.Command {
             num = lastBackup.num;
         }
         core_1.ux.action.status = `fetching url of #${num}`;
-        const { body: info } = await this.heroku.post(`/client/v11/apps/${app}/transfers/${num}/actions/public-url`, { hostname: (0, host_1.default)() });
+        const { body: info } = await this.heroku.post(`/client/v11/apps/${app}/transfers/${num}/actions/public-url`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop(`done, #${num}`);
         await (0, download_1.default)(info.url, output, { progress: true });
     }

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

@@ -5,11 +5,11 @@ const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
-const host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 class Index extends command_1.Command {
     async run() {
         const { flags: { app } } = await this.parse(Index);
-        const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: (0, host_1.default)() });
+        const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: heroku_cli_util_2.utils.pg.host() });
         // NOTE that the sort order is descending
         transfers.sort((transferA, transferB) => {
             if (transferA.created_at > transferB.created_at) {

package/lib/commands/pg/backups/info.js

@@ -4,7 +4,7 @@ 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 heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
 const lodash_1 = require("lodash");
 function status(backup) {
@@ -41,7 +41,7 @@ class Info extends command_1.Command {
                     throw new Error(`Invalid ID: ${id}`);
             }
             else {
-                let { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: (0, host_1.default)() });
+                let { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: heroku_cli_util_2.utils.pg.host() });
                 transfers = (0, lodash_1.sortBy)(transfers, 'created_at');
                 const backups = transfers.filter(t => t.from_type === 'pg_dump' && t.to_type === 'gof3r');
                 const lastBackup = backups.pop();
@@ -49,7 +49,7 @@ class Info extends command_1.Command {
                     throw new Error(`No backups. Capture one with ${color_1.default.cyan.bold('heroku pg:backups:capture')}`);
                 backupID = lastBackup.num;
             }
-            const { body: backup } = await this.heroku.get(`/client/v11/apps/${app}/transfers/${backupID}?verbose=true`, { hostname: (0, host_1.default)() });
+            const { body: backup } = await this.heroku.get(`/client/v11/apps/${app}/transfers/${backupID}?verbose=true`, { hostname: heroku_cli_util_2.utils.pg.host() });
             return backup;
         };
         this.displayBackup = (backup, app) => {

package/lib/commands/pg/backups/restore.js

@@ -6,8 +6,7 @@ const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
 const confirmCommand_1 = require("../../../lib/confirmCommand");
 const backups_1 = require("../../../lib/pg/backups");
-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");
 function dropboxURL(url) {
     if (url.match(/^https?:\/\/www\.dropbox\.com/) && !url.endsWith('dl=1')) {
@@ -25,7 +24,8 @@ class Restore extends command_1.Command {
         const { flags, args } = await this.parse(Restore);
         const { app, 'wait-interval': waitInterval, extensions, confirm, verbose } = flags;
         const interval = Math.max(3, waitInterval);
-        const { addon: db } = await (0, fetcher_1.getAttachment)(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);
         const { name, wait } = (0, backups_1.default)(app, this.heroku);
         let backupURL;
         let backupName = args.backup;
@@ -40,7 +40,7 @@ class Restore extends command_1.Command {
             else {
                 backupApp = app;
             }
-            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${backupApp}/transfers`, { hostname: (0, host_1.default)() });
+            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${backupApp}/transfers`, { hostname: heroku_cli_util_1.utils.pg.host() });
             const backups = transfers.filter(t => t.from_type === 'pg_dump' && t.to_type === 'gof3r');
             let backup;
             if (backupName) {
@@ -76,7 +76,7 @@ class Restore extends command_1.Command {
     Stop a running restore with ${color_1.default.cyan.bold('heroku pg:backups:cancel')}.
     `));
         const { body: restore } = await this.heroku.post(`/client/v11/databases/${db.id}/restores`, {
-            body: { backup_url: backupURL, extensions: this.getSortedExtensions(extensions) }, hostname: (0, host_1.default)(),
+            body: { backup_url: backupURL, extensions: this.getSortedExtensions(extensions) }, hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop();
         await wait('Restoring', restore.uuid, interval, verbose, db.app.id);

package/lib/commands/pg/backups/schedule.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 host_1 = require("../../../lib/pg/host");
-const fetcher_1 = require("../../../lib/pg/fetcher");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../../nls");
 const TZ = {
     PST: 'America/Los_Angeles',
@@ -39,10 +38,11 @@ class Schedule extends command_1.Command {
         const { app } = flags;
         const { database } = args;
         const schedule = this.parseDate(flags.at);
-        const attachment = await (0, fetcher_1.getAttachment)(this.heroku, app, database);
-        const db = attachment.addon;
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const attachment = await dbResolver.getAttachment(app, database);
+        const { addon: db, name } = attachment;
         const at = color_1.default.cyan(`${schedule.hour}:00 ${schedule.timezone}`);
-        const pgResponse = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() })
+        const pgResponse = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: heroku_cli_util_1.utils.pg.host() })
             .catch((error) => {
             if (error.statusCode !== 404)
                 throw error;
@@ -57,9 +57,9 @@ class Schedule extends command_1.Command {
             }
         }
         core_1.ux.action.start(`Scheduling automatic daily backups of ${color_1.default.yellow(db.name)} at ${at}`);
-        schedule.schedule_name = attachment.name + '_URL';
+        schedule.schedule_name = name + '_URL';
         await this.heroku.post(`/client/v11/databases/${db.id}/transfer-schedules`, {
-            body: schedule, hostname: (0, host_1.default)(),
+            body: schedule, hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop();
     }

package/lib/commands/pg/backups/schedules.js

@@ -4,14 +4,14 @@ 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 heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 const fetcher_1 = require("../../../lib/pg/fetcher");
 class Schedules extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Schedules);
         const { app } = flags;
         const db = await (0, fetcher_1.arbitraryAppDB)(this.heroku, app);
-        const { body: schedules } = await this.heroku.get(`/client/v11/databases/${db.id}/transfer-schedules`, { hostname: (0, host_1.default)() });
+        const { body: schedules } = await this.heroku.get(`/client/v11/databases/${db.id}/transfer-schedules`, { hostname: heroku_cli_util_2.utils.pg.host() });
         if (schedules.length === 0) {
             core_1.ux.warn(`No backup schedules found on ${color_1.default.app(app)}\nUse ${color_1.default.cyan.bold('heroku pg:backups:schedule')} to set one up`);
         }

package/lib/commands/pg/backups/unschedule.js

@@ -4,7 +4,7 @@ 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 nls_1 = require("../../../nls");
 class Unschedule extends command_1.Command {
     async run() {
@@ -14,7 +14,7 @@ class Unschedule extends command_1.Command {
         let db = database;
         if (!db) {
             const appDB = await (0, fetcher_1.arbitraryAppDB)(this.heroku, app);
-            const { body: schedules } = await this.heroku.get(`/client/v11/databases/${appDB.id}/transfer-schedules`, { hostname: (0, host_1.default)() });
+            const { body: schedules } = await this.heroku.get(`/client/v11/databases/${appDB.id}/transfer-schedules`, { hostname: heroku_cli_util_1.utils.pg.host() });
             if (schedules.length === 0)
                 throw new Error(`No schedules on ${color_1.default.app(app)}`);
             if (schedules.length > 1) {
@@ -24,12 +24,13 @@ class Unschedule extends command_1.Command {
             db = schedules[0].name;
         }
         core_1.ux.action.start(`Unscheduling ${color_1.default.green(db)} daily backups`);
-        const addon = await (0, fetcher_1.getAddon)(this.heroku, app, db);
-        const { body: schedules } = await this.heroku.get(`/client/v11/databases/${addon.id}/transfer-schedules`, { hostname: (0, host_1.default)() });
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon } = await dbResolver.getAttachment(app, db);
+        const { body: schedules } = await this.heroku.get(`/client/v11/databases/${addon.id}/transfer-schedules`, { hostname: heroku_cli_util_1.utils.pg.host() });
         const schedule = schedules.find(s => s.name.match(new RegExp(`${db}`, 'i')));
         if (!schedule)
             throw new Error(`No daily backups found for ${color_1.default.yellow(addon.name)}`);
-        await this.heroku.delete(`/client/v11/databases/${addon.id}/transfer-schedules/${schedule.uuid}`, { hostname: (0, host_1.default)() });
+        await this.heroku.delete(`/client/v11/databases/${addon.id}/transfer-schedules/${schedule.uuid}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

package/lib/commands/pg/backups/url.js

@@ -3,7 +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 host_1 = require("../../../lib/pg/host");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const backups_1 = require("../../../lib/pg/backups");
 const lodash_1 = require("lodash");
 class Url extends command_1.Command {
@@ -18,14 +18,14 @@ class Url extends command_1.Command {
                 throw new Error(`Invalid Backup: ${backup_id}`);
         }
         else {
-            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: (0, host_1.default)() });
+            const { body: transfers } = await this.heroku.get(`/client/v11/apps/${app}/transfers`, { hostname: heroku_cli_util_1.utils.pg.host() });
             const lastBackup = (0, lodash_1.sortBy)(transfers.filter(t => t.succeeded && t.to_type === 'gof3r'), 'created_at')
                 .pop();
             if (!lastBackup)
                 throw new Error(`No backups on ${color_1.default.app(app)}. Capture one with ${color_1.default.cyan.bold('heroku pg:backups:capture')}`);
             num = lastBackup.num;
         }
-        const { body: info } = await this.heroku.post(`/client/v11/apps/${app}/transfers/${num}/actions/public-url`, { hostname: (0, host_1.default)() });
+        const { body: info } = await this.heroku.post(`/client/v11/apps/${app}/transfers/${num}/actions/public-url`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.log(info.url);
     }
 }

package/lib/commands/pg/bloat.js

@@ -2,8 +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 psql_1 = require("../../lib/pg/psql");
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const nls_1 = require("../../nls");
 const query = `
 WITH constants AS (
@@ -71,8 +70,10 @@ class Bloat extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Bloat);
         const { app } = flags;
-        const db = await (0, fetcher_1.database)(this.heroku, app, args.database);
-        const output = await (0, psql_1.exec)(db, query);
+        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 output = await psqlService.execQuery(query);
         process.stdout.write(output);
     }
 }

package/lib/commands/pg/blocking.js

@@ -3,8 +3,7 @@ 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 Blocking extends command_1.Command {
     async run() {
@@ -26,8 +25,10 @@ class Blocking extends command_1.Command {
         ON bl.transactionid = kl.transactionid AND bl.pid != kl.pid
         WHERE NOT bl.granted
       `;
-        const db = await (0, fetcher_1.database)(this.heroku, app, args.database);
-        const output = await (0, psql_1.exec)(db, query);
+        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 output = await psqlService.execQuery(query);
         core_1.ux.log(output);
     }
 }

package/lib/commands/pg/connection-pooling/attach.js

@@ -3,22 +3,21 @@ 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 tsheredoc_1 = require("tsheredoc");
 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 nls_1 = require("../../../nls");
 class Attach extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Attach);
         const { app } = flags;
-        const db = await (0, fetcher_1.getAddon)(this.heroku, app, args.database);
-        const { body: addon } = await this.heroku.get(`/addons/${encodeURIComponent(db.name)}`);
+        const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(this.heroku);
+        const { addon: db } = await dbResolver.getAttachment(app, args.database);
         if ((0, util_1.essentialPlan)(db))
             core_1.ux.error('You can’t perform this operation on Essential-tier databases.');
-        core_1.ux.action.start(`Enabling Connection Pooling on ${color_1.default.yellow(addon.name)} to ${color_1.default.magenta(app)}`);
+        core_1.ux.action.start(`Enabling Connection Pooling on ${color_1.default.yellow(db.name)} to ${color_1.default.magenta(app)}`);
         const { body: attachment } = await this.heroku.post(`/client/v11/databases/${encodeURIComponent(db.name)}/connection-pooling`, {
-            body: { name: flags.as, credential: 'default', app: app }, hostname: (0, host_1.default)(),
+            body: { name: flags.as, credential: 'default', app: app }, hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop();
         core_1.ux.action.start(`Setting ${color_1.default.cyan(attachment.name)} config vars and restarting ${color_1.default.magenta(app)}`);

package/lib/commands/pg/copy.js

@@ -3,14 +3,13 @@ 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 backups_1 = require("../../lib/pg/backups");
-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 confirmCommand_1 = require("../../lib/confirmCommand");
 const getAttachmentInfo = async function (heroku, db, app) {
+    const dbResolver = new heroku_cli_util_1.utils.pg.DatabaseResolver(heroku);
     if (db.match(/^postgres:\/\//)) {
-        const conn = (0, util_1.parsePostgresConnectionString)(db);
+        const conn = heroku_cli_util_1.utils.pg.DatabaseResolver.parsePostgresConnectionString(db);
         const host = `${conn.host}:${conn.port}`;
         return {
             name: conn.database ? `database ${conn.database} on ${host}` : `database on ${host}`,
@@ -18,7 +17,7 @@ const getAttachmentInfo = async function (heroku, db, app) {
             confirm: conn.database || conn.host,
         };
     }
-    const attachment = await (0, fetcher_1.getAttachment)(heroku, app, db);
+    const attachment = await dbResolver.getAttachment(app, db);
     if (!attachment)
         throw new Error(`${db} not found on ${color_1.default.magenta(app)}`);
     const { body: addon } = await heroku.get(`/addons/${attachment.addon.name}`);
@@ -52,12 +51,12 @@ class Copy extends command_1.Command {
             body: {
                 from_name: source.name, from_url: source.url, to_name: target.name, to_url: target.url,
             },
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_1.utils.pg.host(),
         });
         core_1.ux.action.stop();
         if (source.attachment) {
             const { body: credentials } = await this.heroku.get(`/postgres/v0/databases/${source.attachment.addon.name}/credentials`, {
-                hostname: (0, host_1.default)(),
+                hostname: heroku_cli_util_1.utils.pg.host(),
                 headers: {
                     Authorization: `Basic ${Buffer.from(`:${this.heroku.auth}`).toString('base64')}`,
                 },

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

@@ -4,21 +4,21 @@ 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 nls_1 = require("../../../nls");
 class Create extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Create);
         const { app, name } = flags;
-        const { addon: db } = await (0, fetcher_1.getAttachment)(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);
         if ((0, util_1.essentialPlan)(db)) {
             throw new Error("You can't create a custom credential on Essential-tier databases.");
         }
         const data = { name };
         core_1.ux.action.start(`Creating credential ${color_1.default.cyan.bold(name)}`);
-        await this.heroku.post(`/postgres/v0/databases/${db.name}/credentials`, { hostname: (0, host_1.default)(), body: data });
+        await this.heroku.post(`/postgres/v0/databases/${db.name}/credentials`, { hostname: heroku_cli_util_1.utils.pg.host(), body: data });
         core_1.ux.action.stop();
         const attachCmd = `heroku addons:attach ${db.name} --credential ${name} -a ${app}`;
         const psqlCmd = `heroku pg:psql ${db.name} -a ${app}`;

package/lib/commands/pg/credentials/destroy.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 util_1 = require("../../../lib/pg/util");
-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 confirmCommand_1 = require("../../../lib/confirmCommand");
 const nls_1 = require("../../../nls");
 class Destroy extends command_1.Command {
@@ -16,7 +15,8 @@ class Destroy extends command_1.Command {
         if (name === 'default') {
             throw new Error('Default credential cannot be destroyed.');
         }
-        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("You can't destroy the default credential on Essential-tier databases.");
         }
@@ -28,7 +28,7 @@ class Destroy extends command_1.Command {
                 .join(', ')} before destroying.`);
         await (0, confirmCommand_1.default)(app, confirm);
         core_1.ux.action.start(`Destroying credential ${color_1.default.cyan.bold(name)}`);
-        await this.heroku.delete(`/postgres/v0/databases/${db.name}/credentials/${encodeURIComponent(name)}`, { hostname: (0, host_1.default)() });
+        await this.heroku.delete(`/postgres/v0/databases/${db.name}/credentials/${encodeURIComponent(name)}`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
         core_1.ux.log(`The credential has been destroyed within ${db.name}.`);
         core_1.ux.log(`Database objects owned by ${name} will be assigned to the default credential.`);

package/lib/commands/pg/credentials/repair-default.js

@@ -2,18 +2,18 @@
 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 confirmCommand_1 = require("../../../lib/confirmCommand");
 const tsheredoc_1 = require("tsheredoc");
-const host_1 = require("../../../lib/pg/host");
 const nls_1 = require("../../../nls");
 class RepairDefault extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(RepairDefault);
         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.essentialPlan)(db))
             throw new Error("You can't perform this operation on Essential-tier databases.");
         await (0, confirmCommand_1.default)(app, confirm, (0, tsheredoc_1.default)(`
@@ -22,7 +22,7 @@ class RepairDefault extends command_1.Command {
       This command will also grant the default credential admin option for all additional credentials.
     `));
         core_1.ux.action.start('Resetting permissions and object ownership for default role to factory settings');
-        await this.heroku.post(`/postgres/v0/databases/${db.name}/repair-default`, { hostname: (0, host_1.default)() });
+        await this.heroku.post(`/postgres/v0/databases/${db.name}/repair-default`, { hostname: heroku_cli_util_1.utils.pg.host() });
         core_1.ux.action.stop();
     }
 }

package/lib/commands/pg/credentials/rotate.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 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 Rotate extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Rotate);
         const { app, all, confirm, name, force } = flags;
-        const { addon: db } = await (0, fetcher_1.getAttachment)(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);
         const warnings = [];
         const cred = name || 'default';
         if (all && name !== undefined) {
@@ -48,7 +48,7 @@ class Rotate extends command_1.Command {
         }
         await (0, confirmCommand_1.default)(app, confirm, `Destructive Action\n${warnings.join('\n')}`);
         const options = {
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_1.utils.pg.host(),
             body: { forced: force !== null && force !== void 0 ? force : undefined },
             headers: {
                 Authorization: `Basic ${Buffer.from(`:${this.heroku.auth}`).toString('base64')}`,

package/lib/commands/pg/credentials/url.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 util_1 = require("../../../lib/pg/util");
-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 url_1 = require("url");
 const tsheredoc_1 = require("tsheredoc");
 const nls_1 = require("../../../nls");
@@ -14,12 +13,13 @@ class Url extends command_1.Command {
         const { flags, args } = await this.parse(Url);
         const { app, name } = 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) && name !== 'default') {
             core_1.ux.error('Legacy Essential-tier databases do not support named credentials.');
         }
         const { body: credInfo } = await this.heroku.get(`/postgres/v0/databases/${db.name}/credentials/${encodeURIComponent(name)}`, {
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_1.utils.pg.host(),
             headers: {
                 Authorization: `Basic ${Buffer.from(`:${this.heroku.auth}`).toString('base64')}`,
             },

package/lib/commands/pg/credentials.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 heroku_cli_util_2 = require("@heroku/heroku-cli-util");
 const util_1 = require("../../lib/pg/util");
 const nls_1 = require("../../nls");
 class Credentials extends command_1.Command {
@@ -12,9 +11,10 @@ class Credentials extends command_1.Command {
         const { flags, args } = await this.parse(Credentials);
         const { app } = flags;
         const { database } = args;
-        const addon = await (0, fetcher_1.getAddon)(this.heroku, app, database);
+        const dbResolver = new heroku_cli_util_2.utils.pg.DatabaseResolver(this.heroku);
+        const { addon } = await dbResolver.getAttachment(app, database);
         const { body: credentials } = await this.heroku.get(`/postgres/v0/databases/${addon.id}/credentials`, {
-            hostname: (0, host_1.default)(),
+            hostname: heroku_cli_util_2.utils.pg.host(),
             headers: {
                 Authorization: `Basic ${Buffer.from(`:${this.heroku.auth}`).toString('base64')}`,
             },