heroku 10.0.0-beta.2 → 10.0.0-beta.4

package/lib/commands/addons/create.js

@@ -56,19 +56,11 @@ class Create extends command_1.Command {
             process.stderr.write(` ${color_1.default.yellow('›')}   See https://devcenter.heroku.com/changelog-items/2925 for more info.\n`);
         }
         if (isInferenceAddon) {
-            core_1.ux.warn('\n\nThis pilot feature is a Beta Service. You may opt to try such Beta Service in your sole discretion. ' +
-                'Any use of the Beta Service is subject to the applicable Beta Services Terms provided at ' +
-                'https://www.salesforce.com/company/legal/customer-agreements/. While use of the pilot feature itself is free, ' +
-                'to the extent such use consumes a generally available Service, you may be charged for that consumption as set ' +
-                'forth in the Documentation. Your continued use of this pilot feature constitutes your acceptance of the foregoing.\n\n' +
-                'For clarity and without limitation, the various third-party machine learning and generative artificial intelligence ' +
-                '(AI) models and applications (each a “Platform”) integrated with the Beta Service are Non-SFDC Applications, ' +
-                'as that term is defined in the Beta Services Terms. Note that these third-party Platforms include features that use ' +
-                'generative AI technology. Due to the nature of generative AI, the output that a Platform generates may be ' +
-                'unpredictable, and may include inaccurate or harmful responses. Before using any generative AI output, Customer is ' +
-                'solely responsible for reviewing the output for accuracy, safety, and compliance with applicable laws and third-party ' +
-                'acceptable use policies. In addition, Customer’s use of each Platform may be subject to the Platform’s own terms and ' +
-                'conditions, compliance with which Customer is solely responsible.\n');
+            core_1.ux.warn((0, tsheredoc_1.default) `
+      Heroku Managed Inference and Agent is a pilot or beta service that is subject to the Beta Services Terms at https://www.salesforce.com/company/legal/customer-agreements/ or a written Unified Pilot Agreement if executed by Customer, and the Non-GA Gen AI and Non-GA Credit Consumption terms in the Product Terms Directory at https://ptd.salesforce.com. While use of this pilot or beta service is itself free, such use may consume GA Heroku credits and/or resources for which the Customer may have paid or be charged. Use of this pilot or beta is at the Customer's sole discretion.
+
+      For clarity and without limitation, the various third-party machine learning and generative artificial intelligence (AI) models and applications (each a “Platform”) integrated with the Beta Service are Non-SFDC Applications, as that term is defined in the Beta Services Terms. Note that these third-party Platforms include features that use generative AI technology. Due to the nature of generative AI, the output that a Platform generates may be unpredictable, and may include inaccurate or harmful responses. Before using any generative AI output, Customer is solely responsible for reviewing the output for accuracy, safety, and compliance with applicable laws and third-party acceptable use policies. In addition, Customer’s use of each Platform may be subject to the Platform’s own terms and conditions, compliance with which Customer is solely responsible.
+    `);
         }
         const config = parseConfig(argv);
         let addon;

package/lib/commands/apps/info.js

@@ -62,7 +62,8 @@ 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 });
-    data['Slug Size'] = (0, filesize_1.filesize)(info.app.slug_size, { standard: 'jedec', round: 0 });
+    if (info.app.generation.name !== '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;
     data.Dynos = countBy(info.dynos, 'type');
@@ -115,7 +116,8 @@ 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 }));
-            print('slug_size', (0, filesize_1.filesize)(info.app.slug_size, { standard: 'jedec', round: 0 }));
+            if (info.app.generation.name !== '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);
             print('dynos', util.inspect(countBy(info.dynos, 'type')));

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/dyno.js

@@ -206,6 +206,7 @@ class Dyno extends stream_1.Duplex {
         });
     }
     _handle(localServer) {
+        var _a;
         const addr = localServer.address();
         const host = addr.address;
         const port = addr.port;
@@ -235,13 +236,26 @@ class Dyno extends stream_1.Duplex {
                 sshProc.stdout.setEncoding('utf8');
                 sshProc.stdout.on('data', this._readData());
             }
-            // @ts-ignore
-            sshProc.stderr.on('data', data => {
-                lastErr = data;
+            (_a = sshProc.stderr) === null || _a === void 0 ? void 0 : _a.on('data', data => {
+                var _a;
+                lastErr = data.toString();
                 // suppress host key and permission denied messages
-                if (this._isDebug() || (data.includes("Warning: Permanently added '[127.0.0.1]") && data.includes('Permission denied (publickey).'))) {
+                const messages = [
+                    "Warning: Permanently added '[127.0.0.1]"
+                ];
+                const killMessages = [
+                    'too many authentication failures',
+                    'No more authentication methods to try',
+                    'Permission denied (publickey).',
+                ];
+                if (this._isDebug() || [...killMessages, ...messages].some(message => data.includes(message))) {
                     process.stderr.write(data);
                 }
+                if (killMessages.some(message => data.includes(message))) {
+                    sshProc.kill();
+                    localServer.close();
+                    (_a = this.reject) === null || _a === void 0 ? void 0 : _a.call(this, lastErr);
+                }
             });
             sshProc.on('close', () => {
                 // there was a problem connecting with the ssh key

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) {

package/lib/lib/spaces/spaces.js

@@ -30,7 +30,7 @@ function renderInfo(space, json) {
             State: space.state,
             Shield: displayShieldState(space),
             'Outbound IPs': displayNat(space.outbound_ips),
-            Generation: space.generation,
+            Generation: space.generation.name,
             'Created at': space.created_at,
         }, ['ID', 'Team', 'Region', 'CIDR', 'Data CIDR', 'State', 'Shield', 'Outbound IPs', 'Generation', 'Created at']);
     }