heroku 10.1.0-beta.0 → 10.1.0-beta.2

package/lib/analytics.d.ts

@@ -25,6 +25,7 @@ export default class AnalyticsCommand {
     config: Interfaces.Config;
     userConfig: typeof deps.UserConfig.prototype;
     http: typeof deps.HTTP;
+    initialize: Promise<void>;
     constructor(config: Interfaces.Config);
     record(opts: RecordOpts): Promise<any>;
     get url(): string;

package/lib/analytics.js

@@ -11,9 +11,10 @@ class AnalyticsCommand {
         this.http = deps_1.default.HTTP.create({
             headers: { 'user-agent': config.userAgent },
         });
+        this.initialize = this.init();
     }
     async record(opts) {
-        await this.init();
+        await this.initialize;
         const plugin = opts.Command.plugin;
         if (!plugin) {
             debug('no plugin found for analytics');

package/lib/commands/addons/open.js

@@ -53,7 +53,7 @@ class Open extends command_1.Command {
         const sso = await this.heroku.request(`/apps/${app}/addons/${args.addon}/sso`, {
             method: 'GET',
             headers: {
-                Accept: 'application/vnd.heroku+json; version=3.add-ons-sso',
+                Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
         const { method, action } = sso.body;

package/lib/commands/apps/info.js

@@ -5,6 +5,7 @@ const command_1 = require("@heroku-cli/command");
 const util = require("util");
 const _ = require("lodash");
 const filesize_1 = require("filesize");
+const generation_1 = require("../../lib/apps/generation");
 const { countBy, snakeCase } = _;
 function formatDate(date) {
     return date.toISOString();
@@ -62,7 +63,7 @@ function print(info, addons, collaborators, extended) {
     data['Git URL'] = info.app.git_url;
     data['Web URL'] = info.app.web_url;
     data['Repo Size'] = (0, filesize_1.filesize)(info.app.repo_size, { standard: 'jedec', round: 0 });
-    if (info.app.generation.name !== 'fir')
+    if ((0, generation_1.getGeneration)(info.app) !== 'fir')
         data['Slug Size'] = (0, filesize_1.filesize)(info.app.slug_size, { standard: 'jedec', round: 0 });
     data.Owner = info.app.owner.email;
     data.Region = info.app.region.name;
@@ -116,7 +117,7 @@ class AppsInfo extends command_1.Command {
             print('git_url', info.app.git_url);
             print('web_url', info.app.web_url);
             print('repo_size', (0, filesize_1.filesize)(info.app.repo_size, { standard: 'jedec', round: 0 }));
-            if (info.app.generation.name !== 'fir')
+            if ((0, generation_1.getGeneration)(info.app) !== 'fir')
                 print('slug_size', (0, filesize_1.filesize)(info.app.slug_size, { standard: 'jedec', round: 0 }));
             print('owner', info.app.owner.email);
             print('region', info.app.region.name);

package/lib/commands/buildpacks/index.js

@@ -4,6 +4,7 @@ const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const color_1 = require("@heroku-cli/color");
 const buildpacks_1 = require("../../lib/buildpacks/buildpacks");
+const generation_1 = require("../../lib/apps/generation");
 class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
@@ -13,7 +14,7 @@ class Index extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        const buildpacks = await buildpacksCommand.fetch(flags.app, app.generation === 'fir');
+        const buildpacks = await buildpacksCommand.fetch(flags.app, (0, generation_1.getGeneration)(app) === 'fir');
         if (buildpacks.length === 0) {
             this.log(`${color_1.default.app(flags.app)} has no Buildpacks.`);
         }

package/lib/commands/keys/add.js

@@ -34,8 +34,12 @@ class Add extends command_1.Command {
             await sshKeygen(path.join(sshdir, 'id_rsa'), flags.quiet);
         };
         const findKey = async function () {
-            const defaultKey = path.join(sshdir, 'id_rsa.pub');
-            if (!(await fs.pathExists(defaultKey))) {
+            const defaultKeyPath = path.join(sshdir, 'id_rsa.pub');
+            const defaultKeyExists = await fs.pathExists(defaultKeyPath);
+            const keys = (await fs.readdir(sshdir))
+                .map(k => path.join(sshdir, k))
+                .filter(k => path.extname(k) === '.pub');
+            if (!defaultKeyExists && keys.length === 0) {
                 core_1.ux.warn('Could not find an existing SSH key at ' + path.join('~', '.ssh', 'id_rsa.pub'));
                 if (!flags.yes) {
                     const resp = await confirmPrompt('Would you like to generate a new one?');
@@ -43,14 +47,11 @@ class Add extends command_1.Command {
                         return;
                 }
                 await generate();
-                return defaultKey;
+                return defaultKeyPath;
             }
-            let keys = await fs.readdir(sshdir);
-            keys = keys.map(k => path.join(sshdir, k));
-            keys = keys.filter(k => path.extname(k) === '.pub');
             if (keys.length === 1) {
                 const key = keys[0];
-                core_1.ux.warn(`Found an SSH public key at ${color_1.default.cyan(key)}`);
+                core_1.ux.info(`Found an SSH public key at ${color_1.default.cyan(key)}`);
                 if (!flags.yes) {
                     const resp = await confirmPrompt('Would you like to upload it to Heroku?');
                     if (!resp.yes)

package/lib/commands/pg/settings/log-min-duration-statement.js

@@ -10,7 +10,7 @@ class LogMinDurationStatement extends setter_1.PGSettingsCommand {
         this.settingKey = 'log_min_duration_statement';
     }
     convertValue(val) {
-        return val;
+        return Number.parseInt(val, 10);
     }
     explain(setting) {
         if (setting.value === -1) {

package/lib/commands/pg/wait.js

@@ -24,6 +24,7 @@ class Wait extends command_1.Command {
             let status;
             let waiting = false;
             let retries = 20;
+            const notFoundMessage = 'Waiting to provision...';
             while (true) {
                 try {
                     ({ body: status } = await this.heroku.get(`/client/v11/databases/${db.id}/wait_status`, { hostname: (0, host_1.default)() }));
@@ -34,7 +35,7 @@ class Wait extends command_1.Command {
                     if (!retries || httpError.statusCode !== 404)
                         throw httpError;
                     retries--;
-                    status = { 'waiting?': true };
+                    status = { 'waiting?': true, message: notFoundMessage };
                 }
                 if (status['error?']) {
                     (0, notify_1.default)('error', `${db.name} ${status.message}`, false);

package/lib/commands/pipelines/diff.d.ts

@@ -1,5 +1,6 @@
 import { Command } from '@heroku-cli/command';
 import KolkrabbiAPI from '../../lib/pipelines/kolkrabbi-api';
+import { GenerationKind } from '../../lib/apps/generation';
 interface AppInfo {
     name: string;
     repo?: string;
@@ -13,7 +14,7 @@ export default class PipelinesDiff extends Command {
         remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     kolkrabbi: KolkrabbiAPI;
-    getAppInfo: (appName: string, appId: string, generation: string) => Promise<AppInfo>;
+    getAppInfo: (appName: string, appId: string, generation: GenerationKind) => Promise<AppInfo>;
     run(): Promise<undefined>;
 }
 export {};

package/lib/commands/pipelines/diff.js

@@ -6,6 +6,7 @@ const core_1 = require("@oclif/core");
 const http_call_1 = require("@heroku/http-call");
 const api_1 = require("../../lib/api");
 const kolkrabbi_api_1 = require("../../lib/pipelines/kolkrabbi-api");
+const generation_1 = require("../../lib/apps/generation");
 const PROMOTION_ORDER = ['development', 'staging', 'production'];
 async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
     if (!downstreamApp.repo) {
@@ -23,13 +24,15 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
     // Do the actual GitHub diff
     try {
         const path = `${targetApp.repo}/compare/${downstreamApp.hash}...${targetApp.hash}`;
-        const headers = { authorization: 'token ' + githubToken };
+        const headers = {
+            authorization: 'token ' + githubToken,
+            'Content-Type': 'application/vnd.github+json',
+            'X-GitHub-Api-Version': '2022-11-28',
+        };
         if (herokuUserAgent) {
-            headers['user-agent'] = herokuUserAgent;
+            Reflect.set(headers, 'user-agent', herokuUserAgent);
         }
-        const githubDiff = await http_call_1.default.get(`https://api.github.com/repos/${path}`, {
-            headers,
-        }).then(res => res.body);
+        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'}`);
         const mapped = githubDiff.commits.map((commit) => {
@@ -49,7 +52,6 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
             message: {},
         });
         core_1.ux.log(`\nhttps://github.com/${path}`);
-        // tslint:disable-next-line: no-unused
     }
     catch (_a) {
         core_1.ux.log(`\n${color_1.default.app(targetApp.name)} was not compared to ${color_1.default.app(downstreamApp.name)} because we were unable to perform a diff`);
@@ -99,15 +101,17 @@ class PipelinesDiff extends command_1.Command {
     async run() {
         const { flags } = await this.parse(PipelinesDiff);
         const targetAppName = flags.app;
-        const coupling = await (0, api_1.getCoupling)(this.heroku, targetAppName)
-            .then(res => res.body)
-            .catch(() => { });
-        if (!coupling) {
+        let coupling;
+        try {
+            ({ body: coupling } = await (0, api_1.getCoupling)(this.heroku, targetAppName));
+        }
+        catch (_a) {
             core_1.ux.error(`This app (${targetAppName}) does not seem to be a part of any pipeline`);
             return;
         }
+        const { body: pipeline } = await (0, api_1.getPipeline)(this.heroku, coupling.pipeline.id);
         const targetAppId = coupling.app.id;
-        const generation = coupling.generation;
+        const generation = (0, generation_1.getGeneration)(pipeline);
         core_1.ux.action.start('Fetching apps from pipeline');
         const allApps = await (0, api_1.listPipelineApps)(this.heroku, coupling.pipeline.id);
         core_1.ux.action.stop();

package/lib/commands/ps/autoscale/enable.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 generation_1 = require("../../../lib/apps/generation");
 const METRICS_HOST = 'api.metrics.heroku.com';
 const isPerfOrPrivateTier = (size) => {
     const applicableTiers = ['performance', 'private', 'shield'];
@@ -26,7 +27,7 @@ class Enable extends command_1.Command {
         const app = appResponse.body;
         const formations = formationResponse.body;
         const webFormation = formations.find((f) => f.type === 'web');
-        if (app.generation === 'fir') {
+        if ((0, generation_1.getGeneration)(app) === 'fir') {
             throw new Error('Autoscaling is unavailable for apps in this space. See https://devcenter.heroku.com/articles/generations.');
         }
         if (!webFormation)

package/lib/commands/spaces/create.js

@@ -7,6 +7,7 @@ const tsheredoc_1 = require("tsheredoc");
 const spaces_1 = require("../../lib/spaces/spaces");
 const completions_1 = require("../../lib/autocomplete/completions");
 const parsers_1 = require("../../lib/spaces/parsers");
+const generation_1 = require("../../lib/apps/generation");
 class Create extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Create);
@@ -59,7 +60,7 @@ class Create extends command_1.Command {
         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({
-            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: space.generation, 'Created at': space.created_at,
+            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/destroy.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const tsheredoc_1 = require("tsheredoc");
 const confirmCommand_1 = require("../../lib/confirmCommand");
 const spaces_1 = require("../../lib/spaces/spaces");
+const color_1 = require("@heroku-cli/color");
+const generation_1 = require("../../lib/apps/generation");
 class Destroy extends command_1.Command {
     async run() {
+        var _a;
         const { flags, args } = await this.parse(Destroy);
         const { confirm } = flags;
         const spaceName = flags.space || args.space;
@@ -22,7 +24,20 @@ class Destroy extends command_1.Command {
         if (space.state === 'allocated') {
             ({ body: space.outbound_ips } = await this.heroku.get(`/spaces/${spaceName}/nat`));
             if (space.outbound_ips && space.outbound_ips.state === 'enabled') {
-                natWarning = `The Outbound IPs for this space will be reused!\nEnsure that external services no longer allow these Outbound IPs: ${(0, spaces_1.displayNat)(space.outbound_ips)}\n`;
+                const ipv6 = (0, generation_1.getGeneration)(space) === 'fir' ? ' and IPv6' : '';
+                natWarning = (0, tsheredoc_1.default) `
+        ${color_1.default.dim('===')} ${color_1.default.bold('WARNING: Outbound IPs Will Be Reused')}
+        ${color_1.default.yellow(`⚠️ Deleting this space frees up the following outbound IPv4${ipv6} IPs for reuse:`)}
+        ${color_1.default.bold((_a = (0, spaces_1.displayNat)(space.outbound_ips)) !== null && _a !== void 0 ? _a : '')}
+
+        ${color_1.default.dim('Update the following configurations:')}
+        ${color_1.default.dim('=')} IP allowlists
+        ${color_1.default.dim('=')} Firewall rules
+        ${color_1.default.dim('=')} Security group configurations
+        ${color_1.default.dim('=')} Network ACLs
+
+        ${color_1.default.yellow(`Ensure that you remove the listed IPv4${ipv6} addresses from your security configurations.`)}
+      `;
             }
         }
         await (0, confirmCommand_1.default)(spaceName, confirm, `Destructive Action\nThis command will destroy the space ${color_1.default.bold.red(spaceName)}\n${natWarning}\n`);

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 generation_1 = require("../../lib/apps/generation");
 class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
@@ -43,7 +44,7 @@ class Index extends command_1.Command {
             Team: { get: space => space.team.name },
             Region: { get: space => space.region.name },
             State: { get: space => space.state },
-            Generation: { get: space => space.generation },
+            Generation: { get: space => (0, generation_1.getGeneration)(space) },
             createdAt: {
                 header: 'Created At',
                 get: space => space.created_at,

package/lib/commands/telemetry/add.js

@@ -29,7 +29,7 @@ class Add extends command_1.Command {
             signals: (0, util_1.validateAndFormatSignals)(signals),
             exporter: {
                 endpoint,
-                type: `otlp${transport}`,
+                type: (transport === 'grpc') ? 'otlp' : 'otlphttp',
                 headers: JSON.parse(exporterHeaders),
             },
         };

package/lib/commands/telemetry/index.js

@@ -44,6 +44,6 @@ 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.app({ description: 'filter by app name' }),
+    app: command_1.flags.string({ description: 'filter by app name' }),
 };
 Index.example = '$ heroku telemetry';

package/lib/file.d.ts

@@ -10,5 +10,5 @@ export declare function ls(dir: string): Promise<{
 }[]>;
 export declare function removeEmptyDirs(dir: string): Promise<void>;
 export declare function readJSON(file: string): Promise<any>;
-export declare function outputJSON(file: string, data: any, options?: FS.WriteOptions): Promise<void>;
+export declare function outputJSON(file: string, data: any): Promise<void>;
 export declare function realpathSync(p: string): string;

package/lib/file.js

@@ -53,9 +53,9 @@ async function readJSON(file) {
     return deps_1.default.fs.readJSON(file);
 }
 exports.readJSON = readJSON;
-async function outputJSON(file, data, options = {}) {
+async function outputJSON(file, data) {
     debug('outputJSON', file);
-    return deps_1.default.fs.outputJSON(file, data, Object.assign({ spaces: 2 }, options));
+    return deps_1.default.fs.outputJSON(file, data, { spaces: 2 });
 }
 exports.outputJSON = outputJSON;
 function realpathSync(p) {

package/lib/hooks/postrun/performance_analytics.js

@@ -8,5 +8,6 @@ const performance_analytics = async function () {
     const cmdStartTime = global.cliTelemetry.commandRunDuration;
     global.cliTelemetry.commandRunDuration = telemetry.computeDuration(cmdStartTime);
     global.cliTelemetry.lifecycleHookCompletion.postrun = true;
+    await Reflect.get(globalThis, 'recordPromise');
 };
 exports.default = performance_analytics;

package/lib/hooks/prerun/analytics.js

@@ -8,6 +8,6 @@ const analytics = async function (options) {
     }
     global.cliTelemetry = telemetry.setupTelemetry(this.config, options);
     const analytics = new analytics_1.default(this.config);
-    await analytics.record(options);
+    Reflect.set(globalThis, 'recordPromise', analytics.record(options));
 };
 exports.default = analytics;

package/lib/lib/addons/util.d.ts

@@ -3,7 +3,7 @@ export declare const trapConfirmationRequired: <T>(app: string, confirm: string
 export declare const formatPrice: ({ price, hourly }: {
     price: Heroku.AddOn['price'] | number;
     hourly?: boolean | undefined;
-}) => any;
+}) => string | undefined;
 export declare const formatPriceText: (price: Heroku.AddOn['price']) => string;
 export declare const grandfatheredPrice: (addon: Heroku.AddOn) => any;
 export declare const formatState: (state: string) => string;

package/lib/lib/addons/util.js

@@ -3,17 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatState = exports.grandfatheredPrice = exports.formatPriceText = exports.formatPrice = exports.trapConfirmationRequired = void 0;
 const confirmCommand_1 = require("../confirmCommand");
 const color_1 = require("@heroku-cli/color");
-const printf = require('printf');
-const trapConfirmationRequired = async function (app, confirm, fn) {
-    return await fn(confirm)
-        .catch((error) => {
-        if (!error.body || error.body.id !== 'confirmation_required')
+const printf = require("printf");
+const trapConfirmationRequired = async (app, confirm, fn) => {
+    var _a;
+    try {
+        return await fn(confirm);
+    }
+    catch (error) {
+        if (!isHttpError(error) || ((_a = error.body) === null || _a === void 0 ? void 0 : _a.id) !== 'confirmation_required') {
             throw error;
-        return (0, confirmCommand_1.default)(app, confirm, error.body.message)
-            .then(() => fn(app));
-    });
+        }
+        await (0, confirmCommand_1.default)(app, confirm, error.body.message);
+        return fn(app);
+    }
 };
 exports.trapConfirmationRequired = trapConfirmationRequired;
+function isHttpError(error) {
+    return Boolean(error) && error instanceof Error && Reflect.has(error, 'body');
+}
 // This function assumes that price.cents will reflect price per month.
 // If the API returns any unit other than month
 // this function will need to be updated.

package/lib/lib/api.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-import { App, PipelineCoupling, Release } from './types/fir';
+import { App, Pipeline, PipelineCoupling } from './types/fir';
 export declare const V3_HEADER = "application/vnd.heroku+json; version=3";
 export declare const SDK_HEADER = "application/vnd.heroku+json; version=3.sdk";
 export declare const FILTERS_HEADER: string;
@@ -14,24 +14,21 @@ export declare function createPipeline(heroku: APIClient, name: any, owner: any)
 export declare function createPipelineTransfer(heroku: APIClient, pipeline: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function destroyPipeline(heroku: APIClient, name: any, pipelineId: any): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function findPipelineByName(heroku: APIClient, idOrName: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline[]>>;
-export interface PipelineCouplingSdk extends Required<PipelineCoupling> {
-    generation: 'fir' | 'cedar';
-}
-export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCouplingSdk>>;
-export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCoupling>>;
+export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Pipeline>>;
 export declare function updatePipeline(heroku: APIClient, id: string, body: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
 export declare function getTeam(heroku: APIClient, teamId: any): Promise<import("@heroku/http-call").HTTP<Heroku.Team>>;
 export declare function getAccountInfo(heroku: APIClient, id?: string): Promise<import("@heroku/http-call").HTTP<Heroku.Account>>;
 export declare function getAppSetup(heroku: APIClient, buildId: any): Promise<import("@heroku/http-call").HTTP<Heroku.AppSetup>>;
 export interface AppWithPipelineCoupling extends App {
-    pipelineCoupling: PipelineCouplingSdk;
+    pipelineCoupling: PipelineCoupling;
     [k: string]: unknown;
 }
 export declare function listPipelineApps(heroku: APIClient, pipelineId: string): Promise<Array<AppWithPipelineCoupling>>;
 export declare function patchCoupling(heroku: APIClient, id: string, stage: string): Promise<import("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
 export declare function removeCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function updateCoupling(heroku: APIClient, app: string, stage: string): Promise<import("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
-export declare function getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Release[]>>;
+export declare function getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Heroku.Release[]>>;
 export declare function getPipelineConfigVars(heroku: APIClient, pipelineID: string): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
 export declare function setPipelineConfigVars(heroku: APIClient, pipelineID: string, body: Heroku.ConfigVars | Record<string, null>): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
 export declare function createTestRun(heroku: APIClient, body: Heroku.TestRun): Promise<import("@heroku/http-call").HTTP<Heroku.TestRun>>;

package/lib/lib/apps/generation.d.ts

@@ -1,4 +1,21 @@
 import { APIClient } from '@heroku-cli/command';
-import { App } from '../types/fir';
-export declare function isFirApp(appOrName: App | string, herokuApi?: APIClient): Promise<boolean>;
-export declare function isCedarApp(appOrName: App | string, herokuApi?: APIClient): Promise<boolean>;
+import { App, Space, DynoSize, TeamApp, Pipeline, Generation, AppGeneration, DynoSizeGeneration, PipelineGeneration } from '../types/fir';
+import Dyno from '../run/dyno';
+export declare type GenerationKind = 'fir' | 'cedar';
+export declare type GenerationLike = Generation | AppGeneration | DynoSizeGeneration | PipelineGeneration | Dyno;
+export declare type GenerationCapable = App | Space | DynoSize | TeamApp | Pipeline;
+/**
+ * Get the generation of an object
+ *
+ * @param source The object to get the generation from
+ * @returns The generation of the object
+ */
+export declare function getGeneration(source: GenerationLike | GenerationCapable | string): GenerationKind | undefined;
+/**
+ * Get the generation of an app by id or name
+ *
+ * @param appIdOrName The id or name of the app to get the generation for
+ * @param herokuApi The Heroku API client to use
+ * @returns The generation of the app
+ */
+export declare function getGenerationByAppId(appIdOrName: string, herokuApi: APIClient): Promise<GenerationKind | undefined>;

package/lib/lib/apps/generation.js

@@ -1,24 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCedarApp = exports.isFirApp = void 0;
-async function getApp(appOrName, herokuApi) {
-    if (typeof appOrName === 'string') {
-        if (herokuApi === undefined)
-            throw new Error('herokuApi parameter is required when passing an app name');
-        const { body: app } = await herokuApi.get(`/apps/${appOrName}`, {
-            headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
-        });
-        return app;
+exports.getGenerationByAppId = exports.getGeneration = void 0;
+function getGenerationFromGenerationLike(generation) {
+    var _a;
+    let maybeGeneration = '';
+    if (typeof generation === 'string') {
+        maybeGeneration = generation;
     }
-    return appOrName;
+    else if (generation && 'name' in generation) {
+        maybeGeneration = (_a = generation.name) !== null && _a !== void 0 ? _a : '';
+    }
+    if (/(fir|cedar)/.test(maybeGeneration)) {
+        return maybeGeneration;
+    }
+    // web-1234abcde44-123ab etc. fir
+    if (/^web-[0-9a-z]+-[0-9a-z]{5}$/.test(maybeGeneration)) {
+        return 'fir';
+    }
+    // web.n cedar
+    if (/^web\.[0-9]+$/.test(maybeGeneration)) {
+        return 'cedar';
+    }
+    return undefined;
 }
-async function isFirApp(appOrName, herokuApi) {
-    const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'fir';
+/**
+ * Get the generation of an object
+ *
+ * @param source The object to get the generation from
+ * @returns The generation of the object
+ */
+function getGeneration(source) {
+    if (typeof source === 'object' && 'generation' in source) {
+        return getGenerationFromGenerationLike(source.generation);
+    }
+    return getGenerationFromGenerationLike(source);
 }
-exports.isFirApp = isFirApp;
-async function isCedarApp(appOrName, herokuApi) {
-    const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'cedar';
+exports.getGeneration = getGeneration;
+/**
+ * Get the generation of an app by id or name
+ *
+ * @param appIdOrName The id or name of the app to get the generation for
+ * @param herokuApi The Heroku API client to use
+ * @returns The generation of the app
+ */
+async function getGenerationByAppId(appIdOrName, herokuApi) {
+    const { body: app } = await herokuApi.get(`/apps/${appIdOrName}`, {
+        headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
+    });
+    return getGeneration(app);
 }
-exports.isCedarApp = isCedarApp;
+exports.getGenerationByAppId = getGenerationByAppId;

package/lib/lib/run/log-displayer.js

@@ -51,7 +51,7 @@ async function logDisplayer(heroku, options) {
             core_1.ux.error(err.stack, { exit: 1 });
         }
     });
-    const firApp = await (0, generation_1.isFirApp)(options.app, heroku);
+    const firApp = (await (0, generation_1.getGenerationByAppId)(options.app, heroku)) === 'fir';
     const isTail = firApp || options.tail;
     const requestBodyParameters = {
         source: options.source,

package/lib/lib/spaces/spaces.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderInfo = exports.displayNat = exports.displayShieldState = void 0;
 const core_1 = require("@oclif/core");
+const generation_1 = require("../apps/generation");
 function displayShieldState(space) {
     return space.shield ? 'on' : 'off';
 }
@@ -30,7 +31,7 @@ function renderInfo(space, json) {
             State: space.state,
             Shield: displayShieldState(space),
             'Outbound IPs': displayNat(space.outbound_ips),
-            Generation: space.generation.name,
+            Generation: (0, generation_1.getGeneration)(space),
             'Created at': space.created_at,
         }, ['ID', 'Team', 'Region', 'CIDR', 'Data CIDR', 'State', 'Shield', 'Outbound IPs', 'Generation', 'Created at']);
     }

package/oclif.manifest.json

@@ -10078,7 +10078,6 @@
           "type": "option"
         },
         "app": {
-          "char": "a",
           "description": "filter by app name",
           "name": "app",
           "hasDynamicHelp": false,
@@ -14451,5 +14450,5 @@
       ]
     }
   },
-  "version": "10.1.0-beta.0"
+  "version": "10.1.0-beta.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.1.0-beta.0",
+  "version": "10.1.0-beta.2",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -46,7 +46,7 @@
     "execa": "5.1.1",
     "filesize": "^10.1.2",
     "foreman": "^3.0.1",
-    "fs-extra": "^9.1",
+    "fs-extra": "^11.3.0",
     "github-url-to-object": "^4.0.4",
     "glob": "^10.3.10",
     "got": "^11.8.6",
@@ -82,25 +82,27 @@
   },
   "devDependencies": {
     "@heroku-cli/schema": "^1.0.25",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@oclif/test": "^2.3.28",
     "@types/ansi-styles": "^3.2.1",
     "@types/bytes": "^3.1.4",
     "@types/chai": "^4.3.14",
     "@types/chai-as-promised": "^7.1.8",
     "@types/debug": "^4.1.2",
-    "@types/fs-extra": "^7.0.0",
+    "@types/fs-extra": "^11.0.4",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^8.2.10",
     "@types/lodash": "^4.14.123",
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.10",
     "@types/node": "20.14.8",
-    "@types/node-fetch": "^2.1.6",
+    "@types/node-fetch": "^2.6.11",
     "@types/phoenix": "^1.4.0",
     "@types/proxyquire": "^1.3.28",
     "@types/psl": "^1.1.3",
     "@types/redis-parser": "^3.0.3",
     "@types/shell-escape": "^0.2.0",
     "@types/shell-quote": "^1.7.5",
+    "@types/sinon": "^17.0.3",
     "@types/ssh2": "^1.15.0",
     "@types/std-mocks": "^1.0.4",
     "@types/strftime": "^0.9.8",
@@ -117,7 +119,7 @@
     "globby": "^10.0.2",
     "lodash": "^4.17.11",
     "lolex": "^3.1.0",
-    "mocha": "^9.2.2",
+    "mocha": "^10.8.2",
     "nock": "^13.5.1",
     "nyc": "^15.1.0",
     "oclif": "4.14.36",
@@ -125,11 +127,12 @@
     "qqjs": "0.3.11",
     "read-pkg": "^4.0.1",
     "rimraf": "5.0.5",
-    "sinon": "^7.2.4",
+    "sinon": "^19.0.2",
+    "source-map-support": "^0.5.21",
     "std-mocks": "^2.0.0",
     "strip-ansi": "6.0.1",
     "tmp": "^0.2.3",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typescript": "4.8.4"
   },
   "engines": {
@@ -377,6 +380,9 @@
     "build": "rm -rf lib && tsc",
     "build:dev": "rm -rf lib && tsc --sourcemap",
     "lint": "eslint . --ext .ts --config ../../.eslintrc --ignore-path ../../.eslintignore-lib",
+    "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
+    "coverage:html": "nyc --reporter=html --reporter=text-summary npm run test",
+    "coverage:check": "nyc --check-coverage --branches 80 --statements 80 --functions 80 --lines 80 npm run test",
     "postpublish": "rm -f oclif.manifest.json",
     "prepack": "yarn run build && oclif manifest",
     "pretest": "tsc -p test --noEmit && cd ../.. && yarn build",
@@ -384,11 +390,11 @@
     "test:integration": "yarn pretest && mocha --forbid-only \"test/**/*.integration.test.ts\"",
     "test:smoke": "yarn pretest && mocha --forbid-only \"test/**/smoke.acceptance.test.ts\"",
     "test:unit:justTest:local": "nyc mocha \"test/**/*.unit.test.ts\"",
-    "test:unit:justTest:ci": "nyc mocha --forbid-only \"test/**/*.unit.test.ts\"",
+    "test:unit:justTest:ci": "nyc --reporter=lcov --reporter=text-summary mocha --forbid-only \"test/**/*.unit.test.ts\"",
     "test": "yarn pretest && yarn test:unit:justTest:ci",
     "test:local": "yarn pretest && yarn test:unit:justTest:local",
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "bfb87461ae78095d0e540e99db5357ec91d59aae"
+  "gitHead": "c2b9e24329ccd077ed5ccdfb6f721c4ffff21e91"
 }