heroku 10.7.0 → 10.7.1-alpha.0

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

@@ -3,6 +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 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");
@@ -29,7 +30,7 @@ class Index extends command_1.Command {
                 core_1.ux.log();
             else
                 once = true;
-            core_1.ux.styledHeader(color_1.default.yellow(db.name));
+            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)
@@ -40,7 +41,7 @@ class Index extends command_1.Command {
                 const remoteAttachmentName = ((_a = link.remote) === null || _a === void 0 ? void 0 : _a.attachment_name) || '';
                 const remoteName = ((_b = link.remote) === null || _b === void 0 ? void 0 : _b.name) || '';
                 const remoteLinkText = `${color_1.default.green(remoteAttachmentName)} (${color_1.default.yellow(remoteName)})`;
-                core_1.ux.styledObject({
+                heroku_cli_util_1.hux.styledObject({
                     created_at: link.created_at,
                     remote: remoteLinkText,
                 });

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

@@ -2,6 +2,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 resolve_1 = require("../../../lib/addons/resolve");
 const util_1 = require("../../../lib/pg/util");
 const host_1 = require("../../../lib/pg/host");
@@ -15,12 +16,12 @@ class Index extends command_1.Command {
         if ((0, util_1.essentialPlan)(db))
             core_1.ux.error('You can’t perform this operation on Essential-tier databases.');
         const { body: settings } = await this.heroku.get(`/postgres/v0/databases/${db.id}/config`, { hostname: (0, host_1.default)() });
-        core_1.ux.styledHeader(db.name);
+        heroku_cli_util_1.hux.styledHeader(db.name);
         const remapped = {};
         Object.keys(settings).forEach(k => {
             remapped[k.replace(/_/g, '-')] = settings[k].value;
         });
-        core_1.ux.styledObject(remapped);
+        heroku_cli_util_1.hux.styledObject(remapped);
     }
 }
 exports.default = Index;

package/lib/commands/pipelines/diff.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const http_call_1 = require("@heroku/http-call");
 const api_1 = require("../../lib/api");
 const kolkrabbi_api_1 = require("../../lib/pipelines/kolkrabbi-api");
@@ -34,7 +35,7 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
         }
         const { body: githubDiff } = await http_call_1.default.get(`https://api.github.com/repos/${path}`, { headers });
         core_1.ux.log('');
-        core_1.ux.styledHeader(`${color_1.default.app(targetApp.name)} is ahead of ${color_1.default.app(downstreamApp.name)} by ${githubDiff.ahead_by} commit${githubDiff.ahead_by === 1 ? '' : 's'}`);
+        heroku_cli_util_1.hux.styledHeader(`${color_1.default.app(targetApp.name)} is ahead of ${color_1.default.app(downstreamApp.name)} by ${githubDiff.ahead_by} commit${githubDiff.ahead_by === 1 ? '' : 's'}`);
         const mapped = githubDiff.commits.map((commit) => {
             return {
                 sha: commit.sha.slice(0, 7),
@@ -43,7 +44,7 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
                 message: commit.commit.message.split('\n')[0],
             };
         }).reverse();
-        core_1.ux.table(mapped, {
+        heroku_cli_util_1.hux.table(mapped, {
             sha: {
                 header: 'SHA',
             },

package/lib/commands/pipelines/index.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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 class Pipelines extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Pipelines);
         const { body: pipelines } = await this.heroku.get('/pipelines');
         if (flags.json) {
-            core_1.ux.styledJSON(pipelines);
+            heroku_cli_util_1.hux.styledJSON(pipelines);
         }
         else {
-            core_1.ux.styledHeader('My Pipelines');
+            heroku_cli_util_1.hux.styledHeader('My Pipelines');
             for (const pipeline of pipelines) {
                 core_1.ux.log(pipeline.name);
             }

package/lib/commands/pipelines/info.js

@@ -2,6 +2,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 api_1 = require("../../lib/api");
 const disambiguate_1 = require("../../lib/pipelines/disambiguate");
 const render_pipeline_1 = require("../../lib/pipelines/render-pipeline");
@@ -11,7 +12,7 @@ class PipelinesInfo extends command_1.Command {
         const pipeline = await (0, disambiguate_1.default)(this.heroku, args.pipeline);
         const pipelineApps = await (0, api_1.listPipelineApps)(this.heroku, pipeline.id);
         if (flags.json) {
-            core_1.ux.styledJSON({ pipeline, apps: pipelineApps });
+            heroku_cli_util_1.hux.styledJSON({ pipeline, apps: pipelineApps });
         }
         else {
             await (0, render_pipeline_1.default)(this.heroku, pipeline, pipelineApps, {

package/lib/commands/pipelines/promote.js

@@ -4,6 +4,7 @@ exports.sleep = void 0;
 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 assert = require("assert");
 const node_fetch_1 = require("node-fetch");
 const Stream = require("stream");
@@ -196,7 +197,7 @@ class Promote extends command_1.Command {
         else {
             core_1.ux.warn('\nPromotion to some apps failed');
         }
-        core_1.ux.styledObject(styledTargets);
+        heroku_cli_util_1.hux.styledObject(styledTargets);
     }
 }
 exports.default = Promote;

package/lib/commands/pipelines/transfer.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const api_1 = require("../../lib/api");
 const disambiguate_1 = require("../../lib/pipelines/disambiguate");
 const render_pipeline_1 = require("../../lib/pipelines/render-pipeline");
@@ -36,7 +37,7 @@ class PipelinesTransfer extends command_1.Command {
             core_1.ux.log('');
             core_1.ux.warn(`This will transfer ${color_1.default.pipeline(pipeline.name)} and all of the listed apps to the ${args.owner} ${displayType}`);
             core_1.ux.warn(`to proceed, type ${color_1.default.red(pipeline.name)} or re-run this command with ${color_1.default.red('--confirm')} ${pipeline.name}`);
-            confirmName = await core_1.ux.prompt('', {});
+            confirmName = await heroku_cli_util_1.hux.prompt('', {});
         }
         if (confirmName !== pipeline.name) {
             core_1.ux.warn(`Confirmation did not match ${color_1.default.red(pipeline.name)}. Aborted.`);

package/lib/commands/ps/index.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 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 time_1 = require("../../lib/time");
 const tsheredoc_1 = require("tsheredoc");
 function getProcessNumber(s) {
@@ -41,7 +42,7 @@ function truncate(s) {
 }
 function printExtended(dynos) {
     const sortedDynos = dynos.sort(byProcessTypeAndNumber);
-    core_1.ux.table(sortedDynos, {
+    heroku_cli_util_1.hux.table(sortedDynos, {
         ID: { get: (dyno) => dyno.id },
         Process: { get: (dyno) => dyno.name },
         State: { get: (dyno) => `${dyno.state} ${(0, time_1.ago)(new Date(dyno.updated_at))}` },
@@ -117,7 +118,7 @@ function printDynos(dynos) {
     const commands = dynos.filter(d => d.type !== 'run').map(d => d.command).filter(uniqueValues);
     // Print one-off dynos
     if (oneOffs.length > 0) {
-        core_1.ux.styledHeader(`${color_1.default.green('run')}: one-off processes (${color_1.default.yellow(oneOffs.length.toString())})`);
+        heroku_cli_util_1.hux.styledHeader(`${color_1.default.green('run')}: one-off processes (${color_1.default.yellow(oneOffs.length.toString())})`);
         oneOffs.forEach(dyno => core_1.ux.log(decorateOneOffDyno(dyno)));
         core_1.ux.log();
     }
@@ -127,7 +128,7 @@ function printDynos(dynos) {
         const type = commandDynos[0].type;
         // eslint-disable-next-line unicorn/explicit-length-check
         const size = commandDynos[0].size || '1X';
-        core_1.ux.styledHeader(`${color_1.default.green(type)} (${color_1.default.cyan(size)}): ${command} (${color_1.default.yellow(commandDynos.length.toString())})`);
+        heroku_cli_util_1.hux.styledHeader(`${color_1.default.green(type)} (${color_1.default.cyan(size)}): ${command} (${color_1.default.yellow(commandDynos.length.toString())})`);
         for (const dyno of commandDynos)
             core_1.ux.log(decorateCommandDyno(dyno));
         core_1.ux.log();
@@ -168,7 +169,7 @@ class Index extends command_1.Command {
         }
         selectedDynos = selectedDynos.sort(byProcessName);
         if (json)
-            core_1.ux.styledJSON(selectedDynos);
+            heroku_cli_util_1.hux.styledJSON(selectedDynos);
         else if (extended)
             printExtended(selectedDynos);
         else {

package/lib/commands/ps/type.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 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 lodash_1 = require("lodash");
 const tsheredoc_1 = require("tsheredoc");
 const COST_MONTHLY = {
@@ -101,8 +102,8 @@ const displayFormation = async (heroku, app) => {
     if (formation.length === 0) {
         throw emptyFormationErr(app);
     }
-    core_1.ux.styledHeader('Process Types');
-    core_1.ux.table(formationTableData, {
+    heroku_cli_util_1.hux.styledHeader('Process Types');
+    heroku_cli_util_1.hux.table(formationTableData, {
         type: {},
         size: {},
         qty: {},
@@ -110,8 +111,8 @@ const displayFormation = async (heroku, app) => {
         'max cost/month': {},
     });
     core_1.ux.log();
-    core_1.ux.styledHeader('Dyno Totals');
-    core_1.ux.table(dynoTotalsTableData, {
+    heroku_cli_util_1.hux.styledHeader('Dyno Totals');
+    heroku_cli_util_1.hux.table(dynoTotalsTableData, {
         type: {},
         total: {},
     });

package/lib/commands/ps/wait.js

@@ -3,6 +3,7 @@ var _a;
 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");
 class Wait extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Wait);
@@ -44,7 +45,7 @@ class Wait extends command_1.Command {
                 core_1.ux.action.start(`Waiting for every dyno to be running v${latestRelease.version}`);
             }
             core_1.ux.action.status = releasedFraction;
-            await core_1.ux.wait(interval * 1000);
+            await heroku_cli_util_1.hux.wait(interval * 1000);
         }
     }
 }

package/lib/commands/regions.js

@@ -2,7 +2,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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const _ = require("lodash");
 class Regions extends command_1.Command {
     async run() {
@@ -16,10 +16,10 @@ class Regions extends command_1.Command {
         }
         regions = _.sortBy(regions, ['private_capable', 'name']);
         if (flags.json) {
-            core_1.ux.styledJSON(regions);
+            heroku_cli_util_1.hux.styledJSON(regions);
         }
         else {
-            core_1.ux.table(regions, {
+            heroku_cli_util_1.hux.table(regions, {
                 name: {
                     header: 'ID',
                     get: ({ name }) => color_1.default.green(name),

package/lib/commands/releases/index.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const lodash_1 = require("lodash");
 const statusHelper = require("../../lib/releases/status_helper");
 const time = require("../../lib/time");
@@ -104,8 +105,8 @@ class Index extends command_1.Command {
             if (currentRelease) {
                 header += ' - ' + color_1.default.cyan(`Current: v${currentRelease.version}`);
             }
-            core_1.ux.styledHeader(header);
-            core_1.ux.table(releases, columns, { 'no-header': true, 'no-truncate': true, extended });
+            heroku_cli_util_1.hux.styledHeader(header);
+            heroku_cli_util_1.hux.table(releases, columns, { 'no-header': true, 'no-truncate': true, extended });
         }
     }
 }

package/lib/commands/releases/info.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const shellescape = require("shell-escape");
 const { forEach } = require('lodash');
 const releases_1 = require("../../lib/releases/releases");
@@ -14,7 +15,7 @@ class Info extends command_1.Command {
         const { json, shell, app } = flags;
         const release = await (0, releases_1.findByLatestOrId)(this.heroku, app, args.release);
         if (json) {
-            core_1.ux.styledJSON(release);
+            heroku_cli_util_1.hux.styledJSON(release);
         }
         else {
             let releaseChange = release.description;
@@ -25,8 +26,8 @@ class Info extends command_1.Command {
             if (status) {
                 releaseChange += ' (' + color_1.default[statusColor](status) + ')';
             }
-            core_1.ux.styledHeader(`Release ${color_1.default.cyan('v' + release.version)}`);
-            core_1.ux.styledObject({
+            heroku_cli_util_1.hux.styledHeader(`Release ${color_1.default.cyan('v' + release.version)}`);
+            heroku_cli_util_1.hux.styledObject({
                 'Add-ons': release.addon_plan_names,
                 Change: releaseChange,
                 By: userEmail,
@@ -34,14 +35,14 @@ class Info extends command_1.Command {
                 When: release.created_at,
             });
             core_1.ux.log();
-            core_1.ux.styledHeader(`${color_1.default.cyan('v' + release.version)} Config vars`);
+            heroku_cli_util_1.hux.styledHeader(`${color_1.default.cyan('v' + release.version)} Config vars`);
             if (shell) {
                 forEach(config, (v, k) => {
                     core_1.ux.log(`${k}=${shellescape([v])}`);
                 });
             }
             else {
-                core_1.ux.styledObject(config);
+                heroku_cli_util_1.hux.styledObject(config);
             }
         }
     }

package/lib/commands/sessions/index.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const { sortBy } = require('lodash');
 class SessionsIndex extends command_1.Command {
     async run() {
@@ -10,14 +11,14 @@ class SessionsIndex extends command_1.Command {
         let { body: sessions } = await this.heroku.get('/oauth/sessions');
         sessions = sortBy(sessions, 'description');
         if (flags.json) {
-            core_1.ux.styledJSON(sessions);
+            heroku_cli_util_1.hux.styledJSON(sessions);
         }
         else if (sessions.length === 0) {
             core_1.ux.log('No OAuth sessions.');
         }
         else {
             const printLine = (...args) => this.log(...args);
-            core_1.ux.table(sessions, {
+            heroku_cli_util_1.hux.table(sessions, {
                 description: { get: (v) => color_1.default.green(v.description) },
                 id: {},
             }, { 'no-header': true, printLine });

package/lib/commands/spaces/create.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const tsheredoc_1 = require("tsheredoc");
 const spaces_1 = require("../../lib/spaces/spaces");
 const completions_1 = require("../../lib/autocomplete/completions");
@@ -44,8 +45,8 @@ class Create extends command_1.Command {
         core_1.ux.action.stop();
         core_1.ux.warn(`${color_1.default.bold('Spend Alert.')} Each Heroku ${spaceType} Private Space costs ~${dollarAmountHourly}/hour (max ${dollarAmountMonthly}/month), pro-rated to the second.`);
         core_1.ux.warn(`Use ${color_1.default.cmd('heroku spaces:wait')} to track allocation.`);
-        core_1.ux.styledHeader(space.name);
-        core_1.ux.styledObject({
+        heroku_cli_util_1.hux.styledHeader(space.name);
+        heroku_cli_util_1.hux.styledObject({
             ID: space.id, Team: space.team.name, Region: space.region.name, CIDR: space.cidr, 'Data CIDR': space.data_cidr, State: space.state, Shield: (0, spaces_1.displayShieldState)(space), Generation: (0, generation_1.getGeneration)(space), 'Created at': space.created_at,
         }, ['ID', 'Team', 'Region', 'CIDR', 'Data CIDR', 'State', 'Shield', 'Generation', 'Created at']);
     }

package/lib/commands/spaces/index.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const generation_1 = require("../../lib/apps/generation");
 class Index extends command_1.Command {
     async run() {
@@ -39,7 +40,7 @@ class Index extends command_1.Command {
         core_1.ux.log(JSON.stringify(spaces, null, 2));
     }
     display(spaces) {
-        core_1.ux.table(spaces, {
+        heroku_cli_util_1.hux.table(spaces, {
             Name: { get: space => space.name },
             Team: { get: space => space.team.name },
             Region: { get: space => space.region.name },

package/lib/commands/spaces/ps.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const time_1 = require("../../lib/time");
 const getProcessNum = (s) => Number.parseInt(s.split('.', 2)[1], 10);
 class Ps extends command_1.Command {
@@ -27,7 +28,7 @@ class Ps extends command_1.Command {
             });
         }
         if (flags.json) {
-            core_1.ux.styledJSON(spaceDynos);
+            heroku_cli_util_1.hux.styledJSON(spaceDynos);
         }
         else {
             this.render(spaceDynos);
@@ -61,7 +62,7 @@ class Ps extends command_1.Command {
             (_b = dynosByCommand.get(key)) === null || _b === void 0 ? void 0 : _b.push(item);
         }
         for (const [key, dynos] of dynosByCommand) {
-            core_1.ux.styledHeader(`${appName} ${key} (${color_1.default.yellow(dynos.length)})`);
+            heroku_cli_util_1.hux.styledHeader(`${appName} ${key} (${color_1.default.yellow(dynos.length)})`);
             dynos.sort((a, b) => getProcessNum(a) - getProcessNum(b));
             for (const dyno of dynos) {
                 core_1.ux.log(dyno);

package/lib/commands/spaces/topology.js

@@ -2,6 +2,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 tsheredoc_1 = require("tsheredoc");
 const color_1 = require("@heroku-cli/color");
 class Topology extends command_1.Command {
@@ -27,7 +28,7 @@ class Topology extends command_1.Command {
     }
     render(topology, appInfo, json) {
         if (json) {
-            core_1.ux.styledJSON(topology);
+            heroku_cli_util_1.hux.styledJSON(topology);
         }
         else if (topology.apps) {
             topology.apps.forEach(app => {
@@ -62,8 +63,8 @@ class Topology extends command_1.Command {
                 if (formations.length > 0) {
                     header += ` (${color_1.default.cyan(formations.join(', '))})`;
                 }
-                core_1.ux.styledHeader(header || '');
-                core_1.ux.styledObject({
+                heroku_cli_util_1.hux.styledHeader(header || '');
+                heroku_cli_util_1.hux.styledObject({
                     Domains: domains, Dynos: dynos,
                 }, ['Domains', 'Dynos']);
                 core_1.ux.log();

package/lib/commands/spaces/trusted-ips/index.js

@@ -2,6 +2,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 tsheredoc_1 = require("tsheredoc");
 class Index extends command_1.Command {
     async run() {
@@ -20,13 +21,13 @@ class Index extends command_1.Command {
     }
     displayRules(space, ruleset) {
         if (ruleset.rules.length > 0) {
-            core_1.ux.styledHeader('Trusted IP Ranges');
+            heroku_cli_util_1.hux.styledHeader('Trusted IP Ranges');
             for (const rule of ruleset.rules) {
                 core_1.ux.log(rule.source);
             }
         }
         else {
-            core_1.ux.styledHeader(`${space} has no trusted IP ranges. All inbound web requests to dynos are blocked.`);
+            heroku_cli_util_1.hux.styledHeader(`${space} has no trusted IP ranges. All inbound web requests to dynos are blocked.`);
         }
     }
 }

package/lib/commands/spaces/vpn/config.js

@@ -2,6 +2,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 vpn_connections_1 = require("../../../lib/spaces/vpn-connections");
 const tsheredoc_1 = require("tsheredoc");
 class Config extends command_1.Command {
@@ -11,7 +12,7 @@ class Config extends command_1.Command {
         const { name } = args;
         const { body: vpnConnection } = await this.heroku.get(`/spaces/${space}/vpn-connections/${name}`);
         if (json) {
-            core_1.ux.styledJSON(vpnConnection);
+            heroku_cli_util_1.hux.styledJSON(vpnConnection);
         }
         else {
             (0, vpn_connections_1.displayVPNConfigInfo)(space, name, vpnConnection);

package/lib/commands/spaces/vpn/connections.js

@@ -2,6 +2,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 tsheredoc_1 = require("tsheredoc");
 const format_1 = require("../../../lib/spaces/format");
 class Connections extends command_1.Command {
@@ -13,7 +14,7 @@ class Connections extends command_1.Command {
     }
     render(space, connections, json) {
         if (json) {
-            core_1.ux.styledJSON(connections);
+            heroku_cli_util_1.hux.styledJSON(connections);
         }
         else {
             this.displayVPNConnections(space, connections);
@@ -24,8 +25,8 @@ class Connections extends command_1.Command {
             core_1.ux.log('No VPN Connections have been created yet');
             return;
         }
-        core_1.ux.styledHeader(`${space} VPN Connections`);
-        core_1.ux.table(connections, {
+        heroku_cli_util_1.hux.styledHeader(`${space} VPN Connections`);
+        heroku_cli_util_1.hux.table(connections, {
             Name: {
                 get: c => c.name || c.id,
             },

package/lib/commands/spaces/vpn/info.js

@@ -2,6 +2,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 tsheredoc_1 = require("tsheredoc");
 const format_1 = require("../../../lib/spaces/format");
 class Info extends command_1.Command {
@@ -14,8 +15,8 @@ class Info extends command_1.Command {
         this.render(connectionName, vpnConnection, json);
     }
     displayVPNInfo(name, vpnConnection) {
-        core_1.ux.styledHeader(`${name} VPN Info`);
-        core_1.ux.styledObject({
+        heroku_cli_util_1.hux.styledHeader(`${name} VPN Info`);
+        heroku_cli_util_1.hux.styledObject({
             Name: name,
             ID: vpnConnection.id,
             'Public IP': vpnConnection.public_ip,
@@ -27,8 +28,8 @@ class Info extends command_1.Command {
         vpnConnectionTunnels.forEach((val, i) => {
             val.tunnel_id = 'Tunnel ' + (i + 1);
         });
-        core_1.ux.styledHeader(`${name} VPN Tunnel Info`);
-        core_1.ux.table(vpnConnectionTunnels, {
+        heroku_cli_util_1.hux.styledHeader(`${name} VPN Tunnel Info`);
+        heroku_cli_util_1.hux.table(vpnConnectionTunnels, {
             tunnel_id: { header: 'VPN Tunnel' },
             ip: { header: 'IP Address' },
             status: {
@@ -41,7 +42,7 @@ class Info extends command_1.Command {
     }
     render(name, vpnConnection, json) {
         if (json) {
-            core_1.ux.styledJSON(vpnConnection);
+            heroku_cli_util_1.hux.styledJSON(vpnConnection);
         }
         else {
             this.displayVPNInfo(name, vpnConnection);

package/lib/commands/spaces/vpn/wait.js

@@ -3,6 +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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const vpn_connections_1 = require("../../../lib/spaces/vpn-connections");
 const tsheredoc_1 = require("tsheredoc");
 const wait = (ms) => new Promise(resolve => {
@@ -36,7 +37,7 @@ class Wait extends command_1.Command {
         core_1.ux.action.stop();
         const { body: newVpnConnection } = await this.heroku.get(`/spaces/${space}/vpn-connections/${name}`);
         if (json) {
-            core_1.ux.styledJSON(newVpnConnection);
+            heroku_cli_util_1.hux.styledJSON(newVpnConnection);
         }
         else {
             (0, vpn_connections_1.displayVPNConfigInfo)(space, name, newVpnConnection);

package/lib/commands/status.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("@heroku-cli/color");
 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 date_fns_1 = require("date-fns");
 const http_call_1 = require("@heroku/http-call");
@@ -21,7 +22,7 @@ class Status extends core_1.Command {
         const host = process.env.HEROKU_STATUS_HOST || 'https://status.heroku.com';
         const { body } = await http_call_1.default.get(host + apiPath);
         if (flags.json) {
-            core_1.ux.styledJSON(body);
+            heroku_cli_util_1.hux.styledJSON(body);
             return;
         }
         for (const item of body.status) {
@@ -30,7 +31,7 @@ class Status extends core_1.Command {
         }
         for (const incident of body.incidents) {
             core_1.ux.log();
-            core_1.ux.styledHeader(`${incident.title} ${color_1.default.yellow(incident.created_at)} ${color_1.default.cyan(incident.full_url)}`);
+            heroku_cli_util_1.hux.styledHeader(`${incident.title} ${color_1.default.yellow(incident.created_at)} ${color_1.default.cyan(incident.full_url)}`);
             const padding = (0, util_2.maxBy)(incident.updates, (i) => i.update_type.length).update_type.length + 0;
             for (const u of incident.updates) {
                 core_1.ux.log(`${color_1.default.yellow(u.update_type.padEnd(padding))} ${new Date(u.updated_at).toISOString()} (${(0, date_fns_1.formatDistanceToNow)(new Date(u.updated_at))} ago)`);

package/lib/commands/teams/index.js

@@ -2,15 +2,15 @@
 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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
         const { body: teams } = await this.heroku.get('/teams');
         if (flags.json)
-            core_1.ux.styledJSON(teams);
+            heroku_cli_util_1.hux.styledJSON(teams);
         else {
-            core_1.ux.table(teams.sort((a, b) => {
+            heroku_cli_util_1.hux.table(teams.sort((a, b) => {
                 const aName = (a === null || a === void 0 ? void 0 : a.name) || '';
                 const bName = (b === null || b === void 0 ? void 0 : b.name) || '';
                 return (aName > bName) ? 1 : ((bName > aName) ? -1 : 0);

package/lib/commands/telemetry/index.js

@@ -2,6 +2,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");
 class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
@@ -30,8 +31,8 @@ class Index extends command_1.Command {
             core_1.ux.log(`There are no telemetry drains in ${owner}`);
         }
         else {
-            core_1.ux.styledHeader(`${owner} Telemetry Drains`);
-            core_1.ux.table(telemetryDrains, {
+            heroku_cli_util_1.hux.styledHeader(`${owner} Telemetry Drains`);
+            heroku_cli_util_1.hux.table(telemetryDrains, {
                 ID: { get: telemetryDrain => telemetryDrain.id },
                 Signals: { get: telemetryDrain => telemetryDrain.signals },
                 Endpoint: { get: telemetryDrain => telemetryDrain.exporter.endpoint },