heroku 10.2.0-beta.0 → 10.3.0-beta.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/logs.js

@@ -73,7 +73,7 @@ Logs.flags = {
     tail: command_1.flags.boolean({
         char: 't',
         default: false,
-        description: 'continually stream logs (defaults to true for Fir generation apps)',
+        description: 'continually stream logs (always enabled for Fir-generation apps)',
     }),
     'process-type': command_1.flags.string({
         char: 'p',

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));
             }

package/oclif.manifest.json

@@ -169,7 +169,7 @@
         },
         "tail": {
           "char": "t",
-          "description": "continually stream logs (defaults to true for Fir generation apps)",
+          "description": "continually stream logs (always enabled for Fir-generation apps)",
           "name": "tail",
           "allowNo": false,
           "type": "boolean"
@@ -337,202 +337,6 @@
         "status.js"
       ]
     },
-    "access:add": {
-      "aliases": [],
-      "args": {
-        "email": {
-          "description": "email address of the team member",
-          "name": "email",
-          "required": true
-        }
-      },
-      "description": "add new users to your app",
-      "examples": [
-        "$ heroku access:add user@email.com --app APP # add a collaborator to your app",
-        "$ heroku access:add user@email.com --app APP --permissions deploy,manage,operate # permissions must be comma separated"
-      ],
-      "flags": {
-        "app": {
-          "char": "a",
-          "description": "app to run command against",
-          "name": "app",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "remote": {
-          "char": "r",
-          "description": "git remote of app to use",
-          "name": "remote",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "permissions": {
-          "char": "p",
-          "description": "list of permissions comma separated",
-          "name": "permissions",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "access:add",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "access",
-        "add.js"
-      ]
-    },
-    "access": {
-      "aliases": [],
-      "args": {},
-      "description": "list who has access to an app",
-      "flags": {
-        "app": {
-          "char": "a",
-          "description": "app to run command against",
-          "name": "app",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "remote": {
-          "char": "r",
-          "description": "git remote of app to use",
-          "name": "remote",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "json": {
-          "description": "output in json format",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "access",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "topic": "access",
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "access",
-        "index.js"
-      ]
-    },
-    "access:remove": {
-      "aliases": [],
-      "args": {},
-      "description": "remove users from a team app",
-      "examples": "$ heroku access:remove user@email.com --app APP",
-      "flags": {
-        "app": {
-          "char": "a",
-          "description": "app to run command against",
-          "name": "app",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "remote": {
-          "char": "r",
-          "description": "git remote of app to use",
-          "name": "remote",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "access:remove",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": false,
-      "example": "$ heroku access:remove user@email.com --app APP",
-      "topic": "access",
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "access",
-        "remove.js"
-      ]
-    },
-    "access:update": {
-      "aliases": [],
-      "args": {
-        "email": {
-          "description": "email address of the team member",
-          "name": "email",
-          "required": true
-        }
-      },
-      "description": "update existing collaborators on an team app",
-      "flags": {
-        "permissions": {
-          "char": "p",
-          "description": "comma-delimited list of permissions to update (deploy,manage,operate)",
-          "name": "permissions",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "app": {
-          "char": "a",
-          "description": "app to run command against",
-          "name": "app",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "remote": {
-          "char": "r",
-          "description": "git remote of app to use",
-          "name": "remote",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "access:update",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "topic": "access",
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "access",
-        "update.js"
-      ]
-    },
     "addons:attach": {
       "aliases": [],
       "args": {
@@ -1882,17 +1686,213 @@
       "relativePath": [
         "lib",
         "commands",
-        "apps",
-        "transfer.js"
+        "apps",
+        "transfer.js"
+      ]
+    },
+    "apps:unlock": {
+      "aliases": [
+        "unlock"
+      ],
+      "args": {},
+      "description": "unlock an app so any team member can join",
+      "flags": {
+        "app": {
+          "char": "a",
+          "description": "app to run command against",
+          "name": "app",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "remote": {
+          "char": "r",
+          "description": "git remote of app to use",
+          "name": "remote",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "apps:unlock",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "topic": "apps",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "apps",
+        "unlock.js"
+      ]
+    },
+    "access:add": {
+      "aliases": [],
+      "args": {
+        "email": {
+          "description": "email address of the team member",
+          "name": "email",
+          "required": true
+        }
+      },
+      "description": "add new users to your app",
+      "examples": [
+        "$ heroku access:add user@email.com --app APP # add a collaborator to your app",
+        "$ heroku access:add user@email.com --app APP --permissions deploy,manage,operate # permissions must be comma separated"
+      ],
+      "flags": {
+        "app": {
+          "char": "a",
+          "description": "app to run command against",
+          "name": "app",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "remote": {
+          "char": "r",
+          "description": "git remote of app to use",
+          "name": "remote",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "permissions": {
+          "char": "p",
+          "description": "list of permissions comma separated",
+          "name": "permissions",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "access:add",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "access",
+        "add.js"
+      ]
+    },
+    "access": {
+      "aliases": [],
+      "args": {},
+      "description": "list who has access to an app",
+      "flags": {
+        "app": {
+          "char": "a",
+          "description": "app to run command against",
+          "name": "app",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "remote": {
+          "char": "r",
+          "description": "git remote of app to use",
+          "name": "remote",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "description": "output in json format",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "access",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "topic": "access",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "access",
+        "index.js"
+      ]
+    },
+    "access:remove": {
+      "aliases": [],
+      "args": {},
+      "description": "remove users from a team app",
+      "examples": "$ heroku access:remove user@email.com --app APP",
+      "flags": {
+        "app": {
+          "char": "a",
+          "description": "app to run command against",
+          "name": "app",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "remote": {
+          "char": "r",
+          "description": "git remote of app to use",
+          "name": "remote",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "access:remove",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": false,
+      "example": "$ heroku access:remove user@email.com --app APP",
+      "topic": "access",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "access",
+        "remove.js"
       ]
     },
-    "apps:unlock": {
-      "aliases": [
-        "unlock"
-      ],
-      "args": {},
-      "description": "unlock an app so any team member can join",
+    "access:update": {
+      "aliases": [],
+      "args": {
+        "email": {
+          "description": "email address of the team member",
+          "name": "email",
+          "required": true
+        }
+      },
+      "description": "update existing collaborators on an team app",
       "flags": {
+        "permissions": {
+          "char": "p",
+          "description": "comma-delimited list of permissions to update (deploy,manage,operate)",
+          "name": "permissions",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "app": {
           "char": "a",
           "description": "app to run command against",
@@ -1913,18 +1913,18 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "apps:unlock",
+      "id": "access:update",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
       "strict": true,
-      "topic": "apps",
+      "topic": "access",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "apps",
-        "unlock.js"
+        "access",
+        "update.js"
       ]
     },
     "auth:login": {
@@ -2543,7 +2543,7 @@
     "buildpacks": {
       "aliases": [],
       "args": {},
-      "description": "display the buildpacks for an app",
+      "description": "list the buildpacks on an app",
       "flags": {
         "app": {
           "char": "a",
@@ -10078,6 +10078,7 @@
           "type": "option"
         },
         "app": {
+          "char": "a",
           "description": "filter by app name",
           "name": "app",
           "hasDynamicHelp": false,
@@ -12407,15 +12408,19 @@
         "index.js"
       ]
     },
-    "pg:maintenance": {
+    "pg:settings:auto-explain": {
       "aliases": [],
       "args": {
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
+        },
+        "value": {
+          "description": "boolean indicating if execution plans of queries will be logged for future connections",
+          "name": "value"
         }
       },
-      "description": "show current maintenance information",
+      "description": "Automatically log execution plans of queries without running EXPLAIN by hand.\nThe auto_explain module is loaded at session-time so existing connections will not be logged.\nRestart your Heroku app and/or restart existing connections for logging to start taking place.\n",
       "flags": {
         "app": {
           "char": "a",
@@ -12437,37 +12442,35 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:maintenance",
+      "id": "pg:settings:auto-explain",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "maintenance",
-        "index.js"
+        "settings",
+        "auto-explain.js"
       ]
     },
-    "pg:maintenance:run": {
+    "pg:settings:explain-data-connector-details": {
       "aliases": [],
       "args": {
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
+        },
+        "value": {
+          "description": "boolean indicating if data replication slot details get logged",
+          "name": "value"
         }
       },
-      "description": "start maintenance",
+      "description": "displays stats on replication slots on your database, the default value is \"off\"\n",
       "flags": {
-        "force": {
-          "char": "f",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "app": {
           "char": "a",
           "description": "app to run command against",
@@ -12488,36 +12491,29 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:maintenance:run",
+      "id": "pg:settings:explain-data-connector-details",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
-      "strict": true,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "maintenance",
-        "run.js"
+        "settings",
+        "explain-data-connector-details.js"
       ]
     },
-    "pg:maintenance:window": {
+    "pg:settings": {
       "aliases": [],
       "args": {
-        "window": {
-          "description": "timestamp of the maintenance window",
-          "name": "window",
-          "required": true
-        },
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
         }
       },
-      "description": "Set weekly maintenance window.\nAll times are in UTC.\n",
-      "examples": "$ heroku pg:maintenance:window \"Sunday 06:00\" postgres-slippery-100",
+      "description": "show your current database settings",
       "flags": {
         "app": {
           "char": "a",
@@ -12539,23 +12535,22 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:maintenance:window",
+      "id": "pg:settings",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
       "strict": true,
       "topic": "pg",
-      "example": "$ heroku pg:maintenance:window \"Sunday 06:00\" postgres-slippery-100",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "maintenance",
-        "window.js"
+        "settings",
+        "index.js"
       ]
     },
-    "pg:settings:auto-explain": {
+    "pg:settings:log-connections": {
       "aliases": [],
       "args": {
         "database": {
@@ -12563,11 +12558,11 @@
           "name": "database"
         },
         "value": {
-          "description": "boolean indicating if execution plans of queries will be logged for future connections",
+          "description": "boolean indicating if database login attempts get logged",
           "name": "value"
         }
       },
-      "description": "Automatically log execution plans of queries without running EXPLAIN by hand.\nThe auto_explain module is loaded at session-time so existing connections will not be logged.\nRestart your Heroku app and/or restart existing connections for logging to start taking place.\n",
+      "description": "Controls whether a log message is produced when a login attempt is made. Default is true.\nSetting log_connections to false stops emitting log messages for all attempts to login to the database.",
       "flags": {
         "app": {
           "char": "a",
@@ -12589,11 +12584,10 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:auto-explain",
+      "id": "pg:settings:log-connections",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
-      "strict": false,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
@@ -12601,10 +12595,10 @@
         "commands",
         "pg",
         "settings",
-        "auto-explain.js"
+        "log-connections.js"
       ]
     },
-    "pg:settings:explain-data-connector-details": {
+    "pg:settings:log-lock-waits": {
       "aliases": [],
       "args": {
         "database": {
@@ -12612,11 +12606,11 @@
           "name": "database"
         },
         "value": {
-          "description": "boolean indicating if data replication slot details get logged",
+          "description": "boolean indicating if a message gets logged when a session waits longer than the deadlock_timeout to acquire a lock",
           "name": "value"
         }
       },
-      "description": "displays stats on replication slots on your database, the default value is \"off\"\n",
+      "description": "Controls whether a log message is produced when a session waits longer than the deadlock_timeout to acquire a lock. deadlock_timeout is set to 1 second\nDelays due to lock contention occur when multiple transactions are trying to access the same resource at the same time.\nApplications and their query patterns should try to avoid changes to many different tables within the same transaction.\n",
       "flags": {
         "app": {
           "char": "a",
@@ -12638,7 +12632,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:explain-data-connector-details",
+      "id": "pg:settings:log-lock-waits",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -12649,18 +12643,22 @@
         "commands",
         "pg",
         "settings",
-        "explain-data-connector-details.js"
+        "log-lock-waits.js"
       ]
     },
-    "pg:settings": {
+    "pg:settings:log-min-duration-statement": {
       "aliases": [],
       "args": {
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
+        },
+        "value": {
+          "description": "milliseconds to wait for a statement to complete before logging it",
+          "name": "value"
         }
       },
-      "description": "show your current database settings",
+      "description": "The duration of each completed statement will be logged if the statement completes after the time specified by VALUE.\nVALUE needs to specified as a whole number, in milliseconds.\nSetting log_min_duration_statement to zero prints all statement durations and -1 will disable logging statement durations.\n",
       "flags": {
         "app": {
           "char": "a",
@@ -12682,11 +12680,10 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings",
+      "id": "pg:settings:log-min-duration-statement",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
-      "strict": true,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
@@ -12694,10 +12691,10 @@
         "commands",
         "pg",
         "settings",
-        "index.js"
+        "log-min-duration-statement.js"
       ]
     },
-    "pg:settings:log-connections": {
+    "pg:settings:log-min-error-statement": {
       "aliases": [],
       "args": {
         "database": {
@@ -12705,11 +12702,16 @@
           "name": "database"
         },
         "value": {
-          "description": "boolean indicating if database login attempts get logged",
-          "name": "value"
+          "name": "value",
+          "options": [
+            "error",
+            "log",
+            "fatal",
+            "panic"
+          ]
         }
       },
-      "description": "Controls whether a log message is produced when a login attempt is made. Default is true.\nSetting log_connections to false stops emitting log messages for all attempts to login to the database.",
+      "description": "log-min-error-statement controls the logging of SQL statements that cause an error at a specified severity level.\nThis setting is useful to prevent logging SQL queries that might contain sensitive information.\nUse this setting to prevent logging SQL queries that contain sensitive information. Default is \"error\".\n",
       "flags": {
         "app": {
           "char": "a",
@@ -12731,7 +12733,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:log-connections",
+      "id": "pg:settings:log-min-error-statement",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -12742,10 +12744,10 @@
         "commands",
         "pg",
         "settings",
-        "log-connections.js"
+        "log-min-error-statement.js"
       ]
     },
-    "pg:settings:log-lock-waits": {
+    "pg:settings:log-statement": {
       "aliases": [],
       "args": {
         "database": {
@@ -12753,11 +12755,17 @@
           "name": "database"
         },
         "value": {
-          "description": "boolean indicating if a message gets logged when a session waits longer than the deadlock_timeout to acquire a lock",
-          "name": "value"
+          "description": "type of SQL statements to log\n<options: none|ddl|mod|all>",
+          "name": "value",
+          "options": [
+            "none",
+            "ddl",
+            "mod",
+            "all"
+          ]
         }
       },
-      "description": "Controls whether a log message is produced when a session waits longer than the deadlock_timeout to acquire a lock. deadlock_timeout is set to 1 second\nDelays due to lock contention occur when multiple transactions are trying to access the same resource at the same time.\nApplications and their query patterns should try to avoid changes to many different tables within the same transaction.\n",
+      "description": "log_statement controls which SQL statements are logged.\nValid values for VALUE:\nnone - No statements are logged\nddl  - All data definition statements, such as CREATE, ALTER and DROP will be logged\nmod  - Includes all statements from ddl as well as data-modifying statements such as INSERT, UPDATE, DELETE, TRUNCATE, COPY\nall  - All statements are logged\n",
       "flags": {
         "app": {
           "char": "a",
@@ -12779,7 +12787,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:log-lock-waits",
+      "id": "pg:settings:log-statement",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -12790,10 +12798,10 @@
         "commands",
         "pg",
         "settings",
-        "log-lock-waits.js"
+        "log-statement.js"
       ]
     },
-    "pg:settings:log-min-duration-statement": {
+    "pg:settings:track-functions": {
       "aliases": [],
       "args": {
         "database": {
@@ -12801,11 +12809,16 @@
           "name": "database"
         },
         "value": {
-          "description": "milliseconds to wait for a statement to complete before logging it",
-          "name": "value"
+          "description": "function type to track\n<options: none|pl|all>",
+          "name": "value",
+          "options": [
+            "none",
+            "pl",
+            "all"
+          ]
         }
       },
-      "description": "The duration of each completed statement will be logged if the statement completes after the time specified by VALUE.\nVALUE needs to specified as a whole number, in milliseconds.\nSetting log_min_duration_statement to zero prints all statement durations and -1 will disable logging statement durations.\n",
+      "description": "track_functions controls tracking of function call counts and time used. Default is none.\nValid values for VALUE:\nnone - No functions are tracked (default)\npl   - Only procedural language functions are tracked\nall  - All functions, including SQL and C language functions, are tracked. Simple SQL-language that are inlined are not tracked",
       "flags": {
         "app": {
           "char": "a",
@@ -12827,7 +12840,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:log-min-duration-statement",
+      "id": "pg:settings:track-functions",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -12838,27 +12851,18 @@
         "commands",
         "pg",
         "settings",
-        "log-min-duration-statement.js"
+        "track-functions.js"
       ]
     },
-    "pg:settings:log-min-error-statement": {
+    "pg:maintenance": {
       "aliases": [],
       "args": {
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
-        },
-        "value": {
-          "name": "value",
-          "options": [
-            "error",
-            "log",
-            "fatal",
-            "panic"
-          ]
         }
       },
-      "description": "log-min-error-statement controls the logging of SQL statements that cause an error at a specified severity level.\nThis setting is useful to prevent logging SQL queries that might contain sensitive information.\nUse this setting to prevent logging SQL queries that contain sensitive information. Default is \"error\".\n",
+      "description": "show current maintenance information",
       "flags": {
         "app": {
           "char": "a",
@@ -12880,40 +12884,37 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:log-min-error-statement",
+      "id": "pg:maintenance",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
+      "strict": true,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "settings",
-        "log-min-error-statement.js"
+        "maintenance",
+        "index.js"
       ]
     },
-    "pg:settings:log-statement": {
+    "pg:maintenance:run": {
       "aliases": [],
       "args": {
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
-        },
-        "value": {
-          "description": "type of SQL statements to log\n<options: none|ddl|mod|all>",
-          "name": "value",
-          "options": [
-            "none",
-            "ddl",
-            "mod",
-            "all"
-          ]
         }
       },
-      "description": "log_statement controls which SQL statements are logged.\nValid values for VALUE:\nnone - No statements are logged\nddl  - All data definition statements, such as CREATE, ALTER and DROP will be logged\nmod  - Includes all statements from ddl as well as data-modifying statements such as INSERT, UPDATE, DELETE, TRUNCATE, COPY\nall  - All statements are logged\n",
+      "description": "start maintenance",
       "flags": {
+        "force": {
+          "char": "f",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "app": {
           "char": "a",
           "description": "app to run command against",
@@ -12934,38 +12935,36 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:log-statement",
+      "id": "pg:maintenance:run",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
+      "strict": true,
       "topic": "pg",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "settings",
-        "log-statement.js"
+        "maintenance",
+        "run.js"
       ]
     },
-    "pg:settings:track-functions": {
+    "pg:maintenance:window": {
       "aliases": [],
       "args": {
+        "window": {
+          "description": "timestamp of the maintenance window",
+          "name": "window",
+          "required": true
+        },
         "database": {
           "description": "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::` . If omitted, we use DATABASE_URL.",
           "name": "database"
-        },
-        "value": {
-          "description": "function type to track\n<options: none|pl|all>",
-          "name": "value",
-          "options": [
-            "none",
-            "pl",
-            "all"
-          ]
         }
       },
-      "description": "track_functions controls tracking of function call counts and time used. Default is none.\nValid values for VALUE:\nnone - No functions are tracked (default)\npl   - Only procedural language functions are tracked\nall  - All functions, including SQL and C language functions, are tracked. Simple SQL-language that are inlined are not tracked",
+      "description": "Set weekly maintenance window.\nAll times are in UTC.\n",
+      "examples": "$ heroku pg:maintenance:window \"Sunday 06:00\" postgres-slippery-100",
       "flags": {
         "app": {
           "char": "a",
@@ -12987,18 +12986,20 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pg:settings:track-functions",
+      "id": "pg:maintenance:window",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
+      "strict": true,
       "topic": "pg",
+      "example": "$ heroku pg:maintenance:window \"Sunday 06:00\" postgres-slippery-100",
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
         "pg",
-        "settings",
-        "track-functions.js"
+        "maintenance",
+        "window.js"
       ]
     },
     "ps:autoscale:disable": {
@@ -14450,5 +14451,5 @@
       ]
     }
   },
-  "version": "10.2.0-beta.0"
+  "version": "10.3.0-beta.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.2.0-beta.0",
+  "version": "10.3.0-beta.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -9,7 +9,7 @@
     "@heroku-cli/color": "2.0.1",
     "@heroku-cli/command": "^11.5.0",
     "@heroku-cli/notifications": "^1.2.4",
-    "@heroku-cli/plugin-ps-exec": "2.6.1",
+    "@heroku-cli/plugin-ps-exec": "2.6.2",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
@@ -66,7 +66,7 @@
     "shell-quote": "^1.8.1",
     "smooth-progress": "^1.1.0",
     "sparkline": "^0.2.0",
-    "ssh2": "^1.15.0",
+    "ssh2": "^1.16.0",
     "stdout-stderr": "^0.1.13",
     "strftime": "^0.10.0",
     "strip-ansi": "^6",
@@ -103,7 +103,7 @@
     "@types/shell-escape": "^0.2.0",
     "@types/shell-quote": "^1.7.5",
     "@types/sinon": "^17.0.3",
-    "@types/ssh2": "^1.15.0",
+    "@types/ssh2": "^1.15.4",
     "@types/std-mocks": "^1.0.4",
     "@types/strftime": "^0.9.8",
     "@types/supports-color": "^8.1.3",
@@ -368,6 +368,7 @@
       "heroku-pipelines": null,
       "heroku-ps-wait": null,
       "heroku-redis": null,
+      "heroku-repo": "@heroku-cli/plugin-heroku-repo",
       "heroku-skynet-cli": "@heroku/skynet",
       "heroku-splunk": "@heroku/splunk",
       "heroku-sudo": "@heroku/sudo",
@@ -396,5 +397,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "2c28399f0d89032f78f8caac507bf7e507aefea5"
+  "gitHead": "3df5c5557b27d824077c46994213490e56f94015"
 }