heroku 10.13.2-beta.0 → 10.13.3-beta.0

package/lib/lib/pg/util.js

@@ -1,20 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePostgresConnectionString = exports.databaseNameFromUrl = exports.configVarNamesFromValue = exports.bastionKeyPlan = exports.getConnectionDetails = exports.presentCredentialAttachments = exports.formatResponseWithCommands = exports.getConfigVarNameFromAttachment = exports.essentialPlan = exports.legacyEssentialPlan = exports.essentialNumPlan = exports.getConfigVarName = void 0;
+exports.databaseNameFromUrl = exports.configVarNamesFromValue = exports.presentCredentialAttachments = exports.formatResponseWithCommands = exports.essentialPlan = exports.legacyEssentialPlan = exports.essentialNumPlan = void 0;
 const color_1 = require("@heroku-cli/color");
 const core_1 = require("@oclif/core");
-const debug_1 = require("debug");
 const addons_1 = require("../../commands/addons");
 const multisort_1 = require("../utils/multisort");
-const bastion_1 = require("./bastion");
-const process_1 = require("process");
-function getConfigVarName(configVars) {
-    const connStringVars = configVars.filter(cv => (cv.endsWith('_URL')));
-    if (connStringVars.length === 0)
-        throw new Error('Database URL not found for this addon');
-    return connStringVars[0];
-}
-exports.getConfigVarName = getConfigVarName;
+const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
 const essentialNumPlan = (addon) => { var _a, _b; return Boolean((_b = (_a = addon === null || addon === void 0 ? void 0 : addon.plan) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.split(':')[1].match(/^essential/)); };
 exports.essentialNumPlan = essentialNumPlan;
 const legacyEssentialPlan = (addon) => { var _a, _b; return Boolean((_b = (_a = addon === null || addon === void 0 ? void 0 : addon.plan) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.split(':')[1].match(/(dev|basic|mini)$/)); };
@@ -23,22 +14,6 @@ function essentialPlan(addon) {
     return (0, exports.essentialNumPlan)(addon) || (0, exports.legacyEssentialPlan)(addon);
 }
 exports.essentialPlan = essentialPlan;
-function getConfigVarNameFromAttachment(attachment, config = {}) {
-    var _a, _b;
-    const configVars = (_b = (_a = attachment.config_vars) === null || _a === void 0 ? void 0 : _a.filter((cv) => {
-        var _a;
-        return (_a = config[cv]) === null || _a === void 0 ? void 0 : _a.startsWith('postgres://');
-    })) !== null && _b !== void 0 ? _b : [];
-    if (configVars.length === 0) {
-        core_1.ux.error(`No config vars found for ${attachment.name}; perhaps they were removed as a side effect of ${color_1.default.cmd('heroku rollback')}? Use ${color_1.default.cmd('heroku addons:attach')} to create a new attachment and then ${color_1.default.cmd('heroku addons:detach')} to remove the current attachment.`);
-    }
-    const configVarName = `${attachment.name}_URL`;
-    if (configVars.includes(configVarName) && configVarName in config) {
-        return configVarName;
-    }
-    return getConfigVarName(configVars);
-}
-exports.getConfigVarNameFromAttachment = getConfigVarNameFromAttachment;
 function formatResponseWithCommands(response) {
     return response.replace(/`(.*?)`/g, (_, word) => color_1.default.cmd(word));
 }
@@ -102,33 +77,6 @@ function presentCredentialAttachments(app, credAttachments, credentials, cred) {
     return [cred, ...attLines, ...rotationLines].join('\n');
 }
 exports.presentCredentialAttachments = presentCredentialAttachments;
-const getConnectionDetails = (attachment, configVars = {}) => {
-    const connStringVar = getConfigVarNameFromAttachment(attachment, configVars);
-    // remove _URL from the end of the config var name
-    const baseName = connStringVar.slice(0, -4);
-    // build the default payload for non-bastion dbs
-    (0, debug_1.default)(`Using "${connStringVar}" to connect to your database…`);
-    const conn = (0, exports.parsePostgresConnectionString)(configVars[connStringVar]);
-    const payload = {
-        user: conn.user,
-        password: conn.password,
-        database: conn.database,
-        host: conn.host,
-        port: conn.port,
-        pathname: conn.pathname,
-        url: conn.url,
-        attachment,
-    };
-    // If bastion creds exist, graft it into the payload
-    const bastion = (0, bastion_1.getBastion)(configVars, baseName);
-    if (bastion) {
-        Object.assign(payload, bastion);
-    }
-    return payload;
-};
-exports.getConnectionDetails = getConnectionDetails;
-const bastionKeyPlan = (a) => Boolean(a.plan.name.match(/private/));
-exports.bastionKeyPlan = bastionKeyPlan;
 const configVarNamesFromValue = (config, value) => {
     const keys = [];
     for (const key of Object.keys(config)) {
@@ -166,22 +114,7 @@ const databaseNameFromUrl = (uri, config) => {
     if (name) {
         return color_1.default.configVar(name.replace(/_URL$/, ''));
     }
-    const conn = (0, exports.parsePostgresConnectionString)(uri);
+    const conn = heroku_cli_util_1.utils.pg.DatabaseResolver.parsePostgresConnectionString(uri);
     return `${conn.host}:${conn.port}${conn.pathname}`;
 };
 exports.databaseNameFromUrl = databaseNameFromUrl;
-const parsePostgresConnectionString = (db) => {
-    const dbPath = db.match(/:\/\//) ? db : `postgres:///${db}`;
-    const url = new URL(dbPath);
-    const { username, password, hostname, pathname, port } = url;
-    return {
-        user: username,
-        password,
-        database: pathname.charAt(0) === '/' ? pathname.slice(1) : pathname,
-        host: hostname,
-        port: port || process_1.env.PGPORT || (hostname && '5432'),
-        pathname,
-        url: dbPath,
-    };
-};
-exports.parsePostgresConnectionString = parsePostgresConnectionString;

package/lib/lib/run/helpers.d.ts

@@ -1,3 +1,13 @@
+import type { APIClient } from '@heroku-cli/command';
 export declare function revertSortedArgs(processArgs: Array<string>, argv: Array<string>): string[];
 export declare function buildCommand(args: Array<string>, prependLauncher?: boolean): string;
 export declare function buildEnvFromFlag(flag: string): {};
+/**
+ * Determines whether to prepend `launcher` to the command for a given app.
+ * Behavior: Only prepend on CNB stack apps and when not explicitly disabled.
+ */
+export declare function shouldPrependLauncher(heroku: APIClient, appName: string, disableLauncher: boolean): Promise<boolean>;
+/**
+ * Builds the command string, automatically deciding whether to prepend `launcher`.
+ */
+export declare function buildCommandWithLauncher(heroku: APIClient, appName: string, args: string[], disableLauncher: boolean): Promise<string>;

package/lib/lib/run/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
+exports.buildCommandWithLauncher = exports.shouldPrependLauncher = exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const core_1 = require("@oclif/core");
 // this function exists because oclif sorts argv
@@ -56,3 +56,24 @@ function buildEnvFromFlag(flag) {
     return env;
 }
 exports.buildEnvFromFlag = buildEnvFromFlag;
+/**
+ * Determines whether to prepend `launcher` to the command for a given app.
+ * Behavior: Only prepend on CNB stack apps and when not explicitly disabled.
+ */
+async function shouldPrependLauncher(heroku, appName, disableLauncher) {
+    if (disableLauncher)
+        return false;
+    const { body: app } = await heroku.get(`/apps/${appName}`, {
+        headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
+    });
+    return (app.stack && app.stack.name) === 'cnb';
+}
+exports.shouldPrependLauncher = shouldPrependLauncher;
+/**
+ * Builds the command string, automatically deciding whether to prepend `launcher`.
+ */
+async function buildCommandWithLauncher(heroku, appName, args, disableLauncher) {
+    const prependLauncher = await shouldPrependLauncher(heroku, appName, disableLauncher);
+    return buildCommand(args, prependLauncher);
+}
+exports.buildCommandWithLauncher = buildCommandWithLauncher;

package/oclif.manifest.json

@@ -9399,6 +9399,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "no-launcher": {
+          "description": "don’t prepend ‘launcher’ before a command",
+          "name": "no-launcher",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -9419,7 +9425,7 @@
     "run": {
       "aliases": [],
       "args": {},
-      "description": "run a one-off process inside a heroku dyno\nShows a notification if the dyno takes more than 20 seconds to start.",
+      "description": "run a one-off process inside a heroku dyno\nShows a notification if the dyno takes more than 20 seconds to start.\nHeroku automatically prepends ‘launcher’ to the command on CNB apps (use --no-launcher to disable).",
       "examples": [
         "$ heroku run bash",
         "$ heroku run -s standard-2x -- myscript.sh -a arg1 -s arg2"
@@ -9490,6 +9496,12 @@
           "name": "no-notify",
           "allowNo": false,
           "type": "boolean"
+        },
+        "no-launcher": {
+          "description": "don’t prepend ‘launcher’ before a command",
+          "name": "no-launcher",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -9635,34 +9647,6 @@
         "index.js"
       ]
     },
-    "teams": {
-      "aliases": [],
-      "args": {},
-      "description": "list the teams that you are a member of\n\nUse heroku members:* to manage team members.",
-      "flags": {
-        "json": {
-          "description": "output in json format",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "teams",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "topic": "teams",
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "teams",
-        "index.js"
-      ]
-    },
     "spaces:create": {
       "aliases": [],
       "args": {
@@ -10171,6 +10155,34 @@
         "wait.js"
       ]
     },
+    "teams": {
+      "aliases": [],
+      "args": {},
+      "description": "list the teams that you are a member of\n\nUse heroku members:* to manage team members.",
+      "flags": {
+        "json": {
+          "description": "output in json format",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "teams",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "topic": "teams",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "teams",
+        "index.js"
+      ]
+    },
     "telemetry:add": {
       "aliases": [],
       "args": {
@@ -15007,5 +15019,5 @@
       ]
     }
   },
-  "version": "10.13.2-beta.0"
+  "version": "10.13.3-beta.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.13.2-beta.0",
+  "version": "10.13.3-beta.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",
@@ -344,7 +342,7 @@
     },
     "update": {
       "node": {
-        "version": "20.19.4"
+        "version": "20.19.5"
       },
       "s3": {
         "xz": true,
@@ -400,5 +398,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "9b0be97ff1e81738dd9b1d68c23634d85bd8a764"
+  "gitHead": "ab7b708ba071c64166847e53632d8fe71f3ea39a"
 }

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;