heroku 9.1.0 → 9.2.0-beta.1

package/lib/commands/addons/create.js

@@ -42,12 +42,17 @@ function parseConfig(args) {
 class Create extends command_1.Command {
     async run() {
         var _a;
+        this.allowArbitraryFlags = true;
         const _b = await this.parse(Create), { flags, args } = _b, restParse = tslib_1.__rest(_b, ["flags", "args"]);
         const { app, name, as, wait, confirm } = flags;
         const servicePlan = args['service:plan'];
         const argv = restParse.argv
             // oclif duplicates specified args in argv
             .filter(arg => arg !== servicePlan);
+        if (restParse.nonExistentFlags && restParse.nonExistentFlags.length > 0) {
+            process.stderr.write(` ${color_1.default.yellow('›')}   For example: ${color_1.default.cyan(`heroku addons:create -a ${app} ${restParse.raw[0].input} -- ${restParse.nonExistentFlags.join(' ')}`)}`);
+            process.stderr.write(` ${color_1.default.yellow('›')}   See https://devcenter.heroku.com/changelog-items/2925 for more info.\n`);
+        }
         const config = parseConfig(argv);
         let addon;
         try {

package/lib/commands/authorizations/create.js

@@ -8,7 +8,7 @@ class AuthorizationsCreate extends command_1.Command {
     async run() {
         const { flags } = await this.parse(AuthorizationsCreate);
         core_1.ux.action.start('Creating OAuth Authorization');
-        const { body: auth, headers } = await this.heroku.post('/oauth/authorizations', {
+        const { body: auth } = await this.heroku.post('/oauth/authorizations', {
             body: {
                 description: flags.description,
                 scope: flags.scope ? flags.scope.split(',') : undefined,
@@ -16,10 +16,6 @@ class AuthorizationsCreate extends command_1.Command {
             },
         });
         core_1.ux.action.stop();
-        const apiWarnings = headers['warning-message'] || '';
-        if (apiWarnings) {
-            core_1.ux.warn(apiWarnings);
-        }
         if (flags.short) {
             core_1.ux.log(auth.access_token && auth.access_token.token);
         }

package/lib/commands/authorizations/info.js

@@ -6,11 +6,7 @@ const authorizations_1 = require("../../lib/authorizations/authorizations");
 class AuthorizationsInfo extends command_1.Command {
     async run() {
         const { args, flags } = await this.parse(AuthorizationsInfo);
-        const { body: authentication, headers } = await this.heroku.get(`/oauth/authorizations/${args.id}`);
-        const apiWarnings = headers['warning-message'] || '';
-        if (apiWarnings) {
-            core_1.ux.warn(apiWarnings);
-        }
+        const { body: authentication } = await this.heroku.get(`/oauth/authorizations/${args.id}`);
         if (flags.json) {
             core_1.ux.styledJSON(authentication);
         }

package/lib/commands/authorizations/revoke.js

@@ -7,11 +7,7 @@ class AuthorizationsRevoke extends command_1.Command {
     async run() {
         const { args } = await this.parse(AuthorizationsRevoke);
         core_1.ux.action.start('Revoking OAuth Authorization');
-        const { body: auth, headers } = await this.heroku.delete(`/oauth/authorizations/${encodeURIComponent(args.id)}`);
-        const apiWarnings = headers['warning-message'] || '';
-        if (apiWarnings) {
-            core_1.ux.warn(apiWarnings);
-        }
+        const { body: auth } = await this.heroku.delete(`/oauth/authorizations/${encodeURIComponent(args.id)}`);
         core_1.ux.action.stop(`done, revoked authorization from ${color_1.default.cyan(auth.description)}`);
     }
 }

package/lib/commands/authorizations/rotate.js

@@ -7,11 +7,7 @@ class AuthorizationsRotate extends command_1.Command {
     async run() {
         const { args } = await this.parse(AuthorizationsRotate);
         core_1.ux.action.start('Rotating OAuth Authorization');
-        const { body: authorization, headers } = await this.heroku.post(`/oauth/authorizations/${encodeURIComponent(args.id)}/actions/regenerate-tokens`);
-        const apiWarnings = headers['warning-message'] || '';
-        if (apiWarnings) {
-            core_1.ux.warn(apiWarnings);
-        }
+        const { body: authorization } = await this.heroku.post(`/oauth/authorizations/${encodeURIComponent(args.id)}/actions/regenerate-tokens`);
         core_1.ux.action.stop();
         (0, authorizations_1.display)(authorization);
     }

package/lib/commands/authorizations/update.js

@@ -14,16 +14,12 @@ class AuthorizationsUpdate extends command_1.Command {
                 secret: flags['client-secret'],
             };
         }
-        const { body: authentication, headers } = await this.heroku.patch(`/oauth/authorizations/${args.id}`, {
+        const { body: authentication } = await this.heroku.patch(`/oauth/authorizations/${args.id}`, {
             body: {
                 description: flags.description,
                 client,
             },
         });
-        const apiWarnings = headers['warning-message'] || '';
-        if (apiWarnings) {
-            core_1.ux.warn(apiWarnings);
-        }
         core_1.ux.action.stop();
         (0, authorizations_1.display)(authentication);
     }

package/lib/commands/ci/index.js

@@ -18,7 +18,7 @@ CiIndex.examples = [
 `,
 ];
 CiIndex.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app name' }),
+    app: command_1.flags.app(),
     remote: command_1.flags.remote(),
     watch: command_1.flags.boolean({ description: 'keep running and watch for new and update tests', required: false }),
     pipeline: command_1.flags.pipeline({ required: false }),

package/lib/commands/ci/info.js

@@ -20,7 +20,7 @@ CiInfo.examples = [
 `,
 ];
 CiInfo.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app name' }),
+    app: command_1.flags.app(),
     remote: command_1.flags.remote(),
     node: command_1.flags.string({ description: 'the node number to show its setup and output', required: false }),
     pipeline: command_1.flags.pipeline({ required: false }),

package/lib/commands/ci/last.js

@@ -25,7 +25,7 @@ CiLast.examples = [
 `,
 ];
 CiLast.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app name' }),
+    app: command_1.flags.app(),
     remote: command_1.flags.remote(),
     node: command_1.flags.string({ description: 'the node number to show its setup and output', required: false }),
     pipeline: command_1.flags.pipeline({ required: false }),

package/lib/commands/ci/rerun.js

@@ -45,7 +45,7 @@ CiReRun.examples = [
 `,
 ];
 CiReRun.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app name' }),
+    app: command_1.flags.app(),
     remote: command_1.flags.remote(),
     pipeline: command_1.flags.pipeline({ required: false }),
 };

package/lib/commands/ci/run.d.ts

@@ -4,6 +4,7 @@ export default class CiRun extends Command {
     static examples: string[];
     static flags: {
         app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         pipeline: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;

package/lib/commands/ci/run.js

@@ -37,6 +37,7 @@ CiRun.examples = [
 `,
 ];
 CiRun.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app name' }),
+    app: command_1.flags.app(),
+    remote: command_1.flags.remote(),
     pipeline: command_1.flags.pipeline({ required: false }),
 };

package/lib/commands/local/run.js

@@ -4,12 +4,14 @@ const completions_1 = require("@heroku-cli/command/lib/completions");
 const core_1 = require("@oclif/core");
 const color_1 = require("@heroku-cli/color");
 const fork_foreman_1 = require("../../lib/local/fork-foreman");
+const helpers_1 = require("../../lib/run/helpers");
 const fs = require("fs");
 class Run extends core_1.Command {
     async run() {
         const execArgv = ['run'];
         const { argv, flags } = await this.parse(Run);
-        if (argv.length === 0) {
+        const userArgvInputOrder = (0, helpers_1.revertSortedArgs)(process.argv, argv);
+        if (userArgvInputOrder.length === 0) {
             const errorMessage = 'Usage: heroku local:run [COMMAND]\nMust specify command to run';
             this.error(errorMessage, { exit: -1 });
         }
@@ -22,7 +24,7 @@ class Run extends core_1.Command {
         if (flags.port)
             execArgv.push('--port', flags.port);
         execArgv.push('--'); // disable node-foreman flag parsing
-        execArgv.push(...argv); // eslint-disable-line unicorn/no-array-push-push
+        execArgv.push(...userArgvInputOrder); // eslint-disable-line unicorn/no-array-push-push
         await (0, fork_foreman_1.fork)(execArgv);
     }
 }

package/lib/commands/pg/backups/schedule.js

@@ -24,18 +24,12 @@ class Schedule extends command_1.Command {
     constructor() {
         super(...arguments);
         this.parseDate = function (at) {
-            const m = at.match(/^([0-2]?[0-9]):00 ?(\S*)$/);
-            if (!m)
-                throw new Error("Invalid schedule format: expected --at '[HOUR]:00 [TIMEZONE]'");
-            const [, hour, timezone] = m;
-            let scheduledTZ = TZ[timezone.toUpperCase()];
-            if (!scheduledTZ) {
-                scheduledTZ = 'UTC';
-                if (timezone) {
-                    core_1.ux.warn(`Unknown timezone ${color_1.default.yellow(timezone)}. Defaulting to UTC.`);
-                }
+            const m = at.match(/^(0?\d|1\d|2[0-3]):00 ?(\S*)$/);
+            if (m) {
+                const [, hour, timezone] = m;
+                return { hour, timezone: TZ[timezone.toUpperCase()] || timezone || 'UTC' };
             }
-            return { hour, timezone: scheduledTZ };
+            return core_1.ux.error("Invalid schedule format: expected --at '[HOUR]:00 [TIMEZONE]'", { exit: 1 });
         };
     }
     async run() {
@@ -48,7 +42,7 @@ class Schedule extends command_1.Command {
         const db = attachment.addon;
         const at = color_1.default.cyan(`${schedule.hour}:00 ${schedule.timezone}`);
         const pgResponse = await this.heroku.get(`/client/v11/databases/${db.id}`, { hostname: (0, host_1.default)() })
-            .catch(error => {
+            .catch((error) => {
             if (error.statusCode !== 404)
                 throw error;
             core_1.ux.error(`${color_1.default.yellow(db.name)} is not yet provisioned.\nRun ${color_1.default.cyan.bold('heroku addons:wait')} to wait until the db is provisioned.`, { exit: 1 });

package/lib/commands/pg/credentials/rotate.d.ts

@@ -8,6 +8,7 @@ export default class Rotate extends Command {
         confirm: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
         database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;

package/lib/commands/pg/credentials/rotate.js

@@ -76,6 +76,7 @@ Rotate.flags = {
     confirm: command_1.flags.string({ char: 'c' }),
     force: command_1.flags.boolean({ description: 'forces rotating the targeted credentials' }),
     app: command_1.flags.app({ required: true }),
+    remote: command_1.flags.remote(),
 };
 Rotate.args = {
     database: core_1.Args.string(),

package/lib/commands/pg/settings/auto-explain/log-min-duration.d.ts

@@ -5,10 +5,7 @@ export default class LogMinDuration extends PGSettingsCommand {
     static description: string;
     static args: {
         database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
-        value: import("@oclif/core/lib/interfaces/parser").Arg<number | undefined, {
-            min?: number | undefined;
-            max?: number | undefined;
-        }>;
+        value: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     protected settingKey: SettingKey;
     protected convertValue(val: string): number;

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

@@ -29,5 +29,5 @@ LogMinDuration.description = (0, tsheredoc_1.default)(`
   `);
 LogMinDuration.args = {
     database: core_1.Args.string(),
-    value: core_1.Args.integer(),
+    value: core_1.Args.string(),
 };

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

@@ -4,10 +4,7 @@ export default class LogMinDurationStatement extends PGSettingsCommand {
     static description: string;
     static args: {
         database: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
-        value: import("@oclif/core/lib/interfaces/parser").Arg<number | undefined, {
-            min?: number | undefined;
-            max?: number | undefined;
-        }>;
+        value: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     protected settingKey: SettingKey;
     protected convertValue(val: unknown): number;

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

@@ -29,5 +29,5 @@ LogMinDurationStatement.description = (0, tsheredoc_1.default)(`
   `);
 LogMinDurationStatement.args = {
     database: core_1.Args.string(),
-    value: core_1.Args.integer(),
+    value: core_1.Args.string(),
 };

package/lib/commands/ps/scale.js

@@ -14,16 +14,6 @@ class Scale extends command_1.Command {
         const _a = await this.parse(Scale), { flags } = _a, restParse = tslib_1.__rest(_a, ["flags"]);
         const argv = restParse.argv;
         const { app } = flags;
-        // will remove this flag once we have
-        // successfully launched larger dyno sizes
-        let isLargerDyno = false;
-        const { body: largerDynoFeatureFlag } = await this.heroku.get('/account/features/frontend-larger-dynos')
-            .catch((error) => {
-            if (error.statusCode === 404) {
-                return { body: { enabled: false } };
-            }
-            throw error;
-        });
         function parse(args) {
             return (0, lodash_1.compact)(args.map(arg => {
                 const change = arg.match(/^([\w-]+)([=+-]\d+)(?::([\w-]+))?$/);
@@ -36,18 +26,6 @@ class Scale extends command_1.Command {
             }));
         }
         const changes = parse(argv);
-        // checks for larger dyno sizes
-        // if the feature is not enabled
-        if (!largerDynoFeatureFlag.enabled) {
-            changes.forEach(({ size }) => {
-                const largerDynoNames = /^(?!standard-[12]x$)(performance|private|shield)-(l-ram|xl|2xl)$/i;
-                isLargerDyno = largerDynoNames.test(size);
-                if (isLargerDyno) {
-                    const availableDynoSizes = 'eco, basic, standard-1x, standard-2x, performance-m, performance-l, private-s, private-m, private-l, shield-s, shield-m, shield-l';
-                    core_1.ux.error(`No such size as ${size}. Use ${availableDynoSizes}.`, { exit: 1 });
-                }
-            });
-        }
         if (changes.length === 0) {
             const { body: formation } = await this.heroku.get(`/apps/${app}/formation`);
             const { body: appProps } = await this.heroku.get(`/apps/${app}`);

package/lib/commands/ps/type.js

@@ -95,16 +95,6 @@ class Type extends command_1.Command {
         const _a = await this.parse(Type), { flags } = _a, restParse = tslib_1.__rest(_a, ["flags"]);
         const argv = restParse.argv;
         const { app } = flags;
-        // will remove this flag once we have
-        // successfully launched larger dyno sizes
-        let isLargerDyno = false;
-        const { body: largerDynoFeatureFlag } = await this.heroku.get('/account/features/frontend-larger-dynos')
-            .catch((error) => {
-            if (error.statusCode === 404) {
-                return { body: { enabled: false } };
-            }
-            throw error;
-        });
         const parse = async () => {
             if (!argv || argv.length === 0)
                 return [];
@@ -124,18 +114,6 @@ class Type extends command_1.Command {
             return formation.map(p => ({ type: p.type, size: argv[0] }));
         };
         const changes = await parse();
-        // checks for larger dyno sizes
-        // if the feature is not enabled
-        if (!largerDynoFeatureFlag.enabled) {
-            changes.forEach(({ size }) => {
-                const largerDynoNames = /^(?!standard-[12]x$)(performance|private|shield)-(l-ram|xl|2xl)$/i;
-                isLargerDyno = largerDynoNames.test(size);
-                if (isLargerDyno) {
-                    const availableDynoSizes = 'eco, basic, standard-1x, standard-2x, performance-m, performance-l, private-s, private-m, private-l, shield-s, shield-m, shield-l';
-                    core_1.ux.error(`No such size as ${size}. Use ${availableDynoSizes}.`, { exit: 1 });
-                }
-            });
-        }
         if (changes.length > 0) {
             core_1.ux.action.start(`Scaling dynos on ${color_1.default.magenta(app)}`);
             await this.heroku.patch(`/apps/${app}/formation`, { body: { updates: changes } });

package/lib/commands/redis/cli.js

@@ -99,7 +99,6 @@ async function bastionConnect(uri, bastions, config, preferNativeTls) {
     const tunnel = await new Promise(resolve => {
         var _a;
         const ssh2 = new ssh2_1.Client();
-        resolve(ssh2);
         ssh2.once('ready', () => resolve(ssh2));
         ssh2.connect({
             host: bastions.split(',')[0],
@@ -108,7 +107,7 @@ async function bastionConnect(uri, bastions, config, preferNativeTls) {
         });
     });
     const localPort = await portfinder.getPortPromise({ startPort: 49152, stopPort: 65535 });
-    const stream = await (0, node_util_1.promisify)(tunnel.forwardOut)('localhost', localPort, uri.hostname, Number.parseInt(uri.port, 10));
+    const stream = await (0, node_util_1.promisify)(tunnel.forwardOut.bind(tunnel))('localhost', localPort, uri.hostname, Number.parseInt(uri.port, 10));
     let client = stream;
     if (preferNativeTls) {
         client = tls.connect({

package/lib/commands/run/index.js

@@ -10,12 +10,13 @@ const debug = (0, debug_1.default)('heroku:run');
 class Run extends command_1.Command {
     async run() {
         const { argv, flags } = await this.parse(Run);
+        const userArgvInputOrder = (0, helpers_1.revertSortedArgs)(process.argv, argv);
         const opts = {
             'exit-code': flags['exit-code'],
             'no-tty': flags['no-tty'],
             app: flags.app,
             attach: true,
-            command: (0, helpers_1.buildCommand)(argv),
+            command: (0, helpers_1.buildCommand)(userArgvInputOrder),
             env: flags.env,
             heroku: this.heroku,
             listen: flags.listen,

package/lib/lib/run/helpers.d.ts

@@ -1,2 +1,3 @@
+export declare function revertSortedArgs(processArgs: Array<string>, argv: Array<string>): string[];
 export declare function buildCommand(args: Array<string>): string;
 export declare function buildEnvFromFlag(flag: string): {};

package/lib/lib/run/helpers.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEnvFromFlag = exports.buildCommand = void 0;
+exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const core_1 = require("@oclif/core");
+// this function exists because oclif sorts argv
+function revertSortedArgs(processArgs, argv) {
+    const originalInputOrder = [];
+    // this reorders the arguments in the order the user inputted
+    for (const processArg of processArgs) {
+        if (argv.includes(processArg)) {
+            originalInputOrder.push(processArg);
+        }
+    }
+    return originalInputOrder;
+}
+exports.revertSortedArgs = revertSortedArgs;
 function buildCommand(args) {
     if (args.length === 1) {
         // do not add quotes around arguments if there is only one argument