heroku 10.2.0 → 10.3.0

package/README.md

@@ -96,7 +96,7 @@ Run all tests with `yarn test`.
 
 ## Debugging
 
-Using WebStorm (from Jetbrains / IntelliJ), you can run/debug an individual test case.
+Using WebStorm (from JetBrains / IntelliJ), you can run/debug an individual test case.
 
 - Create a new run/debug configuration
 - Select the 'Mocha' type

package/lib/commands/buildpacks/index.js

@@ -14,18 +14,27 @@ class Index extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        const buildpacks = await buildpacksCommand.fetch(flags.app, (0, generation_1.getGeneration)(app) === 'fir');
+        const isFirApp = (0, generation_1.getGeneration)(app) === 'fir';
+        const buildpacks = await buildpacksCommand.fetch(flags.app, isFirApp);
         if (buildpacks.length === 0) {
             this.log(`${color_1.default.app(flags.app)} has no Buildpacks.`);
         }
         else {
-            core_1.ux.styledHeader(`${color_1.default.app(flags.app)} Buildpack${buildpacks.length > 1 ? 's' : ''}`);
+            const pluralizedBuildpacks = buildpacks.length > 1 ? 'Buildpacks' : 'Buildpack';
+            let header = `${color_1.default.app(flags.app)}`;
+            if (isFirApp) {
+                header += ` Cloud Native ${pluralizedBuildpacks} (from the latest release's OCI image)`;
+            }
+            else {
+                header += ` Classic ${pluralizedBuildpacks} (from the Heroku Buildpack Registry)`;
+            }
+            core_1.ux.styledHeader(header);
             buildpacksCommand.display(buildpacks, '');
         }
     }
 }
 exports.default = Index;
