heroku 10.13.2 → 11.0.0-alpha.1

package/lib/commands/status.js

@@ -1,16 +1,14 @@
-"use strict";
-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");
-const util_2 = require("../lib/status/util");
+import { color } from '@heroku-cli/color';
+import { Command, Flags, ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { formatDistanceToNow } from 'date-fns';
+import { HTTP } from '@heroku/http-call';
+import { getMaxUpdateTypeLength } from '../lib/status/util.js';
+const capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 const errorMessage = 'Heroku platform status is unavailable at this time. Refer to https://status.salesforce.com/products/Heroku or try again later.';
 const printStatus = (status) => {
-    const colorize = color_1.default[status];
-    let message = (0, util_1.capitalize)(status);
+    const colorize = color[status];
+    let message = capitalize(status);
     if (status === 'green') {
         message = 'No known issues at this time.';
     }
@@ -25,18 +23,18 @@ const getTrustStatus = async () => {
     let localizations = [];
     try {
         const [instanceResponse, activeIncidentsResponse, maintenancesResponse, localizationsResponse] = await Promise.all([
-            http_call_1.default.get(`${trustHost}/instances?products=Heroku`),
-            http_call_1.default.get(`${trustHost}/incidents/active`),
-            http_call_1.default.get(`${trustHost}/maintenances?startTime=${currentDateTime}&limit=10&offset=0&product=Heroku&locale=en`),
-            http_call_1.default.get(`${trustHost}/localizations?locale=en`),
+            HTTP.get(`${trustHost}/instances?products=Heroku`),
+            HTTP.get(`${trustHost}/incidents/active`),
+            HTTP.get(`${trustHost}/maintenances?startTime=${currentDateTime}&limit=10&offset=0&product=Heroku&locale=en`),
+            HTTP.get(`${trustHost}/localizations?locale=en`),
         ]);
         instances = instanceResponse.body;
         activeIncidents = activeIncidentsResponse.body;
         maintenances = maintenancesResponse.body;
         localizations = localizationsResponse.body;
     }
-    catch (_a) {
-        core_1.ux.error(errorMessage, { exit: 1 });
+    catch {
+        ux.error(errorMessage, { exit: 1 });
     }
     return formatTrustResponse(instances, activeIncidents, maintenances, localizations);
 };
@@ -60,19 +58,13 @@ const formatTrustResponse = (instances, activeIncidents, maintenances, localizat
     const incidents = [];
     const scheduled = [];
     const instanceKeyArray = new Set(instances.map(instance => instance.key));
-    const herokuActiveIncidents = activeIncidents.filter(incident => {
-        return incident.instanceKeys.some(key => instanceKeyArray.has(key));
-    });
+    const herokuActiveIncidents = activeIncidents.filter(incident => incident.instanceKeys.some(key => instanceKeyArray.has(key)));
     const toolsIncidents = herokuActiveIncidents.filter(incident => {
         const tools = ['TOOLS', 'Tools', 'CLI', 'Dashboard', 'Platform API'];
         return tools.some(tool => incident.serviceKeys.includes(tool));
     });
-    const appsIncidents = herokuActiveIncidents.filter(incident => {
-        return incident.serviceKeys.includes('HerokuApps') || incident.serviceKeys.includes('Apps');
-    });
-    const dataIncidents = herokuActiveIncidents.filter(incident => {
-        return incident.serviceKeys.includes('HerokuData') || incident.serviceKeys.includes('Data');
-    });
+    const appsIncidents = herokuActiveIncidents.filter(incident => incident.serviceKeys.includes('HerokuApps') || incident.serviceKeys.includes('Apps'));
+    const dataIncidents = herokuActiveIncidents.filter(incident => incident.serviceKeys.includes('HerokuData') || incident.serviceKeys.includes('Data'));
     if (appsIncidents.length > 0) {
         const severity = determineIncidentSeverity(appsIncidents);
         systemStatus.push({ system: 'Apps', status: severity });
@@ -102,8 +94,7 @@ const formatTrustResponse = (instances, activeIncidents, maintenances, localizat
     if (incidents.length > 0) {
         incidents.forEach(incident => {
             incident.IncidentEvents.forEach(event => {
-                var _a;
-                event.localizedType = (_a = localizations.find((l) => l.modelKey === event.type)) === null || _a === void 0 ? void 0 : _a.text;
+                event.localizedType = localizations.find((l) => l.modelKey === event.type)?.text;
             });
         });
     }
@@ -113,9 +104,12 @@ const formatTrustResponse = (instances, activeIncidents, maintenances, localizat
         scheduled,
     };
 };
-class Status extends core_1.Command {
+export default class Status extends Command {
+    static description = 'display current status of the Heroku platform';
+    static flags = {
+        json: Flags.boolean({ description: 'output in json format' }),
+    };
     async run() {
-        var _a;
         const { flags } = await this.parse(Status);
         const herokuApiPath = '/api/v4/current-status';
         let herokuStatus;
@@ -127,21 +121,21 @@ class Status extends core_1.Command {
             try {
                 // Try calling the Heroku status API first
                 const herokuHost = process.env.HEROKU_STATUS_HOST || 'https://status.heroku.com';
-                const herokuStatusResponse = await http_call_1.default.get(herokuHost + herokuApiPath);
+                const herokuStatusResponse = await HTTP.get(herokuHost + herokuApiPath);
                 herokuStatus = herokuStatusResponse.body;
             }
-            catch (_b) {
+            catch {
                 // If the Heroku status API call fails, call the SF Trust API
                 formattedTrustStatus = await getTrustStatus();
             }
         }
         if (!herokuStatus && !formattedTrustStatus)
-            core_1.ux.error(errorMessage, { exit: 1 });
+            ux.error(errorMessage, { exit: 1 });
         if (flags.json) {
-            heroku_cli_util_1.hux.styledJSON(herokuStatus !== null && herokuStatus !== void 0 ? herokuStatus : formattedTrustStatus);
+            hux.styledJSON(herokuStatus ?? formattedTrustStatus);
             return;
         }
-        const systemStatus = herokuStatus ? herokuStatus.status : formattedTrustStatus === null || formattedTrustStatus === void 0 ? void 0 : formattedTrustStatus.status;
+        const systemStatus = herokuStatus ? herokuStatus.status : formattedTrustStatus?.status;
         if (systemStatus) {
             for (const item of systemStatus) {
                 const message = printStatus(item.status);
@@ -149,35 +143,30 @@ class Status extends core_1.Command {
             }
         }
         else {
-            core_1.ux.error(errorMessage, { exit: 1 });
+            ux.error(errorMessage, { exit: 1 });
         }
         if (herokuStatus) {
             for (const incident of herokuStatus.incidents) {
-                core_1.ux.log();
-                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.getMaxUpdateTypeLength)(incident.updates.map(update => update.update_type));
+                ux.stdout();
+                hux.styledHeader(`${incident.title} ${color.yellow(incident.created_at)} ${color.cyan(incident.full_url)}`);
+                const padding = getMaxUpdateTypeLength(incident.updates.map(update => update.update_type));
                 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)`);
-                    core_1.ux.log(`${u.contents}\n`);
+                    ux.stdout(`${color.yellow(u.update_type.padEnd(padding))} ${new Date(u.updated_at).toISOString()} (${formatDistanceToNow(new Date(u.updated_at))} ago)`);
+                    ux.stdout(`${u.contents}\n`);
                 }
             }
         }
         else if (formattedTrustStatus) {
             for (const incident of formattedTrustStatus.incidents) {
-                core_1.ux.log();
-                heroku_cli_util_1.hux.styledHeader(`${incident.id} ${color_1.default.yellow(incident.createdAt)} ${color_1.default.cyan(`https://status.salesforce.com/incidents/${incident.id}`)}`);
-                const padding = (0, util_2.getMaxUpdateTypeLength)(incident.IncidentEvents.map(event => { var _a; return (_a = event.localizedType) !== null && _a !== void 0 ? _a : event.type; }));
+                ux.stdout();
+                hux.styledHeader(`${incident.id} ${color.yellow(incident.createdAt)} ${color.cyan(`https://status.salesforce.com/incidents/${incident.id}`)}`);
+                const padding = getMaxUpdateTypeLength(incident.IncidentEvents.map(event => event.localizedType ?? event.type));
                 for (const event of incident.IncidentEvents) {
-                    const eventType = (_a = event.localizedType) !== null && _a !== void 0 ? _a : event.type;
-                    core_1.ux.log(`${color_1.default.yellow(eventType.padEnd(padding))} ${new Date(event.createdAt).toISOString()} (${(0, date_fns_1.formatDistanceToNow)(new Date(event.createdAt))} ago)`);
-                    core_1.ux.log(`${event.message}\n`);
+                    const eventType = event.localizedType ?? event.type;
+                    ux.stdout(`${color.yellow(eventType.padEnd(padding))} ${new Date(event.createdAt).toISOString()} (${formatDistanceToNow(new Date(event.createdAt))} ago)`);
+                    ux.stdout(`${event.message}\n`);
                 }
             }
         }
     }
 }
-exports.default = Status;
-Status.description = 'display current status of the Heroku platform';
-Status.flags = {
-    json: core_1.Flags.boolean({ description: 'output in json format' }),
-};

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

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

package/lib/commands/teams/index.js

@@ -1,29 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-class Index extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { hux } from '@heroku/heroku-cli-util';
+export default class Index extends Command {
+    static topic = 'teams';
+    static description = `list the teams that you are a member of\n\nUse ${color.cmd('heroku members:*')} to manage team members.`;
+    static flags = {
+        json: flags.boolean({ description: 'output in json format' }),
+    };
     async run() {
         const { flags } = await this.parse(Index);
         const { body: teams } = await this.heroku.get('/teams');
         if (flags.json)
-            heroku_cli_util_1.hux.styledJSON(teams);
+            hux.styledJSON(teams);
         else {
-            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) || '';
+            hux.table(teams.sort((a, b) => {
+                const aName = a?.name || '';
+                const bName = b?.name || '';
                 return (aName > bName) ? 1 : ((bName > aName) ? -1 : 0);
             }), {
                 name: { header: 'Team' },
-                role: { header: 'Role', get: ({ role }) => color_1.default.green(role || '') },
+                role: { header: 'Role', get: ({ role }) => color.green(role || '') },
             });
         }
     }
 }
-exports.default = Index;
-Index.topic = 'teams';
-Index.description = `list the teams that you are a member of\n\nUse ${color_1.default.cyan.bold('heroku members:*')} to manage team members.`;
-Index.flags = {
-    json: command_1.flags.boolean({ description: 'output in json format' }),
-};

package/lib/commands/telemetry/add.d.ts

@@ -2,14 +2,14 @@ import { Command } from '@heroku-cli/command';
 export default class Add extends Command {
     static description: string;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        headers: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        signals: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        transport: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        headers: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        signals: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        transport: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        endpoint: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        endpoint: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/add.js

@@ -1,10 +1,24 @@
-"use strict";
-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 util_1 = require("../../lib/telemetry/util");
-class Add extends command_1.Command {
+import { Command, flags as Flags } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+import { validateAndFormatSignals } from '../../lib/telemetry/util.js';
+const heredoc = tsheredoc.default;
+export default class Add extends Command {
+    static description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
+    static flags = {
+        app: Flags.string({ char: 'a', exactlyOne: ['app', 'space'], description: 'app to add a drain to' }),
+        headers: Flags.string({ description: 'custom headers to configure the drain in json format' }),
+        space: Flags.string({ char: 's', description: 'space to add a drain to' }),
+        signals: Flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
+        transport: Flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    };
+    static args = {
+        endpoint: Args.string({ required: true, description: 'drain url' }),
+    };
+    static example = heredoc(`
+    Add a telemetry drain to an app to collect logs and traces:
+    $ heroku telemetry:add https://my-endpoint.com --app myapp --signals logs,traces --headers '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
+  `);
     async run() {
         const { flags, args } = await this.parse(Add);
         const { app, headers, space, signals, transport } = flags;
@@ -26,7 +40,7 @@ class Add extends command_1.Command {
                 type: app ? 'app' : 'space',
                 id,
             },
-            signals: (0, util_1.validateAndFormatSignals)(signals),
+            signals: validateAndFormatSignals(signals),
             exporter: {
                 endpoint,
                 type: (transport === 'grpc') ? 'otlp' : 'otlphttp',
@@ -39,22 +53,6 @@ class Add extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        core_1.ux.log(`successfully added drain ${drain.exporter.endpoint}`);
+        ux.stdout(`successfully added drain ${drain.exporter.endpoint}`);
     }
 }
-exports.default = Add;
-Add.description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
-Add.flags = {
-    app: command_1.flags.string({ char: 'a', exactlyOne: ['app', 'space'], description: 'app to add a drain to' }),
-    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
-    space: command_1.flags.string({ char: 's', description: 'space to add a drain to' }),
-    signals: command_1.flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    transport: command_1.flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
-};
-Add.args = {
-    endpoint: core_1.Args.string({ required: true, description: 'drain url' }),
-};
-Add.example = (0, tsheredoc_1.default)(`
-    Add a telemetry drain to an app to collect logs and traces:
-    $ heroku telemetry:add https://my-endpoint.com --app myapp --signals logs,traces --headers '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
-  `);

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

@@ -1,11 +1,11 @@
 import { Command } from '@heroku-cli/command';
-import { TelemetryDrains } from '../../lib/types/telemetry';
+import { TelemetryDrains } from '../../lib/types/telemetry.js';
 export default class Index extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/index.js

@@ -1,9 +1,14 @@
-"use strict";
-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 {
+import { Command, flags as Flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+export default class Index extends Command {
+    static topic = 'telemetry';
+    static description = 'list telemetry drains';
+    static flags = {
+        space: Flags.string({ char: 's', description: 'filter by space name', exactlyOne: ['app', 'space'] }),
+        app: Flags.string({ char: 'a', description: 'filter by app name' }),
+    };
+    static example = '$ heroku telemetry';
     async run() {
         const { flags } = await this.parse(Index);
         const { app, space } = flags;
@@ -28,11 +33,11 @@ class Index extends command_1.Command {
     }
     display(telemetryDrains, owner) {
         if (telemetryDrains.length === 0) {
-            core_1.ux.log(`There are no telemetry drains in ${owner}`);
+            ux.stdout(`There are no telemetry drains in ${owner}`);
         }
         else {
-            heroku_cli_util_1.hux.styledHeader(`${owner} Telemetry Drains`);
-            heroku_cli_util_1.hux.table(telemetryDrains, {
+            hux.styledHeader(`${owner} Telemetry Drains`);
+            hux.table(telemetryDrains, {
                 ID: { get: telemetryDrain => telemetryDrain.id },
                 Signals: { get: telemetryDrain => telemetryDrain.signals },
                 Endpoint: { get: telemetryDrain => telemetryDrain.exporter.endpoint },
@@ -40,11 +45,3 @@ class Index extends command_1.Command {
         }
     }
 }
-exports.default = Index;
-Index.topic = 'telemetry';
-Index.description = 'list telemetry drains';
-Index.flags = {
-    space: command_1.flags.string({ char: 's', description: 'filter by space name', exactlyOne: ['app', 'space'] }),
-    app: command_1.flags.string({ char: 'a', description: 'filter by app name' }),
-};
-Index.example = '$ heroku telemetry';

package/lib/commands/telemetry/info.d.ts

@@ -3,7 +3,7 @@ export default class Info extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/info.js

@@ -1,9 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const util_1 = require("../../lib/telemetry/util");
-class Info extends command_1.Command {
+import { Command } from '@heroku-cli/command';
+import { Args } from '@oclif/core';
+import { displayTelemetryDrain } from '../../lib/telemetry/util.js';
+export default class Info extends Command {
+    static topic = 'telemetry';
+    static description = 'show a telemetry drain\'s info';
+    static args = {
+        telemetry_drain_id: Args.string({ required: true, description: 'ID of the drain to show info for' }),
+    };
+    static example = '$ heroku telemetry:info 022e2e2e-2e2e-2e2e-2e2e-2e2e2e2e2e2e';
     async run() {
         const { args } = await this.parse(Info);
         const { telemetry_drain_id } = args;
@@ -12,13 +16,6 @@ class Info extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        await (0, util_1.displayTelemetryDrain)(telemetryDrain, this.heroku);
+        await displayTelemetryDrain(telemetryDrain, this.heroku);
     }
 }
-exports.default = Info;
-Info.topic = 'telemetry';
-Info.description = 'show a telemetry drain\'s info';
-Info.args = {
-    telemetry_drain_id: core_1.Args.string({ required: true, description: 'ID of the drain to show info for' }),
-};
-Info.example = '$ heroku telemetry:info 022e2e2e-2e2e-2e2e-2e2e-2e2e2e2e2e2e';

package/lib/commands/telemetry/remove.d.ts

@@ -1,14 +1,14 @@
 import { Command } from '@heroku-cli/command';
-import { TelemetryDrain } from '../../lib/types/telemetry';
+import { TelemetryDrain } from '../../lib/types/telemetry.js';
 export default class Remove extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
     protected removeDrain(telemetry_drain_id: string): Promise<TelemetryDrain>;

package/lib/commands/telemetry/remove.js

@@ -1,25 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const tsheredoc_1 = require("tsheredoc");
-class Remove extends command_1.Command {
+import { flags, Command } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+const heredoc = tsheredoc.default;
+export default class Remove extends Command {
+    static topic = 'telemetry';
+    static description = 'remove a telemetry drain';
+    static args = {
+        telemetry_drain_id: Args.string({ description: 'ID of the drain to remove' }),
+    };
+    static flags = {
+        app: flags.app({ description: 'name of the app to remove all drains from' }),
+        space: flags.string({ char: 's', description: 'name of the space to remove all drains from' }),
+    };
     async run() {
         const { args, flags } = await this.parse(Remove);
         const { app, space } = flags;
         const { telemetry_drain_id } = args;
         if (!(app || space || telemetry_drain_id)) {
-            core_1.ux.error((0, tsheredoc_1.default)(`
+            ux.error(heredoc(`
         Requires either --app or --space or a TELEMETRY_DRAIN_ID to be provided.
         See more help with --help
       `));
         }
         if (telemetry_drain_id) {
-            core_1.ux.action.start(`Removing telemetry drain ${telemetry_drain_id}`);
+            ux.action.start(`Removing telemetry drain ${telemetry_drain_id}`);
             await this.removeDrain(telemetry_drain_id);
         }
         else if (app) {
-            core_1.ux.action.start(`Removing all telemetry drains from app ${app}`);
+            ux.action.start(`Removing all telemetry drains from app ${app}`);
             const { body: telemetryDrains } = await this.heroku.get(`/apps/${app}/telemetry-drains`, {
                 headers: {
                     Accept: 'application/vnd.heroku+json; version=3.sdk',
@@ -30,7 +38,7 @@ class Remove extends command_1.Command {
             }
         }
         else if (space) {
-            core_1.ux.action.start(`Removing all telemetry drains from space ${space}`);
+            ux.action.start(`Removing all telemetry drains from space ${space}`);
             const { body: telemetryDrains } = await this.heroku.get(`/spaces/${space}/telemetry-drains`, {
                 headers: {
                     Accept: 'application/vnd.heroku+json; version=3.sdk',
@@ -40,7 +48,7 @@ class Remove extends command_1.Command {
                 await this.removeDrain(telemetryDrain.id);
             }
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
     }
     async removeDrain(telemetry_drain_id) {
         const { body: telemetryDrain } = await this.heroku.delete(`/telemetry-drains/${telemetry_drain_id}`, {
@@ -51,13 +59,3 @@ class Remove extends command_1.Command {
         return telemetryDrain;
     }
 }
-exports.default = Remove;
-Remove.topic = 'telemetry';
-Remove.description = 'remove a telemetry drain';
-Remove.args = {
-    telemetry_drain_id: core_1.Args.string({ description: 'ID of the drain to remove' }),
-};
-Remove.flags = {
-    app: command_1.flags.app({ description: 'name of the app to remove all drains from' }),
-    space: command_1.flags.string({ char: 's', description: 'name of the space to remove all drains from' }),
-};

package/lib/commands/telemetry/update.d.ts

@@ -3,13 +3,13 @@ export default class Update extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
-        endpoint: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        headers: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        signals: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        transport: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        endpoint: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        headers: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        signals: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        transport: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/update.js

@@ -1,23 +1,36 @@
-"use strict";
-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 util_1 = require("../../lib/telemetry/util");
-class Update extends command_1.Command {
+import { flags as Flags, Command } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+import { displayTelemetryDrain, validateAndFormatSignals } from '../../lib/telemetry/util.js';
+const heredoc = tsheredoc.default;
+export default class Update extends Command {
+    static topic = 'telemetry';
+    static description = 'updates a telemetry drain with provided attributes (attributes not provided remain unchanged)';
+    static args = {
+        telemetry_drain_id: Args.string({ required: true, description: 'ID of the drain to update' }),
+    };
+    static flags = {
+        endpoint: Flags.string({ description: 'drain url' }),
+        headers: Flags.string({ description: 'custom headers to configure the drain in json format' }),
+        signals: Flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
+        transport: Flags.string({ options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    };
+    static example = heredoc(`
+    $ heroku telemetry:update acde070d-8c4c-4f0d-9d8a-162843c10333 --signals logs,metrics --endpoint https://my-new-endpoint.com
+  `);
     async run() {
         const { args, flags } = await this.parse(Update);
         const { telemetry_drain_id } = args;
         const { endpoint, headers, signals, transport } = flags;
         if (!(endpoint || headers || signals || transport)) {
-            core_1.ux.error((0, tsheredoc_1.default)(`
+            ux.error(heredoc(`
         Requires either --signals, --endpoint, --transport or HEADERS to be provided.
         See more help with --help
       `));
         }
         const drainConfig = {};
         if (signals) {
-            drainConfig.signals = (0, util_1.validateAndFormatSignals)(signals);
+            drainConfig.signals = validateAndFormatSignals(signals);
         }
         if (headers || endpoint || transport) {
             const exporter = {};
@@ -32,29 +45,14 @@ class Update extends command_1.Command {
             }
             drainConfig.exporter = exporter;
         }
-        core_1.ux.action.start(`Updating telemetry drain ${telemetry_drain_id}`);
+        ux.action.start(`Updating telemetry drain ${telemetry_drain_id}`);
         const { body: telemetryDrain } = await this.heroku.patch(`/telemetry-drains/${telemetry_drain_id}`, {
             headers: {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
             body: drainConfig,
         });
-        core_1.ux.action.stop();
-        await (0, util_1.displayTelemetryDrain)(telemetryDrain, this.heroku);
+        ux.action.stop();
+        await displayTelemetryDrain(telemetryDrain, this.heroku);
     }
 }
-exports.default = Update;
-Update.topic = 'telemetry';
-Update.description = 'updates a telemetry drain with provided attributes (attributes not provided remain unchanged)';
-Update.args = {
-    telemetry_drain_id: core_1.Args.string({ required: true, description: 'ID of the drain to update' }),
-};
-Update.flags = {
-    endpoint: command_1.flags.string({ description: 'drain url' }),
-    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
-    signals: command_1.flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    transport: command_1.flags.string({ options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
-};
-Update.example = (0, tsheredoc_1.default)(`
-    $ heroku telemetry:update acde070d-8c4c-4f0d-9d8a-162843c10333 --signals logs,metrics --endpoint https://my-new-endpoint.com
-  `);