heroku 10.13.2 → 10.14.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.13.2",
+  "version": "10.14.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -13,7 +13,7 @@
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
-    "@heroku/heroku-cli-util": "^9.0.2",
+    "@heroku/heroku-cli-util": "^9.1.3",
     "@heroku/http-call": "^5.5.0",
     "@heroku/mcp-server": "1.0.7-alpha.1",
     "@heroku/plugin-ai": "^1.0.1",
@@ -36,7 +36,6 @@
     "@opentelemetry/sdk-trace-node": "^1.15.1",
     "@opentelemetry/semantic-conventions": "^1.24.1",
     "@types/js-yaml": "^3.12.5",
-    "@types/tunnel-ssh": "4.1.1",
     "ansi-escapes": "3.2.0",
     "async-file": "^2.0.2",
     "bytes": "^3.1.2",
@@ -62,7 +61,7 @@
     "printf": "0.6.1",
     "psl": "^1.9.0",
     "redis-parser": "^3.0.0",
-    "rollbar": "^2.26.2",
+    "rollbar": "^2.26.4",
     "semver": "7.6.1",
     "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",
@@ -76,7 +75,6 @@
     "true-myth": "2.2.3",
     "tsheredoc": "^1.0.1",
     "tslib": "1.14.1",
-    "tunnel-ssh": "4.1.6",
     "urijs": "^1.19.11",
     "validator": "^13.7.0",
     "word-wrap": "^1.2.5",
@@ -400,5 +398,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "82c0564fc0683341fc4591d60135b3772ecc3526"
+  "gitHead": "c0d7800f947ef8f1a1836a8d735a0cd05795eac4"
 }

package/lib/lib/pg/bastion.d.ts

@@ -1,29 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { APIClient } from '@heroku-cli/command';
-import * as createTunnel from 'tunnel-ssh';
-import { ConnectionDetails } from './util';
-export declare const getBastion: (config: Record<string, string>, baseName: string) => {
-    bastionHost: string;
-    bastionKey: string;
-} | {
-    bastionHost?: undefined;
-    bastionKey?: undefined;
-};
-export declare const env: (db: ConnectionDetails) => {
-    PGAPPNAME: string;
-    PGSSLMODE: string;
-} & NodeJS.ProcessEnv;
-export declare type TunnelConfig = createTunnel.Config;
-export declare function tunnelConfig(db: ConnectionDetails): TunnelConfig;
-export declare function getConfigs(db: ConnectionDetails): {
-    dbEnv: NodeJS.ProcessEnv;
-    dbTunnelConfig: createTunnel.Config;
-};
-export declare function sshTunnel(db: ConnectionDetails, dbTunnelConfig: TunnelConfig, timeout?: number): Promise<void | import("net").Server | null>;
-export declare function fetchConfig(heroku: APIClient, db: {
-    id: string;
-}): Promise<import("@heroku/http-call").HTTP<{
-    host: string;
-    private_key: string;
-}>>;

package/lib/lib/pg/bastion.js

