heroku 10.1.0-beta.0 → 10.1.0

package/lib/analytics.d.ts

@@ -25,6 +25,7 @@ export default class AnalyticsCommand {
     config: Interfaces.Config;
     userConfig: typeof deps.UserConfig.prototype;
     http: typeof deps.HTTP;
+    initialize: Promise<void>;
     constructor(config: Interfaces.Config);
     record(opts: RecordOpts): Promise<any>;
     get url(): string;

package/lib/analytics.js

@@ -11,9 +11,10 @@ class AnalyticsCommand {
         this.http = deps_1.default.HTTP.create({
             headers: { 'user-agent': config.userAgent },
         });
+        this.initialize = this.init();
     }
     async record(opts) {
-        await this.init();
+        await this.initialize;
         const plugin = opts.Command.plugin;
         if (!plugin) {
             debug('no plugin found for analytics');

package/lib/commands/addons/open.js

@@ -53,7 +53,7 @@ class Open extends command_1.Command {
         const sso = await this.heroku.request(`/apps/${app}/addons/${args.addon}/sso`, {
             method: 'GET',
             headers: {
-                Accept: 'application/vnd.heroku+json; version=3.add-ons-sso',
+                Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
         const { method, action } = sso.body;

package/lib/commands/pg/settings/log-min-duration-statement.js

@@ -10,7 +10,7 @@ class LogMinDurationStatement extends setter_1.PGSettingsCommand {
         this.settingKey = 'log_min_duration_statement';
     }
     convertValue(val) {
-        return val;
+        return Number.parseInt(val, 10);
     }
     explain(setting) {
         if (setting.value === -1) {

package/lib/commands/pipelines/diff.js

@@ -23,13 +23,15 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
     // Do the actual GitHub diff
     try {
         const path = `${targetApp.repo}/compare/${downstreamApp.hash}...${targetApp.hash}`;
-        const headers = { authorization: 'token ' + githubToken };
+        const headers = {
+            authorization: 'token ' + githubToken,
+            'Content-Type': 'application/vnd.github+json',
+            'X-GitHub-Api-Version': '2022-11-28',
+        };
         if (herokuUserAgent) {
-            headers['user-agent'] = herokuUserAgent;
+            Reflect.set(headers, 'user-agent', herokuUserAgent);
         }
-        const githubDiff = await http_call_1.default.get(`https://api.github.com/repos/${path}`, {
-            headers,
-        }).then(res => res.body);
+        const { body: githubDiff } = await http_call_1.default.get(`https://api.github.com/repos/${path}`, { headers });
         core_1.ux.log('');
         core_1.ux.styledHeader(`${color_1.default.app(targetApp.name)} is ahead of ${color_1.default.app(downstreamApp.name)} by ${githubDiff.ahead_by} commit${githubDiff.ahead_by === 1 ? '' : 's'}`);
         const mapped = githubDiff.commits.map((commit) => {
@@ -49,7 +51,6 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
             message: {},
         });
         core_1.ux.log(`\nhttps://github.com/${path}`);
-        // tslint:disable-next-line: no-unused
     }
     catch (_a) {
         core_1.ux.log(`\n${color_1.default.app(targetApp.name)} was not compared to ${color_1.default.app(downstreamApp.name)} because we were unable to perform a diff`);
@@ -99,15 +100,17 @@ class PipelinesDiff extends command_1.Command {
     async run() {
         const { flags } = await this.parse(PipelinesDiff);
         const targetAppName = flags.app;
-        const coupling = await (0, api_1.getCoupling)(this.heroku, targetAppName)
-            .then(res => res.body)
-            .catch(() => { });
-        if (!coupling) {
+        let coupling;
+        try {
+            ({ body: coupling } = await (0, api_1.getCoupling)(this.heroku, targetAppName));
+        }
+        catch (_a) {
             core_1.ux.error(`This app (${targetAppName}) does not seem to be a part of any pipeline`);
             return;
         }
+        const { body: pipeline } = await (0, api_1.getPipeline)(this.heroku, coupling.pipeline.id);
         const targetAppId = coupling.app.id;
-        const generation = coupling.generation;
+        const generation = pipeline.generation.name;
         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();

package/lib/commands/spaces/destroy.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
 const command_1 = require("@heroku-cli/command");
 const tsheredoc_1 = require("tsheredoc");
 const confirmCommand_1 = require("../../lib/confirmCommand");
 const spaces_1 = require("../../lib/spaces/spaces");
+const color_1 = require("@heroku-cli/color");
 class Destroy extends command_1.Command {
     async run() {
+        var _a, _b;
         const { flags, args } = await this.parse(Destroy);
         const { confirm } = flags;
         const spaceName = flags.space || args.space;
@@ -22,7 +23,20 @@ class Destroy extends command_1.Command {
         if (space.state === 'allocated') {
             ({ body: space.outbound_ips } = await this.heroku.get(`/spaces/${spaceName}/nat`));
             if (space.outbound_ips && space.outbound_ips.state === 'enabled') {
-                natWarning = `The Outbound IPs for this space will be reused!\nEnsure that external services no longer allow these Outbound IPs: ${(0, spaces_1.displayNat)(space.outbound_ips)}\n`;
+                const ipv6 = ((_a = space.generation) === null || _a === void 0 ? void 0 : _a.name) === 'fir' ? ' and IPv6' : '';
+                natWarning = (0, tsheredoc_1.default) `
+        ${color_1.default.dim('===')} ${color_1.default.bold('WARNING: Outbound IPs Will Be Reused')}
+        ${color_1.default.yellow(`⚠️ Deleting this space frees up the following outbound IPv4${ipv6} IPs for reuse:`)}
+        ${color_1.default.bold((_b = (0, spaces_1.displayNat)(space.outbound_ips)) !== null && _b !== void 0 ? _b : '')}
+
+        ${color_1.default.dim('Update the following configurations:')}
+        ${color_1.default.dim('=')} IP allowlists
+        ${color_1.default.dim('=')} Firewall rules
+        ${color_1.default.dim('=')} Security group configurations
+        ${color_1.default.dim('=')} Network ACLs
+
+        ${color_1.default.yellow(`Ensure that you remove the listed IPv4${ipv6} addresses from your security configurations.`)}
+      `;
             }
         }
         await (0, confirmCommand_1.default)(spaceName, confirm, `Destructive Action\nThis command will destroy the space ${color_1.default.bold.red(spaceName)}\n${natWarning}\n`);

package/lib/commands/telemetry/add.js

@@ -29,7 +29,7 @@ class Add extends command_1.Command {
             signals: (0, util_1.validateAndFormatSignals)(signals),
             exporter: {
                 endpoint,
-                type: `otlp${transport}`,
+                type: (transport === 'grpc') ? 'otlp' : 'otlphttp',
                 headers: JSON.parse(exporterHeaders),
             },
         };

package/lib/commands/telemetry/index.js

@@ -44,6 +44,6 @@ 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' }),
+    app: command_1.flags.string({ description: 'filter by app name' }),
 };
 Index.example = '$ heroku telemetry';

package/lib/file.d.ts

@@ -10,5 +10,5 @@ export declare function ls(dir: string): Promise<{
 }[]>;
 export declare function removeEmptyDirs(dir: string): Promise<void>;
 export declare function readJSON(file: string): Promise<any>;
-export declare function outputJSON(file: string, data: any, options?: FS.WriteOptions): Promise<void>;
+export declare function outputJSON(file: string, data: any): Promise<void>;
 export declare function realpathSync(p: string): string;

package/lib/file.js

@@ -53,9 +53,9 @@ async function readJSON(file) {
     return deps_1.default.fs.readJSON(file);
 }
 exports.readJSON = readJSON;
-async function outputJSON(file, data, options = {}) {
+async function outputJSON(file, data) {
     debug('outputJSON', file);
-    return deps_1.default.fs.outputJSON(file, data, Object.assign({ spaces: 2 }, options));
+    return deps_1.default.fs.outputJSON(file, data, { spaces: 2 });
 }
 exports.outputJSON = outputJSON;
 function realpathSync(p) {

package/lib/hooks/postrun/performance_analytics.js

@@ -8,5 +8,6 @@ const performance_analytics = async function () {
     const cmdStartTime = global.cliTelemetry.commandRunDuration;
     global.cliTelemetry.commandRunDuration = telemetry.computeDuration(cmdStartTime);
     global.cliTelemetry.lifecycleHookCompletion.postrun = true;
+    await Reflect.get(globalThis, 'recordPromise');
 };
 exports.default = performance_analytics;

package/lib/hooks/prerun/analytics.js

@@ -8,6 +8,6 @@ const analytics = async function (options) {
     }
     global.cliTelemetry = telemetry.setupTelemetry(this.config, options);
     const analytics = new analytics_1.default(this.config);
-    await analytics.record(options);
+    Reflect.set(globalThis, 'recordPromise', analytics.record(options));
 };
 exports.default = analytics;

package/lib/lib/api.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-import { App, PipelineCoupling, Release } from './types/fir';
+import { App, Pipeline, PipelineCoupling } 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;
@@ -14,24 +14,21 @@ export declare function createPipeline(heroku: APIClient, name: any, owner: any)
 export declare function createPipelineTransfer(heroku: APIClient, pipeline: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function destroyPipeline(heroku: APIClient, name: any, pipelineId: any): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function findPipelineByName(heroku: APIClient, idOrName: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline[]>>;
-export interface PipelineCouplingSdk extends Required<PipelineCoupling> {
-    generation: 'fir' | 'cedar';
-}
-export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCouplingSdk>>;
-export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCoupling>>;
+export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Pipeline>>;
 export declare function updatePipeline(heroku: APIClient, id: string, body: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
 export declare function getTeam(heroku: APIClient, teamId: any): Promise<import("@heroku/http-call").HTTP<Heroku.Team>>;
 export declare function getAccountInfo(heroku: APIClient, id?: string): Promise<import("@heroku/http-call").HTTP<Heroku.Account>>;
 export declare function getAppSetup(heroku: APIClient, buildId: any): Promise<import("@heroku/http-call").HTTP<Heroku.AppSetup>>;
 export interface AppWithPipelineCoupling extends App {
-    pipelineCoupling: PipelineCouplingSdk;
+    pipelineCoupling: PipelineCoupling;
     [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("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
 export declare function removeCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
 export declare function updateCoupling(heroku: APIClient, app: string, stage: string): Promise<import("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
-export declare function getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Release[]>>;
+export declare function getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Heroku.Release[]>>;
 export declare function getPipelineConfigVars(heroku: APIClient, pipelineID: string): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
 export declare function setPipelineConfigVars(heroku: APIClient, pipelineID: string, body: Heroku.ConfigVars | Record<string, null>): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
 export declare function createTestRun(heroku: APIClient, body: Heroku.TestRun): Promise<import("@heroku/http-call").HTTP<Heroku.TestRun>>;

package/lib/lib/apps/generation.js

@@ -14,11 +14,11 @@ async function getApp(appOrName, herokuApi) {
 }
 async function isFirApp(appOrName, herokuApi) {
     const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'fir';
+    return app.generation.name === 'fir';
 }
 exports.isFirApp = isFirApp;
 async function isCedarApp(appOrName, herokuApi) {
     const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'cedar';
+    return app.generation.name === 'cedar';
 }
 exports.isCedarApp = isCedarApp;