heroku 10.0.0-beta.0 → 10.0.0-beta.3

package/lib/commands/git/remote.js

@@ -36,7 +36,7 @@ GitRemote.example = `# set git remote heroku to https://git.heroku.com/example.g
     $ heroku git:remote -a example
 
     # set git remote heroku-staging to https://git.heroku.com/example.git
-    $ heroku git:remote --remote heroku-staging -a example`;
+    $ heroku git:remote --remote heroku-staging -a example-staging`;
 GitRemote.flags = {
     app: command_1.flags.string({ char: 'a', description: 'the Heroku app to use' }),
     remote: command_1.flags.string({ char: 'r', description: 'the git remote to create' }),

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

@@ -1,14 +1,18 @@
 import { Command } from '@heroku-cli/command';
 export default class RunInside extends Command {
     static description: string;
-    static hidden: boolean;
-    static examples: 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 strict: boolean;
+    static examples: string[];
     run(): Promise<void>;
 }

package/lib/commands/run/inside.js

@@ -3,22 +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 debug = (0, debug_1.default)('heroku:run:inside');
 class RunInside extends command_1.Command {
     async run() {
-        const { flags, argv } = await this.parse(RunInside);
-        if (argv.length < 2) {
-            throw new Error('Usage: heroku run:inside DYNO COMMAND\n\nExample: heroku run:inside web.1 bash');
-        }
+        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)(argv.slice(1)),
-            dyno: argv[0],
+            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 {
@@ -36,15 +41,42 @@ class RunInside extends command_1.Command {
     }
 }
 exports.default = RunInside;
-RunInside.description = 'run a one-off process inside an existing heroku dyno';
-RunInside.hidden = true;
-RunInside.examples = [
-    '$ heroku run:inside web.1 bash',
-];
+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.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/commands/spaces/create.js

@@ -21,6 +21,20 @@ class Create extends command_1.Command {
         const dollarAmountMonthly = shield ? '$3000' : '$1000';
         const dollarAmountHourly = shield ? '$4.17' : '$1.39';
         const spaceType = shield ? 'Shield' : 'Standard';
+        if (generation === 'fir') {
+            core_1.ux.warn((0, tsheredoc_1.default) `
+        Fir Pilot Features
+        Fir is currently a pilot service that is subject to the Beta Services Terms
+        (https://www.salesforce.com/company/legal/) or a written Unified Pilot Agreement
+        if executed by Customer, and applicable terms in the Product Terms Directory
+        (https://ptd.salesforce.com/?_ga=2.247987783.1372150065.1709219475-629000709.1639001992).
+        Use of this pilot or beta service is at the Customer's sole discretion.
+
+        Please note that we’re actively developing and adding new features, and not all
+        existing features are currently available. See the Dev Center
+        (https://devcenter.heroku.com/articles/generations) for more info.
+      `);
+        }
         core_1.ux.action.start(`Creating space ${color_1.default.green(spaceName)} in team ${color_1.default.cyan(team)}`);
         const { body: space } = await this.heroku.post('/spaces', {
             headers: {

package/lib/commands/telemetry/add.d.ts

@@ -3,13 +3,13 @@ export default class Add extends Command {
     static description: string;
     static flags: {
         app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        headers: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         signals: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        endpoint: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         transport: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
-        headers: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        endpoint: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/add.js

@@ -7,8 +7,8 @@ const util_1 = require("../../lib/telemetry/util");
 class Add extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Add);
-        const { app, space, signals, endpoint, transport } = flags;
-        const { headers } = args;
+        const { app, headers, space, signals, transport } = flags;
+        const { endpoint } = args;
         let id;
         if (app) {
             const { body: herokuApp } = await this.heroku.get(`/apps/${app}`, {
@@ -20,6 +20,7 @@ class Add extends command_1.Command {
             const { body: herokuSpace } = await this.heroku.get(`/spaces/${space}`);
             id = herokuSpace.id;
         }
+        const exporterHeaders = headers || '{}';
         const drainConfig = {
             owner: {
                 type: app ? 'app' : 'space',
@@ -29,7 +30,7 @@ class Add extends command_1.Command {
             exporter: {
                 endpoint,
                 type: `otlp${transport}`,
-                headers: JSON.parse(headers),
+                headers: JSON.parse(exporterHeaders),
             },
         };
         const { body: drain } = await this.heroku.post('/telemetry-drains', {
@@ -45,15 +46,15 @@ exports.default = Add;
 Add.description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
 Add.flags = {
     app: command_1.flags.string({ char: 'a', exactlyOne: ['app', 'space'], description: 'app to add a drain to' }),
+    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
     space: command_1.flags.string({ char: 's', description: 'space to add a drain to' }),
     signals: command_1.flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    endpoint: command_1.flags.string({ required: true, description: 'drain url' }),
-    transport: command_1.flags.string({ required: true, options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    transport: command_1.flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
 };
 Add.args = {
-    headers: core_1.Args.string({ required: true, description: 'custom headers to configure the drain in json format' }),
+    endpoint: core_1.Args.string({ required: true, description: 'drain url' }),
 };
 Add.example = (0, tsheredoc_1.default)(`
     Add a telemetry drain to an app to collect logs and traces:
-    $ heroku telemetry:add --app myapp --signals logs,traces --endpoint https://my-endpoint.com --transport http '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
+    $ heroku telemetry:add https://my-endpoint.com --app myapp --signals logs,traces --headers '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
   `);

package/lib/commands/telemetry/update.d.ts

@@ -4,11 +4,11 @@ export default class Update extends Command {
     static description: string;
     static args: {
         telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-        headers: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     static flags: {
-        signals: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         endpoint: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        headers: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        signals: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         transport: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static example: string;

package/lib/commands/telemetry/update.js

@@ -7,9 +7,9 @@ const util_1 = require("../../lib/telemetry/util");
 class Update extends command_1.Command {
     async run() {
         const { args, flags } = await this.parse(Update);
-        const { telemetry_drain_id, headers } = args;
-        const { signals, endpoint, transport } = flags;
-        if (!(headers || signals || endpoint || transport)) {
+        const { telemetry_drain_id } = args;
+        const { endpoint, headers, signals, transport } = flags;
+        if (!(endpoint || headers || signals || transport)) {
             core_1.ux.error((0, tsheredoc_1.default)(`
         Requires either --signals, --endpoint, --transport or HEADERS to be provided.
         See more help with --help
@@ -48,11 +48,11 @@ Update.topic = 'telemetry';
 Update.description = 'updates a telemetry drain with provided attributes (attributes not provided remain unchanged)';
 Update.args = {
     telemetry_drain_id: core_1.Args.string({ required: true, description: 'ID of the drain to update' }),
-    headers: core_1.Args.string({ description: 'custom headers to configure the drain in json format' }),
 };
 Update.flags = {
-    signals: command_1.flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
     endpoint: command_1.flags.string({ description: 'drain url' }),
+    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
+    signals: command_1.flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
     transport: command_1.flags.string({ options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
 };
 Update.example = (0, tsheredoc_1.default)(`

package/lib/global_telemetry.js

@@ -43,7 +43,7 @@ const provider = new NodeTracerProvider({
 });
 const headers = { Authorization: `Bearer ${process.env.IS_HEROKU_TEST_ENV !== 'true' ? getToken() : ''}` };
 const exporter = new OTLPTraceExporter({
-    url: isDev ? 'https://backboard-staging.herokuapp.com/otel/v1/traces' : 'https://backboard.heroku.com/otel/v1/traces',
+    url: isDev ? 'https://backboard.staging.herokudev.com/otel/v1/traces' : 'https://backboard.heroku.com/otel/v1/traces',
     headers,
     compression: 'none',
 });

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