heroku 10.0.0-beta.2 → 10.0.0-beta.3

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

@@ -1,17 +1,18 @@
 import { Command } from '@heroku-cli/command';
 export default class RunInside extends Command {
     static description: string;
-    static example: string;
+    static strict: boolean;
+    static args: {
+        dyno_name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        command: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
     static flags: {
         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>;
         'exit-code': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         listen: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-launcher': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
-    static args: {
-        DYNO_NAME: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-        COMMAND: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-    };
-    static strict: boolean;
+    static examples: string[];
     run(): Promise<void>;
 }

package/lib/commands/run/inside.js

@@ -3,20 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const debug_1 = require("debug");
+const tsheredoc_1 = require("tsheredoc");
 const dyno_1 = require("../../lib/run/dyno");
 const helpers_1 = require("../../lib/run/helpers");
-const tsheredoc_1 = require("tsheredoc");
 const debug = (0, debug_1.default)('heroku:run:inside');
 class RunInside extends command_1.Command {
     async run() {
-        const { flags, args } = await this.parse(RunInside);
+        const { args, argv, flags } = await this.parse(RunInside);
+        const { dyno_name: dynoName } = args;
+        const { app: appName, 'exit-code': exitCode, listen, 'no-launcher': noLauncher } = flags;
+        const prependLauncher = !noLauncher;
+        const { body: app } = await this.heroku.get(`/apps/${appName}`, {
+            headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
+        });
+        const appStackIsCnb = app.stack.name === 'cnb';
         const opts = {
-            'exit-code': flags['exit-code'],
-            app: flags.app,
-            command: (0, helpers_1.buildCommand)([args.COMMAND]),
-            dyno: args.DYNO_NAME,
+            app: appName,
+            command: (0, helpers_1.buildCommand)(argv.slice(1), appStackIsCnb && prependLauncher),
+            dyno: dynoName,
+            'exit-code': exitCode,
             heroku: this.heroku,
-            listen: flags.listen,
+            listen,
         };
         const dyno = new dyno_1.default(opts);
         try {
@@ -34,23 +41,42 @@ class RunInside extends command_1.Command {
     }
 }
 exports.default = RunInside;
-RunInside.description = 'run a one-off process inside an existing heroku dyno (for Fir-generation apps only)';
-RunInside.example = (0, tsheredoc_1.default) `
-    Run bash
-      $ heroku run:inside web-848cd4f64d-pvpr2 bash
-    Run a command supplied by a script
-      $ heroku run:inside web-848cd4f64d-pvpr2 -- myscript.sh
-    Run a command declared for the worker process type in a Procfile
-      $ heroku run:inside worker
-    `;
+RunInside.description = 'run a command inside an existing dyno (for Fir-generation apps only)';
+RunInside.strict = false;
+RunInside.args = {
+    dyno_name: core_1.Args.string({
+        description: 'name of the dyno to run command inside',
+        required: true,
+    }),
+    command: core_1.Args.string({
+        description: 'command to run (Heroku automatically prepends ‘launcher’ to the command)',
+        required: true,
+    }),
+};
 RunInside.flags = {
     app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-    'exit-code': command_1.flags.boolean({ char: 'x', description: 'passthrough the exit code of the remote command' }),
+    'exit-code': command_1.flags.boolean({
+        char: 'x',
+        description: 'passthrough the exit code of the remote command',
+    }),
     listen: command_1.flags.boolean({ description: 'listen on a local port', hidden: true }),
+    'no-launcher': command_1.flags.boolean({
+        description: 'don’t prepend ‘launcher’ before a command',
+        default: false,
+    }),
+    remote: command_1.flags.remote(),
 };
-RunInside.args = {
-    DYNO_NAME: core_1.Args.string({ required: true, description: 'name of the dyno to run command inside' }),
-    COMMAND: core_1.Args.string({ required: true, description: 'command to run' }),
-};
-RunInside.strict = false;
+RunInside.examples = [
+    (0, tsheredoc_1.default) `
+      Run bash
+      heroku run:inside web-848cd4f64d-pvpr2 bash -a my-app
+    `,
+    (0, tsheredoc_1.default) `
+      Run a command supplied by a script taking option flags
+      heroku run:inside web-848cd4f64d-pvpr2 -a my-app -- myscript.sh -x --log-level=warn
+    `,
+    (0, tsheredoc_1.default) `
+      Run a command declared for the worker process type in a Procfile
+      heroku run:inside web-848cd4f64d-pvpr2 worker -a my-app
+    `,
+];

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

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

package/lib/lib/run/helpers.js

@@ -26,11 +26,12 @@ function revertSortedArgs(processArgs, argv) {
     return originalInputOrder;
 }
 exports.revertSortedArgs = revertSortedArgs;
-function buildCommand(args) {
+function buildCommand(args, prependLauncher = false) {
+    const prependText = prependLauncher ? 'launcher ' : '';
     if (args.length === 1) {
         // do not add quotes around arguments if there is only one argument
         // `heroku run "rake test"` should work like `heroku run rake test`
-        return args[0];
+        return `${prependText}${args[0]}`;
     }
     let cmd = '';
     for (let arg of args) {
@@ -39,7 +40,7 @@ function buildCommand(args) {
         }
         cmd = cmd + ' ' + arg;
     }
-    return cmd.trim();
+    return `${prependText}${cmd.trim()}`;
 }
 exports.buildCommand = buildCommand;
 function buildEnvFromFlag(flag) {