heroku 9.3.2-beta.0 → 10.0.0-alpha.0

package/README.md

@@ -71,6 +71,7 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 * [`heroku spaces`](docs/spaces.md) - list available spaces
 * [`heroku status`](docs/status.md) - display current status of the Heroku platform
 * [`heroku teams`](docs/teams.md) - manage teams
+* [`heroku telemetry`](docs/telemetry.md) - list telemetry drains
 * [`heroku update`](docs/update.md) - update the Heroku CLI
 * [`heroku version`](docs/version.md)
 * [`heroku webhooks`](docs/webhooks.md) - list webhooks on an app

package/lib/commands/access/index.js

@@ -48,7 +48,7 @@ function buildCollaboratorsArray(collaboratorsRaw, admins) {
 class AccessIndex extends command_1.Command {
     async run() {
         var _a, _b;
-        const { flags, argv, args } = await this.parse(AccessIndex);
+        const { flags } = await this.parse(AccessIndex);
         const { app: appName, json } = flags;
         const { body: app } = await this.heroku.get(`/apps/${appName}`);
         let { body: collaborators } = await this.heroku.get(`/apps/${appName}/collaborators`);

package/lib/commands/apps/errors.js

@@ -37,7 +37,7 @@ const sumErrors = (errors) => {
 class Errors extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Errors);
-        const hours = Number.parseInt(flags.hours);
+        const hours = Number.parseInt(flags.hours, 10);
         const NOW = new Date().toISOString();
         const YESTERDAY = new Date(Date.now() - (hours * 60 * 60 * 1000)).toISOString();
         const DATE_QUERY = `start_time=${YESTERDAY}&end_time=${NOW}&step=1h`;

package/lib/commands/apps/favorites/add.js

@@ -9,7 +9,7 @@ class Add extends command_1.Command {
         const { app } = flags;
         core_1.ux.action.start(`Adding ${color_1.default.app(app)} to favorites`);
         const { body: favorites } = await this.heroku.get('/favorites?type=app', { hostname: 'particleboard.heroku.com' });
-        if (favorites.find(f => f.resource_name === app)) {
+        if (favorites.some(f => f.resource_name === app)) {
             throw new Error(`${color_1.default.app(app)} is already a favorite app.`);
         }
         try {

package/lib/commands/buildpacks/add.js

@@ -17,7 +17,7 @@ class Add extends command_1.Command {
             spliceIndex = buildpacks.length;
         }
         else {
-            // eslint-disable-next-line unicorn/no-array-callback-reference, unicorn/no-array-method-this-argument
+            // eslint-disable-next-line unicorn/no-array-method-this-argument
             const foundIndex = buildpackCommand.findIndex(buildpacks, flags.index);
             spliceIndex = (foundIndex === -1) ? buildpacks.length : foundIndex;
         }

package/lib/commands/buildpacks/info.js

@@ -9,7 +9,7 @@ class Info extends command_1.Command {
         const { args } = await this.parse(Info);
         const registry = new buildpack_registry_1.BuildpackRegistry();
         true_myth_1.Result.match({
-            Ok: _ => { },
+            Ok: () => { },
             Err: err => {
                 this.error(`Could not publish the buildpack.\n${err}`);
             },

package/lib/commands/buildpacks/set.js

@@ -17,7 +17,7 @@ class Set extends command_1.Command {
             spliceIndex = 0;
         }
         else {
-            // eslint-disable-next-line unicorn/no-array-callback-reference, unicorn/no-array-method-this-argument
+            // eslint-disable-next-line unicorn/no-array-method-this-argument
             const foundIndex = buildpackCommand.findIndex(buildpacks, flags.index);
             spliceIndex = (foundIndex === -1) ? buildpacks.length : foundIndex;
         }

package/lib/commands/buildpacks/versions.js

@@ -13,7 +13,7 @@ class Versions extends command_1.Command {
         }
         const registry = new buildpack_registry_1.BuildpackRegistry();
         true_myth_1.Result.match({
-            Ok: _ => { },
+            Ok: () => { },
             Err: err => {
                 this.error(`Could not find the buildpack.\n${err}`);
             },

package/lib/commands/logs.d.ts

@@ -4,13 +4,15 @@ export default class Logs extends Command {
     static examples: 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>;
+        dyno: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'force-colors': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-color': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         num: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         ps: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dyno: 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>;
         source: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         tail: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'force-colors': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        type: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/logs.js

@@ -1,45 +1,84 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-// tslint:disable:file-name-casing
 const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const completions_1 = require("@heroku-cli/command/lib/completions");
 const log_displayer_1 = require("../lib/run/log-displayer");
+const tsheredoc_1 = require("tsheredoc");
 class Logs extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Logs);
-        color_1.default.enabled = flags['force-colors'] || color_1.default.enabled;
+        const { app, dyno, 'force-colors': forceColors, num, ps, source, tail, type } = flags;
+        if (forceColors)
+            color_1.default.enabled = true;
         await (0, log_displayer_1.default)(this.heroku, {
-            app: flags.app,
-            // @ts-ignore
-            dyno: flags.dyno || flags.ps,
-            lines: flags.num || 100,
-            tail: flags.tail,
-            source: flags.source,
+            app,
+            dyno,
+            lines: num || 100,
+            source,
+            tail,
+            type: type || ps,
         });
     }
 }
 exports.default = Logs;
-Logs.description = `display recent log output
-disable colors with --no-color, HEROKU_LOGS_COLOR=0, or HEROKU_COLOR=0`;
+Logs.description = (0, tsheredoc_1.default) `
+    display recent log output
+    disable colors with --no-color, HEROKU_LOGS_COLOR=0, or HEROKU_COLOR=0
+  `;
 Logs.examples = [
-    '$ heroku logs --app=my-app',
-    '$ heroku logs --num=50',
-    '$ heroku logs --dyno=web --app=my-app',
-    '$ heroku logs --app=my-app --tail',
+    'heroku logs --app=my-app',
+    'heroku logs --num=50 --app=my-app',
+    'heroku logs --dyno=web-123-456 --app=my-app',
+    'heroku logs --type=web --app=my-app',
+    'heroku logs --app=my-app --tail',
 ];
 Logs.flags = {
     app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-    num: command_1.flags.integer({ char: 'n', description: 'number of lines to display' }),
-    ps: command_1.flags.string({ char: 'p', description: 'hidden alias for dyno', hidden: true }),
     dyno: command_1.flags.string({
         char: 'd',
-        description: 'only show output from this dyno type (such as "web" or "worker")',
+        description: 'only show output from this dyno (such as "web-123-456" or "worker.2")',
+    }),
+    'force-colors': command_1.flags.boolean({
+        description: 'force use of colors (even on non-tty output)',
+    }),
+    // supports-color NPM package will parse ARGV looking for flag `--no-color`, but
+    // we need to define it here for OClif not to error out on an inexistent flag.
+    'no-color': command_1.flags.boolean({
+        default: false,
+        hidden: true,
+        relationships: [
+            { type: 'none', flags: ['force-colors'] },
+        ],
+    }),
+    num: command_1.flags.integer({
+        char: 'n',
+        description: 'number of lines to display (ignored for Fir generation apps)',
+    }),
+    ps: command_1.flags.string({
+        char: 'p',
+        hidden: true,
+        description: 'hidden alias for type',
+        relationships: [
+            { type: 'none', flags: ['dyno'] },
+        ],
+        completion: completions_1.ProcessTypeCompletion,
+    }),
+    remote: command_1.flags.remote(),
+    source: command_1.flags.string({
+        char: 's',
+        description: 'only show output from this source (such as "app" or "heroku")',
+    }),
+    tail: command_1.flags.boolean({
+        char: 't',
+        default: false,
+        description: 'continually stream logs (defaults to true for Fir generation apps)',
+    }),
+    type: command_1.flags.string({
+        description: 'only show output from this process type (such as "web" or "worker")',
+        relationships: [
+            { type: 'none', flags: ['dyno', 'ps'] },
+        ],
         completion: completions_1.ProcessTypeCompletion,
     }),
-    source: command_1.flags.string({ char: 's', description: 'only show output from this source (such as "app" or "heroku")' }),
-    tail: command_1.flags.boolean({ char: 't', description: 'continually stream logs' }),
-    'force-colors': command_1.flags.boolean({ description: 'force use of colors (even on non-tty output)' }),
 };

package/lib/commands/members/index.js

@@ -29,7 +29,7 @@ class MembersIndex extends command_1.Command {
         let teamInvites = [];
         if (teamInfo.type === 'team') {
             const { body: orgFeatures } = await this.heroku.get(`/teams/${team}/features`);
-            if (orgFeatures.find((feature => feature.name === 'team-invite-acceptance' && feature.enabled))) {
+            if (orgFeatures.some((feature => feature.name === 'team-invite-acceptance' && feature.enabled))) {
                 const invitesResponse = await this.heroku.get(`/teams/${team}/invitations`, { headers: {
                         Accept: 'application/vnd.heroku+json; version=3.team-invitations',
                     },

package/lib/commands/orgs/open.js

@@ -10,7 +10,7 @@ class OrgsOpen extends command_1.Command {
         await open(url);
     }
     async run() {
-        const { flags, argv, args } = await this.parse(OrgsOpen);
+        const { flags } = await this.parse(OrgsOpen);
         const team = flags.team;
         const { body: org } = await this.heroku.get(`/teams/${team}`);
         await OrgsOpen.openUrl(`https://dashboard.heroku.com/teams/${org.name}`);

package/lib/commands/pg/copy.js

@@ -38,7 +38,7 @@ class Copy extends command_1.Command {
         const { flags, args } = await this.parse(Copy);
         const { 'wait-interval': waitInterval, verbose, confirm, app } = flags;
         const pgbackups = (0, backups_1.default)(app, this.heroku);
-        const interval = Math.max(3, Number.parseInt(waitInterval || '0')) || 3;
+        const interval = Math.max(3, Number.parseInt(waitInterval || '0', 10)) || 3;
         const [source, target] = await Promise.all([getAttachmentInfo(this.heroku, args.source, app), getAttachmentInfo(this.heroku, args.target, app)]);
         if (source.url === target.url)
             throw new Error('Cannot copy database onto itself');

package/lib/commands/pipelines/promote.js

@@ -35,7 +35,7 @@ function isFailed(promotionTarget) {
 }
 function pollPromotionStatus(heroku, id, needsReleaseCommand) {
     return heroku.get(`/pipeline-promotions/${id}/promotion-targets`).then(function ({ body: targets }) {
-        if (targets.every(isComplete)) { // eslint-disable-line unicorn/no-array-callback-reference
+        if (targets.every(isComplete)) {
             return targets;
         }
         //
@@ -98,7 +98,7 @@ async function getRelease(heroku, app, releaseId) {
     return release;
 }
 async function streamReleaseCommand(heroku, targets, promotion) {
-    if (targets.length !== 1 || targets.every(isComplete)) { // eslint-disable-line unicorn/no-array-callback-reference
+    if (targets.length !== 1 || targets.every(isComplete)) {
         return pollPromotionStatus(heroku, promotion.id, false);
     }
     const target = targets[0];
@@ -190,7 +190,7 @@ class Promote extends command_1.Command {
             memo[app.name] = details;
             return memo;
         }, {});
-        if (promotionTargets.every(isSucceeded)) { // eslint-disable-line unicorn/no-array-callback-reference
+        if (promotionTargets.every(isSucceeded)) {
             core_1.ux.log('\nPromotion successful');
         }
         else {

package/lib/commands/ps/type.js

@@ -51,7 +51,6 @@ const displayFormation = async (heroku, app) => {
         }
         return {
             // this rule does not realize `size` isn't used on an array
-            /* eslint-disable unicorn/explicit-length-check */
             type: color_1.default.green(d.type || ''),
             size: color_1.default.cyan(d.size),
             qty: color_1.default.yellow(`${d.quantity}`),
@@ -99,12 +98,12 @@ class Type extends command_1.Command {
             if (!argv || argv.length === 0)
                 return [];
             const { body: formation } = await this.heroku.get(`/apps/${app}/formation`);
-            if (argv.find(a => a.match(/=/))) {
+            if (argv.some(a => a.match(/=/))) {
                 return (0, lodash_1.compact)(argv.map(arg => {
                     const match = arg.match(/^([a-zA-Z0-9_]+)=([\w-]+)$/);
                     const type = match && match[1];
                     const size = match && match[2];
-                    if (!type || !size || !formation.find(p => p.type === type)) {
+                    if (!type || !size || !formation.some(p => p.type === type)) {
                         throw new Error(`Type ${color_1.default.red(type || '')} not found in process formation.\nTypes: ${color_1.default.yellow(formation.map(f => f.type)
                             .join(', '))}`);
                     }

package/lib/commands/spaces/create.d.ts

@@ -4,15 +4,15 @@ export default class Create extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         channel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        region: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        features: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'log-drain-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        shield: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         cidr: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'kpi-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'data-cidr': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        generation: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'kpi-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'log-drain-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        region: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        shield: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         team: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {

package/lib/commands/spaces/create.js

@@ -6,11 +6,10 @@ const core_1 = require("@oclif/core");
 const tsheredoc_1 = require("tsheredoc");
 const spaces_1 = require("../../lib/spaces/spaces");
 const completions_1 = require("../../lib/autocomplete/completions");
-const parsers_1 = require("../../lib/spaces/parsers");
 class Create extends command_1.Command {
     async run() {
         const { flags, args } = await this.parse(Create);
-        const { channel, region, features, 'log-drain-url': logDrainUrl, shield, cidr, 'kpi-url': kpiUrl, 'data-cidr': dataCidr, team } = flags;
+        const { channel, region, features, generation, 'log-drain-url': logDrainUrl, shield, cidr, 'kpi-url': kpiUrl, 'data-cidr': dataCidr, team } = flags;
         const spaceName = flags.space || args.space;
         if (!spaceName) {
             core_1.ux.error((0, tsheredoc_1.default) `
@@ -23,9 +22,21 @@ class Create extends command_1.Command {
         const spaceType = shield ? 'Shield' : 'Standard';
         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: {
+                Accept: 'application/vnd.heroku+json; version=3.sdk',
+            },
             body: {
-                name: spaceName, team: team, channel_name: channel, region: region, features: (0, parsers_1.splitCsv)(features),
-                log_drain_url: logDrainUrl, shield, cidr, kpi_url: kpiUrl, data_cidr: dataCidr,
+                channel_name: channel,
+                cidr,
+                data_cidr: dataCidr,
+                // features: splitCsv(features),
+                generation,
+                kpi_url: kpiUrl,
+                log_drain_url: logDrainUrl,
+                name: spaceName,
+                region,
+                shield,
+                team,
             },
         });
         core_1.ux.action.stop();
@@ -33,8 +44,8 @@ class Create extends command_1.Command {
         core_1.ux.warn(`Use ${color_1.default.cmd('heroku spaces:wait')} to track allocation.`);
         core_1.ux.styledHeader(space.name);
         core_1.ux.styledObject({
-            ID: space.id, Team: space.team.name, Region: space.region.name, CIDR: space.cidr, 'Data CIDR': space.data_cidr, State: space.state, Shield: (0, spaces_1.displayShieldState)(space), 'Created at': space.created_at,
-        }, ['ID', 'Team', 'Region', 'CIDR', 'Data CIDR', 'State', 'Shield', 'Created at']);
+            ID: space.id, Team: space.team.name, Region: space.region.name, CIDR: space.cidr, 'Data CIDR': space.data_cidr, State: space.state, Shield: (0, spaces_1.displayShieldState)(space), Generation: space.generation, 'Created at': space.created_at,
+        }, ['ID', 'Team', 'Region', 'CIDR', 'Data CIDR', 'State', 'Shield', 'Generation', 'Created at']);
     }
 }
 exports.default = Create;
@@ -57,15 +68,16 @@ Create.examples = [(0, tsheredoc_1.default) `
     Created at: 2016-01-06T03:23:13Z
   `];
 Create.flags = {
-    space: command_1.flags.string({ char: 's', description: 'name of space to create' }),
     channel: command_1.flags.string({ hidden: true }),
-    region: command_1.flags.string({ description: 'region name', completion: completions_1.RegionCompletion }),
-    features: command_1.flags.string({ hidden: true, description: 'a list of features separated by commas' }),
-    'log-drain-url': command_1.flags.string({ hidden: true, description: 'direct log drain url' }),
-    shield: command_1.flags.boolean({ hidden: true, description: 'create a Shield space' }),
     cidr: command_1.flags.string({ description: 'RFC-1918 CIDR the space will use' }),
-    'kpi-url': command_1.flags.string({ hidden: true, description: 'self-managed KPI endpoint to use' }),
     'data-cidr': command_1.flags.string({ description: 'RFC-1918 CIDR used by Heroku Data resources for the space' }),
+    // features: flags.string({hidden: true, description: 'a list of features separated by commas'}),
+    generation: command_1.flags.string({ description: 'generation for space', default: 'cedar', options: ['cedar', 'fir'] }),
+    'kpi-url': command_1.flags.string({ hidden: true, description: 'self-managed KPI endpoint to use' }),
+    'log-drain-url': command_1.flags.string({ hidden: true, description: 'direct log drain url' }),
+    region: command_1.flags.string({ description: 'region name', completion: completions_1.RegionCompletion }),
+    shield: command_1.flags.boolean({ hidden: true, description: 'create a Shield space' }),
+    space: command_1.flags.string({ char: 's', description: 'name of space to create' }),
     team: command_1.flags.team({ required: true }),
 };
 Create.args = {

package/lib/commands/spaces/index.d.ts

@@ -1,6 +1,6 @@
 import { Command } from '@heroku-cli/command';
-import * as Heroku from '@heroku-cli/schema';
-declare type SpaceArray = Array<Required<Heroku.Space>>;
+import { Space } from '../../lib/types/fir';
+declare type SpaceArray = Array<Required<Space>>;
 export default class Index extends Command {
     static topic: string;
     static description: string;

package/lib/commands/spaces/index.js

@@ -7,7 +7,11 @@ class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
         const { team, json } = flags;
-        let { body: spaces } = await this.heroku.get('/spaces');
+        let { body: spaces } = await this.heroku.get('/spaces', {
+            headers: {
+                Accept: 'application/vnd.heroku+json; version=3.sdk',
+            },
+        });
         if (team) {
             spaces = spaces.filter(s => s.team.name === team);
         }
@@ -39,6 +43,7 @@ class Index extends command_1.Command {
             Team: { get: space => space.team.name },
             Region: { get: space => space.region.name },
             State: { get: space => space.state },
+            Generation: { get: space => space.generation },
             createdAt: {
                 header: 'Created At',
                 get: space => space.created_at,

package/lib/commands/spaces/info.js

@@ -17,14 +17,16 @@ class Info extends command_1.Command {
         See more help with --help
       `));
         }
-        let headers = {};
+        const headers = {
+            Accept: 'application/vnd.heroku+json; version=3.fir',
+        };
         if (!flags.json) {
-            headers = { 'Accept-Expansion': 'region' };
+            headers['Accept-Expansion'] = 'region';
         }
         const { body: space } = await this.heroku.get(`/spaces/${spaceName}`, { headers });
         if (space.state === 'allocated') {
             try {
-                const { body: outbound_ips } = await this.heroku.get(`/spaces/${spaceName}/nat`);
+                const { body: outbound_ips } = await this.heroku.get(`/spaces/${spaceName}/nat`, { headers: { Accept: 'application/vnd.heroku+json; version=3.fir' } });
                 space.outbound_ips = outbound_ips;
             }
             catch (error) {

package/lib/commands/spaces/wait.js

@@ -25,9 +25,11 @@ class Wait extends command_1.Command {
         const deadline = new Date(Date.now() + timeout);
         const action = new spinner_1.default();
         action.start(`Waiting for space ${color_1.default.green(spaceName)} to allocate`);
-        let headers = {};
+        const headers = {
+            Accept: 'application/vnd.heroku+json; version=3.fir',
+        };
         if (!flags.json) {
-            headers = { 'Accept-Expansion': 'region' };
+            headers['Accept-Expansion'] = 'region';
         }
         let { body: space } = await this.heroku.get(`/spaces/${spaceName}`, { headers });
         while (space.state === 'allocating') {
@@ -39,7 +41,7 @@ class Wait extends command_1.Command {
             space = updatedSpace;
         }
         try {
-            const { body: nat } = await this.heroku.get(`/spaces/${spaceName}/nat`);
+            const { body: nat } = await this.heroku.get(`/spaces/${spaceName}/nat`, { headers: { Accept: 'application/vnd.heroku+json; version=3.fir' } });
             space.outbound_ips = nat;
         }
         catch (error) {

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

@@ -0,0 +1,18 @@
+import { Command } from '@heroku-cli/command';
+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>;
+        remote: 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>>;
+    };
+    static example: string;
+    private getTypeAndName;
+    run(): Promise<void>;
+}

package/lib/commands/telemetry/add.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const tsheredoc_1 = require("tsheredoc");
+const util_1 = require("../../lib/telemetry/util");
+class Add extends command_1.Command {
+    constructor() {
+        super(...arguments);
+        this.getTypeAndName = function (app, space) {
+            if (app) {
+                return { type: 'app', name: app };
+            }
+            return { type: 'space', name: space };
+        };
+    }
+    async run() {
+        const { flags, args } = await this.parse(Add);
+        const { app, space, signals, endpoint, transport } = flags;
+        const { headers } = args;
+        const typeAndName = this.getTypeAndName(app, space);
+        const drainConfig = {
+            owner: {
+                type: typeAndName.type,
+                id: typeAndName.name,
+            },
+            signals: (0, util_1.validateAndFormatSignals)(signals),
+            exporter: {
+                endpoint,
+                type: `otlp${transport}`,
+                headers: JSON.parse(headers),
+            },
+        };
+        if (app) {
+            const { body: drain } = await this.heroku.post(`/apps/${app}/telemetry-drains`, {
+                body: drainConfig,
+                headers: {
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            core_1.ux.log(`successfully added drain ${drain.exporter.endpoint}`);
+        }
+        else if (space) {
+            const { body: drain } = await this.heroku.post(`/spaces/${space}/telemetry-drains`, {
+                body: drainConfig,
+                headers: {
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            core_1.ux.log(`successfully added drain ${drain.exporter.endpoint}`);
+        }
+    }
+}
+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.app({ exactlyOne: ['app', 'remote', 'space'], description: 'app to add a drain to' }),
+    remote: command_1.flags.remote({ description: 'git remote of app to add a drain to' }),
+    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' }),
+};
+Add.args = {
+    headers: core_1.Args.string({ required: true, description: 'custom headers to configure the drain in json format' }),
+};
+Add.example = (0, tsheredoc_1.default)(`
+    Add a telemetry drain to an app to collect logs and traces:
+    $ heroku telemetry:add --signals logs,traces --endpoint https://my-endpoint.com --transport http 'x-drain-example-team: API_KEY x-drain-example-dataset: METRICS_DATASET'
+  `);

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

@@ -0,0 +1,13 @@
+import { Command } from '@heroku-cli/command';
+import { TelemetryDrains } from '../../lib/types/telemetry';
+export default class Index extends Command {
+    static topic: string;
+    static description: string;
+    static flags: {
+        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static example: string;
+    run(): Promise<void>;
+    protected display(telemetryDrains: TelemetryDrains, ownerType: 'App' | 'Space'): void;
+}

package/lib/commands/telemetry/index.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+class Index extends command_1.Command {
+    async run() {
+        const { flags } = await this.parse(Index);
+        const { app, space } = flags;
+        if (app) {
+            const { body: appTelemetryDrains } = await this.heroku.get(`/apps/${app}/telemetry-drains`, {
+                headers: {
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            this.display(appTelemetryDrains, 'App');
+        }
+        else if (space) {
+            const { body: spaceTelemetryDrains } = await this.heroku.get(`/spaces/${space}/telemetry-drains`, {
+                headers: {
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            this.display(spaceTelemetryDrains, 'Space');
+        }
+    }
+    display(telemetryDrains, ownerType) {
+        core_1.ux.styledHeader(`${ownerType} Telemetry Drains`);
+        core_1.ux.table(telemetryDrains, {
+            ID: { get: telemetryDrain => telemetryDrain.id },
+            Signals: { get: telemetryDrain => telemetryDrain.signals },
+            Endpoint: { get: telemetryDrain => telemetryDrain.exporter.endpoint },
+            [ownerType]: { get: telemetryDrain => telemetryDrain.owner.name },
+        });
+    }
+}
+exports.default = Index;
+Index.topic = 'telemetry';
+Index.description = 'list telemetry drains';
+Index.flags = {
+    space: command_1.flags.string({ char: 's', description: 'filter by space name', exactlyOne: ['app', 'space'] }),
+    app: command_1.flags.app({ description: 'filter by app name' }),
+};
+Index.example = '$ heroku telemetry';

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

@@ -0,0 +1,10 @@
+import { Command } from '@heroku-cli/command';
+export default class Info extends Command {
+    static topic: string;
+    static description: string;
+    static args: {
+        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    static example: string;
+    run(): Promise<void>;
+}