heroku 10.13.2 → 11.0.0-alpha.2

package/lib/commands/usage/addons.d.ts

@@ -3,8 +3,8 @@ export default class UsageAddons extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        team: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        team: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     private displayAppUsage;
     private fetchAndDisplayAppUsageData;

package/lib/commands/usage/addons.js

@@ -1,22 +1,26 @@
-"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");
-const color_1 = require("@heroku-cli/color");
-class UsageAddons extends command_1.Command {
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { color } from '@heroku-cli/color';
+export default class UsageAddons extends Command {
+    static topic = 'usage';
+    static description = 'list usage for metered add-ons attached to an app or apps within a team';
+    static flags = {
+        app: flags.string({ char: 'a', description: 'app to list metered add-ons usage for' }),
+        team: flags.team({ description: 'team to list metered add-ons usage for' }),
+    };
     displayAppUsage(app, usageAddons, appAddons) {
         const metersArray = usageAddons.flatMap(addon => Object.entries(addon.meters).map(([label, data]) => ({
             label,
             quantity: data.quantity,
             addonId: addon.id,
         })));
-        heroku_cli_util_1.hux.styledHeader(`Usage for ${color_1.default.app(app)}`);
-        heroku_cli_util_1.hux.table(metersArray, {
+        hux.styledHeader(`Usage for ${color.app(app)}`);
+        hux.table(metersArray, {
             'Add-on': {
-                get: row => {
+                get(row) {
                     const matchingAddon = appAddons.find(a => a.id === row.addonId);
-                    return (matchingAddon === null || matchingAddon === void 0 ? void 0 : matchingAddon.name) || row.addonId;
+                    return matchingAddon?.name || row.addonId;
                 },
             },
             Meter: {
@@ -30,7 +34,7 @@ class UsageAddons extends command_1.Command {
     async fetchAndDisplayAppUsageData(app, team) {
         let usageData;
         let appAddons;
-        core_1.ux.action.start('Gathering usage data');
+        ux.action.start('Gathering usage data');
         if (team) {
             [{ body: usageData }, { body: appAddons }] = await Promise.all([
                 this.heroku.get(`/teams/${team}/apps/${app}/usage`, {
@@ -51,17 +55,17 @@ class UsageAddons extends command_1.Command {
                 this.heroku.get(`/apps/${app}/addons`),
             ]);
         }
-        core_1.ux.action.stop();
-        core_1.ux.log();
+        ux.action.stop();
+        ux.stdout();
         const usageAddons = usageData.addons;
         if (usageAddons.length === 0) {
-            core_1.ux.log(`No usage found for app ${color_1.default.app(app)}`);
+            ux.stdout(`No usage found for app ${color.app(app)}`);
             return;
         }
         this.displayAppUsage(app, usageAddons, appAddons);
     }
     async fetchAndDisplayTeamUsageData(team) {
-        core_1.ux.action.start(`Gathering usage data for ${color_1.default.magenta(team)}`);
+        ux.action.start(`Gathering usage data for ${color.magenta(team)}`);
         const [{ body: usageData }, { body: teamAddons }] = await Promise.all([
             this.heroku.get(`/teams/${team}/usage`, {
                 headers: {
@@ -70,18 +74,18 @@ class UsageAddons extends command_1.Command {
             }),
             this.heroku.get(`/teams/${team}/addons`),
         ]);
-        core_1.ux.action.stop();
-        core_1.ux.log();
+        ux.action.stop();
+        ux.stdout();
         if (!usageData.apps || usageData.apps.length === 0) {
-            core_1.ux.log(`No usage found for team ${color_1.default.magenta(team)}`);
+            ux.stdout(`No usage found for team ${color.magenta(team)}`);
             return;
         }
         const appInfoArray = this.getAppInfoFromTeamAddons(teamAddons);
         // Display usage for each app
         usageData.apps.forEach((app) => {
             const appInfo = appInfoArray.find(info => info.id === app.id);
-            this.displayAppUsage((appInfo === null || appInfo === void 0 ? void 0 : appInfo.name) || app.id, app.addons, teamAddons);
-            core_1.ux.log();
+            this.displayAppUsage(appInfo?.name || app.id, app.addons, teamAddons);
+            ux.stdout();
         });
     }
     getAppInfoFromTeamAddons(teamAddons) {
@@ -100,7 +104,7 @@ class UsageAddons extends command_1.Command {
         const { flags } = await this.parse(UsageAddons);
         const { app, team } = flags;
         if (!app && !team) {
-            core_1.ux.error('Specify an app with --app or a team with --team');
+            ux.error('Specify an app with --app or a team with --team');
         }
         if (app) {
             await this.fetchAndDisplayAppUsageData(app, team);
@@ -110,10 +114,3 @@ class UsageAddons extends command_1.Command {
         }
     }
 }
-exports.default = UsageAddons;
-UsageAddons.topic = 'usage';
-UsageAddons.description = 'list usage for metered add-ons attached to an app or apps within a team';
-UsageAddons.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app to list metered add-ons usage for' }),
-    team: command_1.flags.team({ description: 'team to list metered add-ons usage for' }),
-};

package/lib/deps.d.ts

@@ -1,7 +1,7 @@
 import { HTTP } from '@heroku/http-call';
-import UserConfig from './user-config';
-import FS = require('fs-extra');
-import file = require('./file');
+import UserConfig from './user-config.js';
+import FS from 'fs-extra';
+import * as file from './file.js';
 declare const _default: {
     readonly fs: typeof FS;
     readonly HTTP: typeof HTTP;

package/lib/deps.js

@@ -1,23 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cache = {};
-function fetch(s) {
-    if (!cache[s]) {
-        cache[s] = require(s);
-    }
-    return cache[s];
-}
-exports.default = {
+import { HTTP } from '@heroku/http-call';
+import UserConfig from './user-config.js';
+import FS from 'fs-extra';
+import * as file from './file.js';
+export default {
     get fs() {
-        return fetch('fs-extra');
+        return FS;
     },
     get HTTP() {
-        return fetch('@heroku/http-call').HTTP;
+        return HTTP;
     },
     get file() {
-        return fetch('./file');
+        return file;
     },
     get UserConfig() {
-        return fetch('./user-config').default;
+        return UserConfig;
     },
 };

package/lib/file.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import * as FS from 'fs-extra';
 export declare function exists(f: string): Promise<boolean>;
 export declare function stat(file: string): Promise<FS.Stats>;

package/lib/file.js

@@ -1,36 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.realpathSync = exports.outputJSON = exports.readJSON = exports.removeEmptyDirs = exports.ls = exports.remove = exports.rename = exports.stat = exports.exists = void 0;
-const path = require("path");
-const deps_1 = require("./deps");
-const debug = require('debug')('heroku-cli:file');
-function exists(f) {
-    return deps_1.default.fs.pathExists(f);
+import * as path from 'path';
+import deps from './deps.js';
+import debug from 'debug';
+const fileDebug = debug('heroku-cli:file');
+export function exists(f) {
+    return deps.fs.pathExists(f);
 }
-exports.exists = exists;
-async function stat(file) {
-    return deps_1.default.fs.stat(file);
+export async function stat(file) {
+    return deps.fs.stat(file);
 }
-exports.stat = stat;
-async function rename(from, to) {
-    debug('rename', from, to);
-    return deps_1.default.fs.rename(from, to);
+export async function rename(from, to) {
+    fileDebug('rename', from, to);
+    return deps.fs.rename(from, to);
 }
-exports.rename = rename;
-async function remove(file) {
+export async function remove(file) {
     if (!await exists(file))
         return;
-    debug('remove', file);
-    return deps_1.default.fs.remove(file);
+    fileDebug('remove', file);
+    return deps.fs.remove(file);
 }
-exports.remove = remove;
-async function ls(dir) {
-    const files = await deps_1.default.fs.readdir(dir);
+export async function ls(dir) {
+    const files = await deps.fs.readdir(dir);
     const paths = files.map(f => path.join(dir, f));
-    return Promise.all(paths.map(path => deps_1.default.fs.stat(path).then(stat => ({ path, stat }))));
+    return Promise.all(paths.map(path => deps.fs.stat(path).then(stat => ({ path, stat }))));
 }
-exports.ls = ls;
-async function removeEmptyDirs(dir) {
+export async function removeEmptyDirs(dir) {
     let files;
     try {
         files = await ls(dir);
@@ -47,18 +40,14 @@ async function removeEmptyDirs(dir) {
     if (files.length === 0)
         await remove(dir);
 }
-exports.removeEmptyDirs = removeEmptyDirs;
-async function readJSON(file) {
-    debug('readJSON', file);
-    return deps_1.default.fs.readJSON(file);
+export async function readJSON(file) {
+    fileDebug('readJSON', file);
+    return deps.fs.readJSON(file);
 }
-exports.readJSON = readJSON;
-async function outputJSON(file, data) {
-    debug('outputJSON', file);
-    return deps_1.default.fs.outputJSON(file, data, { spaces: 2 });
+export async function outputJSON(file, data) {
+    fileDebug('outputJSON', file);
+    return deps.fs.outputJSON(file, data, { spaces: 2 });
 }
-exports.outputJSON = outputJSON;
-function realpathSync(p) {
-    return deps_1.default.fs.realpathSync(p);
+export function realpathSync(p) {
+    return deps.fs.realpathSync(p);
 }
-exports.realpathSync = realpathSync;

package/lib/global_telemetry.d.ts

@@ -1,4 +1,5 @@
-export declare const processor: any;
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
+export declare const processor: BatchSpanProcessor;
 interface Telemetry {
     command: string;
     os: string;

package/lib/global_telemetry.js

@@ -1,33 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToRollbar = exports.sendToHoneycomb = exports.sendTelemetry = exports.reportCmdNotFound = exports.computeDuration = exports.setupTelemetry = exports.initializeInstrumentation = exports.processor = void 0;
-const Rollbar = require("rollbar");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const api_1 = require("@opentelemetry/api");
-const { Resource } = require('@opentelemetry/resources');
-const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
-const { registerInstrumentations } = require('@opentelemetry/instrumentation');
-const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
-const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
-const path = require('path');
-const { version } = require('../package.json');
+import Rollbar from 'rollbar';
+import { APIClient } from '@heroku-cli/command';
+import { Config } from '@oclif/core';
+import opentelemetry, { SpanStatusCode } from '@opentelemetry/api';
+import { Resource } from '@opentelemetry/resources';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import path from 'path';
+import { promises as fs } from 'fs';
+import { fileURLToPath } from 'url';
+import debug from 'debug';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const root = path.resolve(__dirname, '../package.json');
 const isDev = process.env.IS_DEV_ENVIRONMENT === 'true';
 const isTelemetryDisabled = process.env.DISABLE_TELEMETRY === 'true';
+async function getVersion() {
+    const pkg = JSON.parse(await fs.readFile(root, 'utf8'));
+    return pkg.version;
+}
 function getToken() {
-    const config = new core_1.Config({ root });
-    const heroku = new command_1.APIClient(config);
+    const config = new Config({ root });
+    const heroku = new APIClient(config);
     return heroku.auth;
 }
-const debug = require('debug')('global_telemetry');
 const rollbar = new Rollbar({
     accessToken: '20783109b0064dbb85be0b2c5a5a5f79',
     captureUncaught: true,
     captureUnhandledRejections: true,
     environment: isDev ? 'development' : 'production',
-    codeVersion: version,
+    codeVersion: undefined, // will be set later
 });
 registerInstrumentations({
     instrumentations: [],
@@ -36,24 +40,24 @@ const resource = Resource
     .default()
     .merge(new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: 'heroku-cli',
-    [SemanticResourceAttributes.SERVICE_VERSION]: version,
+    [SemanticResourceAttributes.SERVICE_VERSION]: undefined, // will be set later
 }));
 const provider = new NodeTracerProvider({
     resource,
 });
+// eslint-disable-next-line no-negated-condition, unicorn/no-negated-condition
 const headers = { Authorization: `Bearer ${process.env.IS_HEROKU_TEST_ENV !== 'true' ? getToken() : ''}` };
 const exporter = new OTLPTraceExporter({
     url: isDev ? 'https://backboard.staging.herokudev.com/otel/v1/traces' : 'https://backboard.heroku.com/otel/v1/traces',
     headers,
-    compression: 'none',
+    compression: undefined,
 });
-exports.processor = new BatchSpanProcessor(exporter);
-provider.addSpanProcessor(exports.processor);
-function initializeInstrumentation() {
+export const processor = new BatchSpanProcessor(exporter);
+provider.addSpanProcessor(processor);
+export function initializeInstrumentation() {
     provider.register();
 }
-exports.initializeInstrumentation = initializeInstrumentation;
-function setupTelemetry(config, opts) {
+export function setupTelemetry(config, opts) {
     const now = new Date();
     const cmdStartTime = now.getTime();
     const isRegularCmd = Boolean(opts.Command);
@@ -76,19 +80,25 @@ function setupTelemetry(config, opts) {
         isVersionOrHelp: true,
     };
     if (isRegularCmd) {
-        return Object.assign(Object.assign({}, irregularTelemetryObject), { command: opts.Command.id, isVersionOrHelp: false, lifecycleHookCompletion: Object.assign(Object.assign({}, irregularTelemetryObject.lifecycleHookCompletion), { prerun: true }) });
+        return {
+            ...irregularTelemetryObject,
+            command: opts.Command.id,
+            isVersionOrHelp: false,
+            lifecycleHookCompletion: {
+                ...irregularTelemetryObject.lifecycleHookCompletion,
+                prerun: true,
+            },
+        };
     }
     return irregularTelemetryObject;
 }
-exports.setupTelemetry = setupTelemetry;
-function computeDuration(cmdStartTime) {
+export function computeDuration(cmdStartTime) {
     // calculate time duration from start time till now
     const now = new Date();
     const cmdFinishTime = now.getTime();
     return cmdFinishTime - cmdStartTime;
 }
-exports.computeDuration = computeDuration;
-function reportCmdNotFound(config) {
+export function reportCmdNotFound(config) {
     return {
         command: 'invalid_command',
         os: config.platform,
@@ -106,8 +116,7 @@ function reportCmdNotFound(config) {
         isVersionOrHelp: false,
     };
 }
-exports.reportCmdNotFound = reportCmdNotFound;
-async function sendTelemetry(currentTelemetry, rollbarCb) {
+export async function sendTelemetry(currentTelemetry, rollbarCb) {
     // send telemetry to honeycomb and rollbar
     if (isTelemetryDisabled) {
         return;
@@ -123,15 +132,15 @@ async function sendTelemetry(currentTelemetry, rollbarCb) {
         await sendToHoneycomb(telemetry);
     }
 }
-exports.sendTelemetry = sendTelemetry;
-async function sendToHoneycomb(data) {
+export async function sendToHoneycomb(data) {
     try {
-        const tracer = api_1.default.trace.getTracer('heroku-cli', version);
+        const version = await getVersion();
+        const tracer = opentelemetry.trace.getTracer('heroku-cli', version);
         const span = tracer.startSpan('node_app_execution');
         if (data instanceof Error) {
             span.recordException(data);
             span.setStatus({
-                code: api_1.SpanStatusCode.ERROR,
+                code: SpanStatusCode.ERROR,
                 message: data.message,
             });
         }
@@ -149,14 +158,13 @@ async function sendToHoneycomb(data) {
             span.setAttribute('heroku_client.lifecycle_hook.command_not_found', data.lifecycleHookCompletion.command_not_found);
         }
         span.end();
-        exports.processor.forceFlush();
+        processor.forceFlush();
     }
-    catch (_a) {
+    catch {
         debug('could not send telemetry');
     }
 }
-exports.sendToHoneycomb = sendToHoneycomb;
-async function sendToRollbar(data, rollbarCb) {
+export async function sendToRollbar(data, rollbarCb) {
     // Make this awaitable so we can wait for it to finish before exiting
     let promiseResolve;
     const rollbarPromise = new Promise((resolve, reject) => {
@@ -177,10 +185,10 @@ async function sendToRollbar(data, rollbarCb) {
         // send data to rollbar
         rollbar.error('Failed to complete execution', rollbarError, promiseResolve);
     }
-    catch (_a) {
+    catch {
         debug('Could not send error report');
+        // eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
         return Promise.reject();
     }
     return rollbarPromise;
 }
-exports.sendToRollbar = sendToRollbar;

package/lib/hooks/command_not_found/performance_analytics.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const telemetry = require("../../global_telemetry");
+import * as telemetry from '../../global_telemetry.js';
 const performance_analytics = async function () {
     global.cliTelemetry = telemetry.reportCmdNotFound(this.config);
 };
-exports.default = performance_analytics;
+export default performance_analytics;

package/lib/hooks/init/performance_analytics.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const telemetry = require("../../global_telemetry");
+import * as telemetry from '../../global_telemetry.js';
 const performance_analytics = async function (options) {
     global.cliTelemetry = telemetry.setupTelemetry(this.config, options);
 };
-exports.default = performance_analytics;
+export default performance_analytics;

package/lib/hooks/init/terms-of-service.js

@@ -1,20 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkTos = void 0;
-const core_1 = require("@oclif/core");
-const path = require("path");
-const fs = require("fs-extra");
-function checkTos(options) {
+import { ux } from '@oclif/core';
+import * as path from 'path';
+import * as fs from 'fs-extra';
+export function checkTos(options) {
     const tosPath = path.join(options.config.cacheDir, 'terms-of-service');
     const viewedBanner = fs.pathExistsSync(tosPath);
     const message = 'Our terms of service have changed: https://dashboard.heroku.com/terms-of-service';
     if (!viewedBanner) {
-        core_1.ux.warn(message);
+        ux.warn(message);
         fs.createFile(tosPath);
     }
 }
-exports.checkTos = checkTos;
 const hook = async function (options) {
     checkTos(options);
 };
-exports.default = hook;
+export default hook;

package/lib/hooks/init/version.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const packageParser_1 = require("../../lib/utils/packageParser");
+import { getAllVersionFlags } from '../../lib/utils/packageParser.js';
 const allowlist = [
     'HEROKU_API_KEY',
     'HEROKU_APP',
@@ -12,7 +10,7 @@ const allowlist = [
     'SSL_KEY_FILE',
 ];
 const version = async function () {
-    if ((0, packageParser_1.getAllVersionFlags)().includes(process.argv[2])) {
+    if (getAllVersionFlags().includes(process.argv[2])) {
         for (const env of allowlist) {
             if (process.env[env]) {
                 const value = env === 'HEROKU_API_KEY' ? 'to [REDACTED]' : `to ${process.env[env]}`;
@@ -21,4 +19,4 @@ const version = async function () {
         }
     }
 };
-exports.default = version;
+export default version;

package/lib/hooks/postrun/performance_analytics.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const telemetry = require("../../global_telemetry");
+import * as telemetry from '../../global_telemetry.js';
 const performance_analytics = async function () {
     if (process.env.IS_HEROKU_TEST_ENV === 'true' || !global.cliTelemetry) {
         return;
@@ -10,4 +8,4 @@ const performance_analytics = async function () {
     global.cliTelemetry.lifecycleHookCompletion.postrun = true;
     await Reflect.get(globalThis, 'recordPromise');
 };
-exports.default = performance_analytics;
+export default performance_analytics;

package/lib/hooks/prerun/analytics.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const analytics_1 = require("../../analytics");
-const telemetry = require("../../global_telemetry");
+import Analytics from '../../analytics.js';
+import * as telemetry from '../../global_telemetry.js';
 const analytics = async function (options) {
     if (process.env.IS_HEROKU_TEST_ENV === 'true') {
         return;
     }
     global.cliTelemetry = telemetry.setupTelemetry(this.config, options);
-    const analytics = new analytics_1.default(this.config);
+    const analytics = new Analytics(this.config);
     Reflect.set(globalThis, 'recordPromise', analytics.record(options));
 };
-exports.default = analytics;
+export default analytics;

package/lib/hooks/recache.d.ts

@@ -1,3 +1 @@
-import { Interfaces } from '@oclif/core';
-declare const completions: Interfaces.Hook<'app' | 'addon' | 'config' | 'login' | 'logout'>;
-export default completions;
+export {};