@@ -1,121 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchConfig = exports.sshTunnel = exports.getConfigs = exports.tunnelConfig = exports.env = exports.getBastion = void 0;
-const debug = require('debug')('pg');
-const EventEmitter = require("node:events");
-const createTunnel = require("tunnel-ssh");
-const util_1 = require("util");
-const host_1 = require("./host");
-const core_1 = require("@oclif/core");
-const getBastion = function (config, baseName) {
-    // If there are bastions, extract a host and a key
-    // otherwise, return an empty Object
-    // If there are bastions:
-    // * there should be one *_BASTION_KEY
-    // * pick one host from the comma-separated list in *_BASTIONS
-    // We assert that _BASTIONS and _BASTION_KEY always exist together
-    // If either is falsy, pretend neither exist
-    const bastionKey = config[`${baseName}_BASTION_KEY`];
-    const bastions = (config[`${baseName}_BASTIONS`] || '').split(',');
-    const bastionHost = bastions[Math.floor(Math.random() * bastions.length)];
-    return (bastionKey && bastionHost) ? { bastionHost, bastionKey } : {};
-};
-exports.getBastion = getBastion;
-const env = (db) => {
-    const baseEnv = Object.assign({
-        PGAPPNAME: 'psql non-interactive',
-        PGSSLMODE: (!db.host || db.host === 'localhost') ? 'prefer' : 'require',
-    }, process.env);
-    const mapping = {
-        PGUSER: 'user',
-        PGPASSWORD: 'password',
-        PGDATABASE: 'database',
-        PGPORT: 'port',
-        PGHOST: 'host',
-    };
-    Object.keys(mapping).forEach(envVar => {
-        const val = db[mapping[envVar]];
-        if (val) {
-            baseEnv[envVar] = val;
-        }
-    });
-    return baseEnv;
-};
-exports.env = env;
-function tunnelConfig(db) {
-    const localHost = '127.0.0.1';
-    const localPort = Math.floor((Math.random() * (65535 - 49152)) + 49152);
-    return {
-        username: 'bastion',
-        host: db.bastionHost,
-        privateKey: db.bastionKey,
-        dstHost: db.host || undefined,
-        dstPort: (db.port && Number.parseInt(db.port, 10)) || undefined,
-        localHost,
-        localPort,
-    };
-}
-exports.tunnelConfig = tunnelConfig;
-function getConfigs(db) {
-    const dbEnv = (0, exports.env)(db);
-    const dbTunnelConfig = tunnelConfig(db);
-    if (db.bastionKey) {
-        Object.assign(dbEnv, {
-            PGPORT: dbTunnelConfig.localPort,
-            PGHOST: dbTunnelConfig.localHost,
-        });
-    }
-    return {
-        dbEnv,
-        dbTunnelConfig,
-    };
-}
-exports.getConfigs = getConfigs;
-class Timeout {
-    constructor(timeout, message) {
-        this.events = new EventEmitter();
-        this.timeout = timeout;
-        this.message = message;
-    }
-    async promise() {
-        this.timer = setTimeout(() => {
-            this.events.emit('error', new Error(this.message));
-        }, this.timeout);
-        try {
-            await EventEmitter.once(this.events, 'cancelled');
-        }
-        finally {
-            clearTimeout(this.timer);
-        }
-    }
-    cancel() {
-        this.events.emit('cancelled');
-    }
-}
-async function sshTunnel(db, dbTunnelConfig, timeout = 10000) {
-    if (!db.bastionKey) {
-        return null;
-    }
-    const timeoutInstance = new Timeout(timeout, 'Establishing a secure tunnel timed out');
-    const createSSHTunnel = (0, util_1.promisify)(createTunnel);
-    try {
-        return await Promise.race([
-            timeoutInstance.promise(),
-            createSSHTunnel(dbTunnelConfig),
-        ]);
-    }
-    catch (error) {
-        debug(error);
-        core_1.ux.error('Unable to establish a secure tunnel to your database.');
-    }
-    finally {
-        timeoutInstance.cancel();
-    }
-}
-exports.sshTunnel = sshTunnel;
-async function fetchConfig(heroku, db) {
-    return heroku.get(`/client/v11/databases/${encodeURIComponent(db.id)}/bastion`, {
-        hostname: (0, host_1.default)(),
-    });
-}
-exports.fetchConfig = fetchConfig;

package/lib/lib/pg/config.d.ts

@@ -1,2 +0,0 @@
-import type { APIClient } from '@heroku-cli/command';
-export declare function getConfig(heroku: APIClient, app: string): Promise<Record<string, string> | undefined>;

package/lib/lib/pg/config.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = void 0;
-const responseByAppId = new Map();
-async function getConfig(heroku, app) {
-    if (!responseByAppId.has(app)) {
-        const promise = heroku.get(`/apps/${app}/config-vars`);
-        responseByAppId.set(app, promise);
-    }
-    const result = await responseByAppId.get(app);
-    return result === null || result === void 0 ? void 0 : result.body;
-}
-exports.getConfig = getConfig;

package/lib/lib/pg/host.d.ts

@@ -1 +0,0 @@
-export default function (): string;

package/lib/lib/pg/host.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function default_1() {
-    return process.env.HEROKU_DATA_HOST || 'api.data.heroku.com';
-}
-exports.default = default_1;