heroku 10.0.0-beta.0 → 10.0.0-beta.2

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

package/lib/commands/run/inside.js

@@ -5,18 +5,16 @@ const core_1 = require("@oclif/core");
 const debug_1 = require("debug");
 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, 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 { flags, args } = await this.parse(RunInside);
         const opts = {
             'exit-code': flags['exit-code'],
             app: flags.app,
-            command: (0, helpers_1.buildCommand)(argv.slice(1)),
-            dyno: argv[0],
+            command: (0, helpers_1.buildCommand)([args.COMMAND]),
+            dyno: args.DYNO_NAME,
             heroku: this.heroku,
             listen: flags.listen,
         };
@@ -36,15 +34,23 @@ 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 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.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' }),
     listen: command_1.flags.boolean({ description: 'listen on a local port', hidden: true }),
 };
+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;

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/oclif.manifest.json

@@ -5273,7 +5273,7 @@
       "aliases": [],
       "args": {},
       "description": "adds a git remote to an app repo\nextra arguments will be passed to git remote add\n",
-      "examples": "# set git remote heroku to https://git.heroku.com/example.git\n    $ heroku git:remote -a example\n\n    # set git remote heroku-staging to https://git.heroku.com/example.git\n    $ heroku git:remote --remote heroku-staging -a example",
+      "examples": "# set git remote heroku to https://git.heroku.com/example.git\n    $ heroku git:remote -a example\n\n    # set git remote heroku-staging to https://git.heroku.com/example.git\n    $ heroku git:remote --remote heroku-staging -a example-staging",
       "flags": {
         "app": {
           "char": "a",
@@ -5299,7 +5299,7 @@
       "pluginName": "heroku",
       "pluginType": "core",
       "strict": false,
-      "example": "# set git remote heroku to https://git.heroku.com/example.git\n    $ heroku git:remote -a example\n\n    # set git remote heroku-staging to https://git.heroku.com/example.git\n    $ heroku git:remote --remote heroku-staging -a example",
+      "example": "# set git remote heroku to https://git.heroku.com/example.git\n    $ heroku git:remote -a example\n\n    # set git remote heroku-staging to https://git.heroku.com/example.git\n    $ heroku git:remote --remote heroku-staging -a example-staging",
       "isESM": false,
       "relativePath": [
         "lib",
@@ -9329,11 +9329,20 @@
     },
     "run:inside": {
       "aliases": [],
-      "args": {},
-      "description": "run a one-off process inside an existing heroku dyno",
-      "examples": [
-        "$ heroku run:inside web.1 bash"
-      ],
+      "args": {
+        "DYNO_NAME": {
+          "description": "name of the dyno to run command inside",
+          "name": "DYNO_NAME",
+          "required": true
+        },
+        "COMMAND": {
+          "description": "command to run",
+          "name": "COMMAND",
+          "required": true
+        }
+      },
+      "description": "run a one-off process inside an existing heroku dyno (for Fir-generation apps only)",
+      "examples": "Run bash\n  $ heroku run:inside web-848cd4f64d-pvpr2 bash\nRun a command supplied by a script\n  $ heroku run:inside web-848cd4f64d-pvpr2 -- myscript.sh\nRun a command declared for the worker process type in a Procfile\n  $ heroku run:inside worker\n",
       "flags": {
         "app": {
           "char": "a",
@@ -9368,13 +9377,13 @@
         }
       },
       "hasDynamicHelp": false,
-      "hidden": true,
       "hiddenAliases": [],
       "id": "run:inside",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
       "strict": false,
+      "example": "Run bash\n  $ heroku run:inside web-848cd4f64d-pvpr2 bash\nRun a command supplied by a script\n  $ heroku run:inside web-848cd4f64d-pvpr2 -- myscript.sh\nRun a command declared for the worker process type in a Procfile\n  $ heroku run:inside worker\n",
       "isESM": false,
       "relativePath": [
         "lib",
@@ -9976,14 +9985,14 @@
     "telemetry:add": {
       "aliases": [],
       "args": {
-        "headers": {
-          "description": "custom headers to configure the drain in json format",
-          "name": "headers",
+        "endpoint": {
+          "description": "drain url",
+          "name": "endpoint",
           "required": true
         }
       },
       "description": "Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.",
-      "examples": "Add a telemetry drain to an app to collect logs and traces:\n$ 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\"}'\n",
+      "examples": "Add a telemetry drain to an app to collect logs and traces:\n$ 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\"}'\n",
       "flags": {
         "app": {
           "char": "a",
@@ -9993,6 +10002,13 @@
           "multiple": false,
           "type": "option"
         },
+        "headers": {
+          "description": "custom headers to configure the drain in json format",
+          "name": "headers",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "space": {
           "char": "s",
           "description": "space to add a drain to",
@@ -10009,18 +10025,10 @@
           "multiple": false,
           "type": "option"
         },
-        "endpoint": {
-          "description": "drain url",
-          "name": "endpoint",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "transport": {
           "description": "transport protocol for the drain",
           "name": "transport",
-          "required": true,
+          "default": "http",
           "hasDynamicHelp": false,
           "multiple": false,
           "options": [
@@ -10037,7 +10045,7 @@
       "pluginName": "heroku",
       "pluginType": "core",
       "strict": true,
-      "example": "Add a telemetry drain to an app to collect logs and traces:\n$ 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\"}'\n",
+      "example": "Add a telemetry drain to an app to collect logs and traces:\n$ 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\"}'\n",
       "isESM": false,
       "relativePath": [
         "lib",
@@ -10165,25 +10173,28 @@
           "description": "ID of the drain to update",
           "name": "telemetry_drain_id",
           "required": true
-        },
-        "headers": {
-          "description": "custom headers to configure the drain in json format",
-          "name": "headers"
         }
       },
       "description": "updates a telemetry drain with provided attributes (attributes not provided remain unchanged)",
       "examples": "$ heroku telemetry:update acde070d-8c4c-4f0d-9d8a-162843c10333 --signals logs,metrics --endpoint https://my-new-endpoint.com\n",
       "flags": {
-        "signals": {
-          "description": "comma-delimited list of signals to collect (traces, metrics, logs). Use \"all\" to collect all signals.",
-          "name": "signals",
+        "endpoint": {
+          "description": "drain url",
+          "name": "endpoint",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "endpoint": {
-          "description": "drain url",
-          "name": "endpoint",
+        "headers": {
+          "description": "custom headers to configure the drain in json format",
+          "name": "headers",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "signals": {
+          "description": "comma-delimited list of signals to collect (traces, metrics, logs). Use \"all\" to collect all signals.",
+          "name": "signals",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -14431,5 +14442,5 @@
       ]
     }
   },
-  "version": "10.0.0-beta.0"
+  "version": "10.0.0-beta.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.0.0-beta.0",
+  "version": "10.0.0-beta.2",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -390,5 +390,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "8cbc46ca8bde3e883aa79e267fdbd707124a2466"
+  "gitHead": "894a01c72314f33c1fa227a97c0e3fe09ebda4e6"
 }