heroku 10.1.0 → 10.2.0-beta.0

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/backups/restore.js

@@ -93,8 +93,9 @@ Restore.flags = {
     extensions: command_1.flags.string({
         char: 'e',
         description: (0, tsheredoc_1.default)(`
-      comma-separated list of extensions to pre-install in the public schema
-      defaults to saving the latest database to DATABASE_URL
+        comma-separated list of extensions to pre-install in the default 
+        public schema or an optional custom schema 
+        (for example: hstore or myschema.hstore)
       `),
     }),
     verbose: command_1.flags.boolean({ char: 'v' }),

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) {
@@ -110,7 +111,7 @@ class PipelinesDiff extends command_1.Command {
         }
         const { body: pipeline } = await (0, api_1.getPipeline)(this.heroku, coupling.pipeline.id);
         const targetAppId = coupling.app.id;
-        const generation = pipeline.generation.name;
+        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

@@ -6,9 +6,10 @@ 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, _b;
+        var _a;
         const { flags, args } = await this.parse(Destroy);
         const { confirm } = flags;
         const spaceName = flags.space || args.space;
@@ -23,11 +24,11 @@ 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') {
-                const ipv6 = ((_a = space.generation) === null || _a === void 0 ? void 0 : _a.name) === 'fir' ? ' and IPv6' : '';
+                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((_b = (0, spaces_1.displayNat)(space.outbound_ips)) !== null && _b !== void 0 ? _b : '')}
+        ${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

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/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/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.name === '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.name === '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']);
     }