-Index.description = 'display the buildpacks for an app';
+Index.description = 'list the buildpacks on an app';
 Index.flags = {
     app: command_1.flags.app({ required: true }),
     remote: command_1.flags.remote(),

package/lib/commands/pg/outliers.js

@@ -51,36 +51,37 @@ class Outliers extends command_1.Command {
         const truncatedQueryString = truncate ? (0, tsheredoc_1.default) `
       CASE WHEN length(query) <= 40 THEN query ELSE substr(query, 0, 39) || '…' END
     ` : 'query';
+        let totalExecTimeField = '';
         if (version && Number.parseInt(version, 10) >= 13) {
-            return (0, tsheredoc_1.default) `
+            totalExecTimeField = 'total_exec_time';
+        }
+        else {
+            totalExecTimeField = 'total_time';
+        }
+        let blkReadTimeField = '';
+        let blkWriteTimeField = '';
+        if (version && Number.parseInt(version, 10) >= 17) {
+            blkReadTimeField = 'shared_blk_read_time';
+            blkWriteTimeField = 'shared_blk_write_time';
+        }
+        else {
+            blkReadTimeField = 'blk_read_time';
+            blkWriteTimeField = 'blk_write_time';
+        }
+        return (0, tsheredoc_1.default) `
         SELECT
-          interval '1 millisecond' * total_exec_time AS total_exec_time,
-          to_char((total_exec_time/sum(total_exec_time) OVER()) * 100, 'FM90D0') || '%'  AS prop_exec_time,
+          interval '1 millisecond' * ${totalExecTimeField} AS total_exec_time,
+          to_char((${totalExecTimeField}/sum(${totalExecTimeField}) OVER()) * 100, 'FM90D0') || '%'  AS prop_exec_time,
           to_char(calls, 'FM999G999G999G990') AS ncalls,
-          interval '1 millisecond' * (blk_read_time + blk_write_time) AS sync_io_time,
+          interval '1 millisecond' * (${blkReadTimeField} + ${blkWriteTimeField}) AS sync_io_time,
           ${truncatedQueryString} AS query
         FROM pg_stat_statements
         WHERE userid = (
           SELECT usesysid FROM pg_user WHERE usename = current_user LIMIT 1
         )
-        ORDER BY total_exec_time DESC
+        ORDER BY ${totalExecTimeField} DESC
         LIMIT ${limit};
       `;
-        }
-        return (0, tsheredoc_1.default) `
-      SELECT
-        interval '1 millisecond' * total_time AS total_exec_time,
-        to_char((total_time/sum(total_time) OVER()) * 100, 'FM90D0') || '%'  AS prop_exec_time,
-        to_char(calls, 'FM999G999G999G990') AS ncalls,
-        interval '1 millisecond' * (blk_read_time + blk_write_time) AS sync_io_time,
-        ${truncatedQueryString} AS query
-      FROM pg_stat_statements
-      WHERE userid = (
-        SELECT usesysid FROM pg_user WHERE usename = current_user LIMIT 1
-      )
-      ORDER BY total_time DESC
-      LIMIT ${limit};
-    `;
     }
 }
 exports.default = Outliers;

package/lib/commands/pipelines/create.js

@@ -8,6 +8,7 @@ const inquirer_1 = require("inquirer");
 const api_1 = require("../../lib/api");
 const infer_1 = require("../../lib/pipelines/infer");
 const stages_1 = require("../../lib/pipelines/stages");
+const generation_1 = require("../../lib/apps/generation");
 class Create extends command_1.Command {
     async run() {
         const { args, flags } = await this.parse(Create);
@@ -43,8 +44,8 @@ class Create extends command_1.Command {
         const teamName = flags.team;
         const ownerType = teamName ? 'team' : 'user';
         // If team or org is not specified, we assign ownership to the user creating
-        owner = teamName ? await (0, api_1.getTeam)(this.heroku, teamName) : await (0, api_1.getAccountInfo)(this.heroku);
-        owner = owner.body;
+        const response = teamName ? await (0, api_1.getTeam)(this.heroku, teamName) : await (0, api_1.getAccountInfo)(this.heroku);
+        owner = response.body;
         const ownerID = owner.id;
         owner = { id: ownerID, type: ownerType };
         const answers = await (0, inquirer_1.prompt)(questions);
@@ -53,7 +54,8 @@ class Create extends command_1.Command {
         if (answers.stage)
             stage = answers.stage;
         core_1.ux.action.start(`Creating ${name} pipeline`);
-        const { body: pipeline } = await (0, api_1.createPipeline)(this.heroku, name, owner);
+        const generation = await (0, generation_1.getGenerationByAppId)(app, this.heroku);
+        const { body: pipeline } = await (0, api_1.createPipeline)(this.heroku, name, owner, generation);
         core_1.ux.action.stop();
         core_1.ux.action.start(`Adding ${color_1.default.app(app)} to ${color_1.default.pipeline(pipeline.name)} pipeline as ${stage}`);
         await (0, api_1.createCoupling)(this.heroku, pipeline, app, stage);

package/lib/commands/redis/credentials.js

@@ -11,7 +11,7 @@ class Credentials extends command_1.Command {
         const addon = await (0, api_1.default)(app, database, false, this.heroku).getRedisAddon();
         if (reset) {
             core_1.ux.log(`Resetting credentials for ${addon.name}`);
-            await (0, api_1.default)(app, database, false, this.heroku).request(`/redis/v0/databases/${addon.name}/credentials_rotation`, 'POST');
+            await (0, api_1.default)(app, database, false, this.heroku).request(`/redis/v0/databases/${addon.name}/credentials_rotation`, 'POST', {});
         }
         else {
             const { body: redis } = await (0, api_1.default)(app, database, false, this.heroku).request(`/redis/v0/databases/${addon.name}`);

package/lib/commands/redis/stats-reset.js

@@ -19,7 +19,7 @@ class StatsReset extends command_1.Command {
         await (0, confirmCommand_1.default)(app, confirm, warning);
         core_1.ux.action.start(`Resetting stats on ${color_1.default.addon(addon.name || '')}`);
         const { body: response } = await (0, api_1.default)(app, database, false, this.heroku)
-            .request(`/redis/v0/databases/${addon.id}/stats/reset`, 'POST');
+            .request(`/redis/v0/databases/${addon.id}/stats/reset`, 'POST', {});
         core_1.ux.action.stop(response.message);
     }
 }

package/lib/commands/redis/wait.js

@@ -22,7 +22,7 @@ class Wait extends command_1.Command {
             let waiting = false;
             while (true) {
                 try {
-                    status = await api.request(`/redis/v0/databases/${addon.name}/wait`, 'GET').then(response => response.body);
+                    status = await api.request(`/redis/v0/databases/${addon.name}/wait`).then(response => response.body);
                 }
                 catch (error) {
                     const httpError = error;

package/lib/commands/spaces/create.js

@@ -56,7 +56,7 @@ class Create extends command_1.Command {
             },
         });
         core_1.ux.action.stop();
-        core_1.ux.warn(`${color_1.default.bold('Spend Alert.')} During the limited GA period, each Heroku ${spaceType} Private Space costs ~${dollarAmountHourly}/hour (max ${dollarAmountMonthly}/month), pro-rated to the second.`);
+        core_1.ux.warn(`${color_1.default.bold('Spend Alert.')} Each Heroku ${spaceType} Private Space costs ~${dollarAmountHourly}/hour (max ${dollarAmountMonthly}/month), pro-rated to the second.`);
         core_1.ux.warn(`Use ${color_1.default.cmd('heroku spaces:wait')} to track allocation.`);
         core_1.ux.styledHeader(space.name);
         core_1.ux.styledObject({

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

package/lib/lib/api.d.ts

@@ -5,12 +5,13 @@ 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;
 export declare const PIPELINES_HEADER: string;
+export declare type Owner = Pick<Heroku.Account, 'id' | 'type'> | Pick<Heroku.Team, 'id' | 'type'>;
 export declare function createAppSetup(heroku: APIClient, body: {
     body: any;
 }): Promise<import("@heroku/http-call").HTTP<Heroku.AppSetup>>;
 export declare function postCoupling(heroku: APIClient, pipeline: any, app: any, stage: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function createCoupling(heroku: APIClient, pipeline: any, app: string, stage: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
-export declare function createPipeline(heroku: APIClient, name: any, owner: any): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function createPipeline(heroku: APIClient, name: string, owner: Owner, generationName?: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
 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[]>>;

package/lib/lib/api.js

@@ -20,11 +20,11 @@ function createCoupling(heroku, pipeline, app, stage) {
     return postCoupling(heroku, pipeline.id, app, stage);
 }
 exports.createCoupling = createCoupling;
-function createPipeline(heroku, name, owner) {
+function createPipeline(heroku, name, owner, generationName = 'cedar') {
     return heroku.request('/pipelines', {
         method: 'POST',
         headers: { Accept: exports.PIPELINES_HEADER },
-        body: { name, owner },
+        body: { name, owner, generation: { name: generationName } },
     });
 }
 exports.createPipeline = createPipeline;

package/lib/lib/redis/api.d.ts

@@ -57,7 +57,7 @@ export declare type RedisFormationWaitResponse = {
 };
 declare type HttpVerb = 'GET' | 'POST' | 'PATCH' | 'DELETE' | 'PUT';
 declare const _default: (app: string, database: string | undefined, json: boolean, heroku: APIClient) => {
-    request<T>(path: string, method?: HttpVerb, body?: {}): Promise<import("@heroku/http-call").HTTP<T>>;
+    request<T>(path: string, method?: HttpVerb, body?: unknown): Promise<import("@heroku/http-call").HTTP<T>>;
     makeAddonsFilter(filter: string | undefined): (addons: Required<Heroku.AddOn>[]) => Required<Heroku.AddOn>[];
     getRedisAddon(addons?: Required<Heroku.AddOn>[]): Promise<Required<Heroku.AddOn>>;
     info(): Promise<void>;

package/lib/lib/redis/api.js

@@ -6,8 +6,8 @@ exports.default = (app, database, json, heroku) => {
     const HOST = process.env.HEROKU_REDIS_HOST || 'api.data.heroku.com';
     const ADDON = process.env.HEROKU_REDIS_ADDON_NAME || 'heroku-redis';
     return {
-        request(path, method = 'GET', body = {}) {
-            const headers = { Accept: 'application/json' };
+        request(path, method = 'GET', body = null) {
+            const headers = {};
             if (process.env.HEROKU_HEADERS) {
                 Object.assign(headers, JSON.parse(process.env.HEROKU_HEADERS));
             }