heroku 10.0.0-alpha.2 → 10.0.0-beta.2

package/lib/commands/addons/create.js

@@ -49,10 +49,27 @@ class Create extends command_1.Command {
         const argv = restParse.argv
             // oclif duplicates specified args in argv
             .filter(arg => arg !== servicePlan);
+        const inferenceRegex = /^heroku-inference/;
+        const isInferenceAddon = inferenceRegex.test(servicePlan);
         if (restParse.nonExistentFlags && restParse.nonExistentFlags.length > 0) {
             process.stderr.write(` ${color_1.default.yellow('›')}   For example: ${color_1.default.cyan(`heroku addons:create -a ${app} ${restParse.raw[0].input} -- ${restParse.nonExistentFlags.join(' ')}`)}`);
             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');
+        }
         const config = parseConfig(argv);
         let addon;
         try {

package/lib/commands/buildpacks/index.js

@@ -2,17 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
+const color_1 = require("@heroku-cli/color");
 const buildpacks_1 = require("../../lib/buildpacks/buildpacks");
 class Index extends command_1.Command {
     async run() {
         const { flags } = await this.parse(Index);
         const buildpacksCommand = new buildpacks_1.BuildpackCommand(this.heroku);
-        const buildpacks = await buildpacksCommand.fetch(flags.app);
+        const { body: app } = await this.heroku.get(`/apps/${flags.app}`, {
+            headers: {
+                Accept: 'application/vnd.heroku+json; version=3.sdk',
+            },
+        });
+        const buildpacks = await buildpacksCommand.fetch(flags.app, app.generation === 'fir');
         if (buildpacks.length === 0) {
-            this.log(`${flags.app} has no Buildpack URL set.`);
+            this.log(`${color_1.default.app(flags.app)} has no Buildpacks.`);
         }
         else {
-            core_1.ux.styledHeader(`${flags.app} Buildpack URL${buildpacks.length > 1 ? 's' : ''}`);
+            core_1.ux.styledHeader(`${color_1.default.app(flags.app)} Buildpack${buildpacks.length > 1 ? 's' : ''}`);
             buildpacksCommand.display(buildpacks, '');
         }
     }

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/pipelines/diff.d.ts

@@ -13,7 +13,7 @@ export default class PipelinesDiff extends Command {
         remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     kolkrabbi: KolkrabbiAPI;
-    getAppInfo: (appName: string, appId: string) => Promise<AppInfo>;
+    getAppInfo: (appName: string, appId: string, generation: string) => Promise<AppInfo>;
     run(): Promise<undefined>;
 }
 export {};

package/lib/commands/pipelines/diff.js

@@ -60,7 +60,8 @@ class PipelinesDiff extends command_1.Command {
     constructor() {
         super(...arguments);
         this.kolkrabbi = new kolkrabbi_api_1.default(this.config.userAgent, () => this.heroku.auth);
-        this.getAppInfo = async (appName, appId) => {
+        this.getAppInfo = async (appName, appId, generation) => {
+            var _a;
             // Find GitHub connection for the app
             const githubApp = await this.kolkrabbi.getAppLink(appId)
                 .catch(() => {
@@ -68,21 +69,31 @@ class PipelinesDiff extends command_1.Command {
             });
             // Find the commit hash of the latest release for this app
             let slug;
+            let ociImages;
+            let commit;
             try {
                 const { body: releases } = await (0, api_1.getReleases)(this.heroku, appId);
                 const release = releases.find(r => r.status === 'succeeded');
-                if (!release || !release.slug) {
+                if (!release || !(release.slug || release.oci_image)) {
                     throw new Error(`no release found for ${appName}`);
                 }
-                slug = await this.heroku.get(`/apps/${appId}/slugs/${release.slug.id}`, {
-                    headers: { Accept: api_1.V3_HEADER },
-                }).then(res => res.body);
-                // tslint:disable-next-line: no-unused
+                if (generation === 'cedar' && release.slug) {
+                    slug = await this.heroku.get(`/apps/${appId}/slugs/${release.slug.id}`, {
+                        headers: { Accept: api_1.SDK_HEADER },
+                    }).then(res => res.body);
+                    commit = slug.commit;
+                }
+                else if (generation === 'fir' && release.oci_image) {
+                    ociImages = await this.heroku.get(`/apps/${appId}/oci-images/${release.oci_image.id}`, {
+                        headers: { Accept: api_1.SDK_HEADER },
+                    }).then(res => res.body);
+                    commit = (_a = ociImages[0]) === null || _a === void 0 ? void 0 : _a.commit;
+                }
             }
-            catch (_a) {
+            catch (_b) {
                 return { name: appName, repo: githubApp.repo, hash: undefined };
             }
-            return { name: appName, repo: githubApp.repo, hash: slug.commit };
+            return { name: appName, repo: githubApp.repo, hash: commit };
         };
     }
     async run() {
@@ -96,6 +107,7 @@ class PipelinesDiff extends command_1.Command {
             return;
         }
         const targetAppId = coupling.app.id;
+        const generation = coupling.generation;
         core_1.ux.action.start('Fetching apps from pipeline');
         const allApps = await (0, api_1.listPipelineApps)(this.heroku, coupling.pipeline.id);
         core_1.ux.action.stop();
@@ -104,20 +116,18 @@ class PipelinesDiff extends command_1.Command {
             return core_1.ux.error(`Unable to diff ${targetAppName}`);
         }
         const downstreamStage = PROMOTION_ORDER[PROMOTION_ORDER.indexOf(sourceStage) + 1];
-        if (!downstreamStage || PROMOTION_ORDER.indexOf(sourceStage) < 0) { // eslint-disable-line unicorn/prefer-includes
+        if (!downstreamStage || !PROMOTION_ORDER.includes(sourceStage)) {
             return core_1.ux.error(`Unable to diff ${targetAppName}`);
         }
-        const downstreamApps = allApps.filter(function (app) {
-            return app.coupling.stage === downstreamStage;
-        });
+        const downstreamApps = allApps.filter(app => app.pipelineCoupling.stage === downstreamStage);
         if (downstreamApps.length === 0) {
             return core_1.ux.error(`Cannot diff ${targetAppName} as there are no downstream apps configured`);
         }
         // Fetch GitHub repo/latest release hash for [target, downstream[0], .., downstream[n]] apps
-        const appInfoPromises = [this.getAppInfo(targetAppName, targetAppId)];
+        const appInfoPromises = [this.getAppInfo(targetAppName, targetAppId, generation)];
         downstreamApps.forEach(app => {
             if (app.name && app.id) {
-                appInfoPromises.push(this.getAppInfo(app.name, app.id));
+                appInfoPromises.push(this.getAppInfo(app.name, app.id, generation));
             }
         });
         core_1.ux.action.start('Fetching release info for all apps');

package/lib/commands/pipelines/promote.js

@@ -166,7 +166,7 @@ class Promote extends command_1.Command {
         else {
             const targetStage = PROMOTION_ORDER[PROMOTION_ORDER.indexOf(sourceStage) + 1];
             assertValidPromotion(appNameOrId, sourceStage, targetStage);
-            targetApps = allApps.filter(app => app.coupling.stage === targetStage);
+            targetApps = allApps.filter(app => app.pipelineCoupling.stage === targetStage);
             assertApps(appNameOrId, targetApps, targetStage);
             promotionActionName = `Starting promotion to ${targetStage}`;
         }

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,14 +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>;
-        remote: 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', {
@@ -44,17 +45,16 @@ class Add extends command_1.Command {
 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' }),
+    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/api.d.ts

@@ -1,6 +1,8 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
+import { App, PipelineCoupling, Release } from './types/fir';
 export declare const V3_HEADER = "application/vnd.heroku+json; version=3";
+export declare const SDK_HEADER = "application/vnd.heroku+json; version=3.sdk";
 export declare const FILTERS_HEADER: string;
 export declare const PIPELINES_HEADER: string;
 export declare function createAppSetup(heroku: APIClient, body: {
@@ -12,17 +14,24 @@ export declare function createPipeline(heroku: APIClient, name: any, owner: any)
 export declare function createPipelineTransfer(heroku: APIClient, pipeline: Heroku.Pipeline): Promise<import("http-call").HTTP<unknown>>;
 export declare function destroyPipeline(heroku: APIClient, name: any, pipelineId: any): Promise<import("http-call").HTTP<unknown>>;
 export declare function findPipelineByName(heroku: APIClient, idOrName: string): Promise<import("http-call").HTTP<Heroku.Pipeline[]>>;
-export declare function getCoupling(heroku: APIClient, app: string): Promise<import("http-call").HTTP<Heroku.PipelineCoupling>>;
+export interface PipelineCouplingSdk extends Required<PipelineCoupling> {
+    generation: 'fir' | 'cedar';
+}
+export declare function getCoupling(heroku: APIClient, app: string): Promise<import("http-call").HTTP<PipelineCouplingSdk>>;
 export declare function getPipeline(heroku: APIClient, id: string): Promise<import("http-call").HTTP<Heroku.Pipeline>>;
 export declare function updatePipeline(heroku: APIClient, id: string, body: Heroku.Pipeline): Promise<import("http-call").HTTP<Heroku.Pipeline>>;
 export declare function getTeam(heroku: APIClient, teamId: any): Promise<import("http-call").HTTP<Heroku.Team>>;
 export declare function getAccountInfo(heroku: APIClient, id?: string): Promise<import("http-call").HTTP<Heroku.Account>>;
 export declare function getAppSetup(heroku: APIClient, buildId: any): Promise<import("http-call").HTTP<Heroku.AppSetup>>;
-export declare function listPipelineApps(heroku: APIClient, pipelineId: string): Promise<Array<Heroku.App>>;
+export interface AppWithPipelineCoupling extends App {
+    pipelineCoupling: PipelineCouplingSdk;
+    [k: string]: unknown;
+}
+export declare function listPipelineApps(heroku: APIClient, pipelineId: string): Promise<Array<AppWithPipelineCoupling>>;
 export declare function patchCoupling(heroku: APIClient, id: string, stage: string): Promise<import("http-call").HTTP<Heroku.PipelineCoupling>>;
 export declare function removeCoupling(heroku: APIClient, app: string): Promise<import("http-call").HTTP<unknown>>;
 export declare function updateCoupling(heroku: APIClient, app: string, stage: string): Promise<import("http-call").HTTP<Heroku.PipelineCoupling>>;
-export declare function getReleases(heroku: APIClient, appId: string): Promise<import("http-call").HTTP<Heroku.Release[]>>;
+export declare function getReleases(heroku: APIClient, appId: string): Promise<import("http-call").HTTP<Release[]>>;
 export declare function getPipelineConfigVars(heroku: APIClient, pipelineID: string): Promise<import("http-call").HTTP<Heroku.ConfigVars>>;
 export declare function setPipelineConfigVars(heroku: APIClient, pipelineID: string, body: Heroku.ConfigVars | Record<string, null>): Promise<import("http-call").HTTP<Heroku.ConfigVars>>;
 export declare function createTestRun(heroku: APIClient, body: Heroku.TestRun): Promise<import("http-call").HTTP<Heroku.TestRun>>;

package/lib/lib/api.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTestRun = exports.getTestNodes = exports.createTestRun = exports.setPipelineConfigVars = exports.getPipelineConfigVars = exports.getReleases = exports.updateCoupling = exports.removeCoupling = exports.patchCoupling = exports.listPipelineApps = exports.getAppSetup = exports.getAccountInfo = exports.getTeam = exports.updatePipeline = exports.getPipeline = exports.getCoupling = exports.findPipelineByName = exports.destroyPipeline = exports.createPipelineTransfer = exports.createPipeline = exports.createCoupling = exports.postCoupling = exports.createAppSetup = exports.PIPELINES_HEADER = exports.FILTERS_HEADER = exports.V3_HEADER = void 0;
-const lodash_1 = require("lodash");
+exports.updateTestRun = exports.getTestNodes = exports.createTestRun = exports.setPipelineConfigVars = exports.getPipelineConfigVars = exports.getReleases = exports.updateCoupling = exports.removeCoupling = exports.patchCoupling = exports.listPipelineApps = exports.getAppSetup = exports.getAccountInfo = exports.getTeam = exports.updatePipeline = exports.getPipeline = exports.getCoupling = exports.findPipelineByName = exports.destroyPipeline = exports.createPipelineTransfer = exports.createPipeline = exports.createCoupling = exports.postCoupling = exports.createAppSetup = exports.PIPELINES_HEADER = exports.FILTERS_HEADER = exports.SDK_HEADER = exports.V3_HEADER = void 0;
 exports.V3_HEADER = 'application/vnd.heroku+json; version=3';
+exports.SDK_HEADER = 'application/vnd.heroku+json; version=3.sdk';
 exports.FILTERS_HEADER = `${exports.V3_HEADER}.filters`;
 exports.PIPELINES_HEADER = `${exports.V3_HEADER}.pipelines`;
 const CI_HEADER = `${exports.V3_HEADER}.ci`;
@@ -53,7 +53,9 @@ function findPipelineByName(heroku, idOrName) {
 }
 exports.findPipelineByName = findPipelineByName;
 function getCoupling(heroku, app) {
-    return heroku.get(`/apps/${app}/pipeline-couplings`);
+    return heroku.get(`/apps/${app}/pipeline-couplings`, {
+        headers: { Accept: exports.SDK_HEADER },
+    });
 }
 exports.getCoupling = getCoupling;
 function getPipeline(heroku, id) {
@@ -89,17 +91,16 @@ function getAppSetup(heroku, buildId) {
 }
 exports.getAppSetup = getAppSetup;
 function listCouplings(heroku, pipelineId) {
-    return heroku.get(`/pipelines/${pipelineId}/pipeline-couplings`);
+    return heroku.get(`/pipelines/${pipelineId}/pipeline-couplings`, {
+        headers: { Accept: exports.SDK_HEADER },
+    });
 }
-function listPipelineApps(heroku, pipelineId) {
-    return listCouplings(heroku, pipelineId).then(({ body: couplings }) => {
-        const appIds = couplings.map(coupling => (coupling.app && coupling.app.id) || '');
-        return getAppFilter(heroku, appIds).then(({ body: apps }) => {
-            const couplingsByAppId = (0, lodash_1.keyBy)(couplings, coupling => coupling.app && coupling.app.id);
-            return apps.map(app => {
-                return Object.assign(Object.assign({}, app), { coupling: couplingsByAppId[app.id] });
-            });
-        });
+async function listPipelineApps(heroku, pipelineId) {
+    const { body: couplings } = await listCouplings(heroku, pipelineId);
+    const appIds = couplings.map(coupling => coupling.app.id || '');
+    const { body: apps } = await getAppFilter(heroku, appIds);
+    return apps.map(app => {
+        return Object.assign(Object.assign({}, app), { pipelineCoupling: couplings.find(coupling => coupling.app.id === app.id) });
     });
 }
 exports.listPipelineApps = listPipelineApps;
@@ -121,7 +122,7 @@ function updateCoupling(heroku, app, stage) {
 exports.updateCoupling = updateCoupling;
 function getReleases(heroku, appId) {
     return heroku.get(`/apps/${appId}/releases`, {
-        headers: { Accept: exports.V3_HEADER, Range: 'version ..; order=desc' },
+        headers: { Accept: exports.SDK_HEADER, Range: 'version ..; order=desc' },
         partial: true,
     });
 }

package/lib/lib/buildpacks/buildpacks.d.ts

@@ -11,10 +11,8 @@ export declare class BuildpackCommand {
     heroku: APIClient;
     registry: BuildpackRegistry;
     constructor(heroku: APIClient);
-    fetch(app: string): Promise<any[]>;
-    mapBuildpackResponse(buildpacks: {
-        body: any;
-    }): BuildpackResponse[];
+    fetch(app: string, isFirApp?: boolean): Promise<any[]>;
+    mapBuildpackResponse(buildpacks: BuildpackResponse[]): BuildpackResponse[];
     display(buildpacks: BuildpackResponse[], indent: string): void;
     registryNameToUrl(buildpack: string): Promise<string>;
     findUrl(buildpacks: BuildpackResponse[], buildpack: string): Promise<number>;

package/lib/lib/buildpacks/buildpacks.js

@@ -7,19 +7,48 @@ const core_1 = require("@oclif/core");
 const lodash_1 = require("lodash");
 const true_myth_1 = require("true-myth");
 const push_1 = require("../git/push");
-const validUrl = require('valid-url');
+const validator_1 = require("validator");
 class BuildpackCommand {
     constructor(heroku) {
         this.heroku = heroku;
         this.registry = new buildpack_registry_1.BuildpackRegistry();
     }
-    async fetch(app) {
-        const buildpacks = await this.heroku.get(`/apps/${app}/buildpack-installations`);
+    async fetch(app, isFirApp = false) {
+        let buildpacks;
+        if (isFirApp) {
+            const { body: releases } = await this.heroku.request(`/apps/${app}/releases`, {
+                partial: true,
+                headers: {
+                    Range: 'version ..; max=10, order=desc',
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            if (releases.length === 0 || releases[0].oci_image === null)
+                return [];
+            const latestImageId = releases[0].oci_image.id;
+            const { body: ociImages } = await this.heroku.get(`/apps/${app}/oci-images/${latestImageId}`, {
+                headers: {
+                    Accept: 'application/vnd.heroku+json; version=3.sdk',
+                },
+            });
+            buildpacks = ociImages[0].buildpacks.map((b, index) => {
+                return {
+                    buildpack: {
+                        url: b.id || b.homepage,
+                        name: b.id,
+                    },
+                    ordinal: index,
+                };
+            });
+        }
+        else {
+            const { body: buildpackInstallations } = await this.heroku.get(`/apps/${app}/buildpack-installations`);
+            buildpacks = buildpackInstallations;
+        }
         return this.mapBuildpackResponse(buildpacks);
     }
     mapBuildpackResponse(buildpacks) {
-        const body = buildpacks.body;
-        return body.map((bp) => {
+        return buildpacks.map((bp) => {
             bp.buildpack.url = bp.buildpack.url.replace(/^urn:buildpack:/, '');
             return bp;
         });
@@ -35,11 +64,11 @@ class BuildpackCommand {
         }
     }
     async registryNameToUrl(buildpack) {
-        if (validUrl.isWebUri(buildpack)) {
+        if ((0, validator_1.isURL)(buildpack)) {
             return buildpack;
         }
         true_myth_1.Result.match({
-            Ok: _ => { },
+            Ok: () => { },
             Err: err => {
                 core_1.ux.error(`Could not find the buildpack: ${buildpack}. ${err}`, { exit: 1 });
             },
@@ -93,7 +122,7 @@ class BuildpackCommand {
         return this.put(app, buildpackUpdates);
     }
     async put(app, buildpackUpdates) {
-        const buildpacks = await this.heroku.put(`/apps/${app}/buildpack-installations`, {
+        const { body: buildpacks } = await this.heroku.put(`/apps/${app}/buildpack-installations`, {
             headers: { Range: '' },
             body: { updates: buildpackUpdates },
         });

package/lib/lib/pipelines/ownership.d.ts

@@ -1,4 +1,5 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-export declare function warnMixedOwnership(pipelineApps: Array<Heroku.App>, pipeline: Heroku.Pipeline, owner: string): void;
-export declare function getOwner(heroku: APIClient, apps: Array<Heroku.App>, pipeline: Heroku.Pipeline): Promise<any>;
+import { AppWithPipelineCoupling } from '../api';
+export declare function warnMixedOwnership(pipelineApps: Array<AppWithPipelineCoupling>, pipeline: Heroku.Pipeline, owner: string): void;
+export declare function getOwner(heroku: APIClient, apps: Array<AppWithPipelineCoupling>, pipeline: Heroku.Pipeline): Promise<any>;

package/lib/lib/pipelines/render-pipeline.d.ts

@@ -1,6 +1,7 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-export default function renderPipeline(heroku: APIClient, pipeline: Heroku.Pipeline, pipelineApps: Array<Heroku.App>, { withOwners, showOwnerWarning }?: {
+import { AppWithPipelineCoupling } from '../api';
+export default function renderPipeline(heroku: APIClient, pipeline: Heroku.Pipeline, pipelineApps: Array<AppWithPipelineCoupling>, { withOwners, showOwnerWarning }?: {
     withOwners: boolean;
     showOwnerWarning: boolean;
 }): Promise<void>;