heroku 11.0.0-alpha.11 → 11.0.0-alpha.13

package/package.json

@@ -1,24 +1,23 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "11.0.0-alpha.11",
+  "version": "11.0.0-alpha.13",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
   "dependencies": {
-    "@heroku-cli/color": "2.0.1",
     "@heroku-cli/command": "^12.1.1",
     "@heroku-cli/notifications": "^1.2.4",
-    "@heroku-cli/plugin-ps-exec": "2.6.2",
+    "@heroku-cli/plugin-ps-exec": "2.6.4",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
-    "@heroku/heroku-cli-util": "^10.1.2",
+    "@heroku/heroku-cli-util": "10.4.0",
     "@heroku/http-call": "^5.5.0",
     "@heroku/mcp-server": "1.0.7-alpha.1",
     "@heroku/plugin-ai": "^1.0.1",
     "@inquirer/prompts": "^5.0.5",
-    "@oclif/core": "^4.3.0",
+    "@oclif/core": "^4",
     "@oclif/plugin-commands": "4.1.25",
     "@oclif/plugin-help": "^6.2.28",
     "@oclif/plugin-legacy": "^2.0.24",
@@ -28,15 +27,18 @@
     "@oclif/plugin-version": "^2.2.28",
     "@oclif/plugin-warn-if-update-available": "^3.1.40",
     "@oclif/plugin-which": "^3.2.35",
-    "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.41.1",
-    "@opentelemetry/instrumentation": "^0.51.1",
-    "@opentelemetry/resources": "^1.15.1",
-    "@opentelemetry/sdk-trace-base": "^1.15.1",
-    "@opentelemetry/sdk-trace-node": "^1.15.1",
-    "@opentelemetry/semantic-conventions": "^1.24.1",
-    "@types/tunnel-ssh": "4.1.1",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+    "@opentelemetry/instrumentation": "^0.52.1",
+    "@opentelemetry/resources": "^1.25.1",
+    "@opentelemetry/sdk-trace-base": "^1.25.1",
+    "@opentelemetry/sdk-trace-node": "^1.25.1",
+    "@opentelemetry/semantic-conventions": "^1.25.1",
+    "@sentry/node": "^10.27.0",
+    "@sentry/opentelemetry": "^10.27.0",
+    "@types/js-yaml": "^3.12.5",
     "ansi-escapes": "3.2.0",
+    "ansis": "^4",
     "bytes": "^3.1.2",
     "cli-progress": "^3.12.0",
     "commander": "^2.15.1",
@@ -53,6 +55,7 @@
     "https-proxy-agent": "^7.0.6",
     "inquirer": "^8.2.6",
     "lodash": "^4.17.21",
+    "natural-orderby": "^5.0.0",
     "netrc-parser": "3.1.6",
     "node-fetch": "^2.6.7",
     "open": "^10.1.2",
@@ -62,19 +65,17 @@
     "printf": "0.6.1",
     "psl": "^1.9.0",
     "redis-parser": "^3.0.0",
-    "rollbar": "^2.26.2",
-    "semver": "7.6.1",
+    "semver": "^7.7.3",
+    "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",
     "ssh2": "^1.16.0",
     "stdout-stderr": "^0.1.13",
     "strftime": "^0.10.0",
-    "strip-ansi": "^6",
     "term-img": "^4.1.0",
-    "tmp": "^0.2.3",
+    "tmp": "^0.2.5",
     "true-myth": "4.1.1",
     "tsheredoc": "^1.0.1",
     "tslib": "1.14.1",
-    "tunnel-ssh": "4.1.6",
     "urijs": "^1.19.11",
     "word-wrap": "^1.2.5",
     "ws": "^6.2.2",
@@ -84,7 +85,7 @@
   "devDependencies": {
     "@heroku-cli/schema": "^1.0.25",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@oclif/test": "^2.3.28",
+    "@oclif/test": "^4.1.15",
     "@types/ansi-styles": "^3.2.1",
     "@types/bytes": "^3.1.4",
     "@types/chai": "^4.3.14",
@@ -95,6 +96,7 @@
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^8.2.10",
     "@types/lodash": "^4.14.123",
+    "@types/lolex": "^5.1.6",
     "@types/mocha": "^10.0.10",
     "@types/node": "22.16.5",
     "@types/node-fetch": "^2.6.11",
@@ -117,19 +119,17 @@
     "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "globby": "^10.0.2",
-    "lolex": "^3.1.0",
+    "lolex": "^5.1.2",
     "mocha": "^10.8.2",
     "nock": "^13.5.1",
     "nyc": "^15.1.0",
-    "oclif": "^4.22.27",
+    "oclif": "^4.22.65",
     "proxyquire": "^2.1.0",
     "qqjs": "0.3.11",
-    "read-pkg": "^9.0.1",
     "rimraf": "5.0.5",
     "sinon": "^19.0.2",
     "source-map-support": "^0.5.21",
     "std-mocks": "^2.0.0",
-    "strip-ansi": "6.0.1",
     "ts-node": "^10.9.2",
     "typescript": "4.8.4"
   },
@@ -140,7 +140,6 @@
     "/autocomplete-scripts",
     "/bin",
     "/lib",
-    "/package-lock.json",
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
@@ -151,222 +150,12 @@
   ],
   "license": "ISC",
   "main": "lib/index.js",
-  "oclif": {
-    "repositoryPrefix": "<%- repo %>/blob/v<%- version %>/packages/cli/<%- commandPath %>",
-    "additionalHelpFlags": [
-      "-h"
-    ],
-    "additionalVersionFlags": [
-      "-v",
-      "version"
-    ],
-    "commands": "./lib/commands",
-    "plugins": [
-      "@oclif/plugin-legacy",
-      "@heroku-cli/plugin-ps-exec",
-      "@oclif/plugin-commands",
-      "@oclif/plugin-help",
-      "@oclif/plugin-not-found",
-      "@oclif/plugin-plugins",
-      "@oclif/plugin-update",
-      "@oclif/plugin-version",
-      "@oclif/plugin-warn-if-update-available",
-      "@oclif/plugin-which",
-      "@heroku/plugin-ai"
-    ],
-    "bin": "heroku",
-    "dirname": "heroku",
-    "scope": "heroku-cli",
-    "npmRegistry": "https://registry.npmjs.org",
-    "macos": {
-      "sign": "Developer ID Installer: Heroku INC",
-      "identifier": "com.heroku.cli"
-    },
-    "windows": {
-      "name": "Heroku CLI"
-    },
-    "topics": {
-      "2fa": {
-        "description": "two-factor authentication",
-        "hidden": true
-      },
-      "access": {
-        "description": "manage user access to apps"
-      },
-      "addons": {
-        "description": "tools and services for developing, extending, and operating your app"
-      },
-      "apps": {
-        "description": "manage apps on Heroku"
-      },
-      "auth": {
-        "description": "manage authentication for your Heroku account"
-      },
-      "authorizations": {
-        "description": "OAuth authorizations"
-      },
-      "buildpacks": {
-        "description": "scripts used to compile apps"
-      },
-      "certs": {
-        "description": "SSL certificates"
-      },
-      "ci": {
-        "description": "test runner for Heroku Pipelines"
-      },
-      "clients": {
-        "description": "OAuth clients on the platform"
-      },
-      "commands": {
-        "hidden": true
-      },
-      "container": {
-        "description": "deploy your Docker-based app to Heroku"
-      },
-      "config": {
-        "description": "environment variables of apps"
-      },
-      "domains": {
-        "description": "custom domains for apps"
-      },
-      "drains": {
-        "description": "forward logs to syslog or HTTPS"
-      },
-      "dyno": {
-        "hidden": true
-      },
-      "features": {
-        "description": "add/remove app features"
-      },
-      "git": {
-        "description": "set git remote and clone Heroku repository"
-      },
-      "keys": {
-        "description": "add/remove account ssh keys"
-      },
-      "labs": {
-        "description": "add/remove experimental features"
-      },
-      "local": {
-        "description": "run Heroku app locally"
-      },
-      "logs": {
-        "description": "display recent log output"
-      },
-      "maintenance": {
-        "description": "enable/disable access to app"
-      },
-      "members": {
-        "description": "manage organization members"
-      },
-      "orgs": {
-        "description": "manage organizations"
-      },
-      "pg": {
-        "description": "manage postgresql databases"
-      },
-      "pipelines": {
-        "description": "manage pipelines"
-      },
-      "ps": {
-        "description": "manage app dynos"
-      },
-      "redis": {
-        "description": "manage heroku redis instances"
-      },
-      "reviewapps": {
-        "description": "manage reviewapps in pipelines"
-      },
-      "run": {
-        "description": "run a one-off process inside a Heroku dyno"
-      },
-      "sessions": {
-        "description": "OAuth sessions"
-      },
-      "stack": {
-        "description": "list available stacks",
-        "hidden": true
-      },
-      "teams": {
-        "description": "manage teams"
-      },
-      "twofactor": {
-        "description": "two-factor authentication",
-        "hidden": true
-      },
-      "update": {
-        "description": "update the Heroku CLI"
-      },
-      "which": {
-        "hidden": true
-      }
-    },
-    "hooks": {
-      "init": [
-        "./lib/hooks/init/version",
-        "./lib/hooks/init/terms-of-service",
-        "./lib/hooks/init/performance_analytics"
-      ],
-      "prerun": [
-        "./lib/hooks/prerun/analytics"
-      ],
-      "postrun": [
-        "./lib/hooks/postrun/performance_analytics"
-      ],
-      "command_not_found": [
-        "./lib/hooks/command_not_found/performance_analytics"
-      ],
-      "update": [
-        "./lib/hooks/update/plugin-migrate",
-        "./lib/hooks/update/brew",
-        "./lib/hooks/update/completions",
-        "./lib/hooks/update/tidy",
-        "./lib/hooks/recache"
-      ],
-      "recache": "./lib/hooks/recache"
-    },
-    "update": {
-      "node": {
-        "version": "22.19.0"
-      },
-      "s3": {
-        "xz": true,
-        "host": "https://cli-assets.heroku.com",
-        "bucket": "heroku-cli-assets"
-      }
-    },
-    "aliases": {
-      "@heroku-cli/config-edit": null,
-      "@heroku-cli/plugin-sudo": "@heroku/sudo",
-      "@heroku/plugin-sudo": "@heroku/sudo",
-      "heroku-api-plugin": "api",
-      "heroku-certs-acm": null,
-      "heroku-cli-api": "api",
-      "heroku-cli-autocomplete": null,
-      "heroku-cli-buildpacks": "buildpack-registry",
-      "heroku-cli-config-edit": null,
-      "heroku-cli-deploy": "java",
-      "heroku-cli-java": "java",
-      "heroku-cli-plugin-generator": null,
-      "heroku-container-registry": null,
-      "heroku-event-log": "@heroku/event-log",
-      "heroku-pg-extras": "@heroku-cli/heroku-pg-extras",
-      "heroku-pipelines": null,
-      "heroku-ps-wait": null,
-      "heroku-redis": null,
-      "heroku-repo": "@heroku-cli/plugin-heroku-repo",
-      "heroku-skynet-cli": "@heroku/skynet",
-      "heroku-splunk": "@heroku/splunk",
-      "heroku-sudo": "@heroku/sudo",
-      "heroku-webhooks": null,
-      "sudo": "@heroku/sudo"
-    }
-  },
   "repository": "heroku/cli",
   "scripts": {
     "build": "rm -rf lib && tsc",
     "build:dev": "rm -rf lib && tsc --sourcemap",
-    "lint": "eslint . --ext .ts --config ../../.eslintrc --ignore-path ../../.eslintignore-lib",
+    "lint": "eslint . --ext .ts --config ../../.eslintrc.cjs",
+    "lint:fix": "eslint . --ext .ts --config ../../.eslintrc.cjs --fix",
     "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
     "coverage:html": "nyc --reporter=html --reporter=text-summary npm run test",
     "coverage:check": "nyc --check-coverage --branches 80 --statements 80 --functions 80 --lines 80 npm run test",
@@ -387,5 +176,5 @@
   },
   "type": "module",
   "types": "lib/index.d.ts",
-  "gitHead": "dd1469c999818976f60fb32e654958be5cdd27d4"
+  "gitHead": "3b90af5356f2d491baf3c8e4b51c6b8eeb5a222c"
 }

package/lib/lib/pg/bastion.js

@@ -1,137 +0,0 @@
-export {};
-/*
-const debug = require('debug')('pg')
-import {APIClient} from '@heroku-cli/command'
-import * as EventEmitter from 'node:events'
-import * as createTunnel from 'tunnel-ssh'
-import {promisify} from 'util'
-import host from './host'
-import {ConnectionDetails} from './util'
-import {ux} from '@oclif/core'
-
-export const getBastion = function (config:Record<string, string>, baseName: string) {
-  // 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} : {}
-}
-
-export const env = (db: ConnectionDetails) => {
-  const baseEnv = Object.assign({
-    PGAPPNAME: 'psql non-interactive',
-    PGSSLMODE: (!db.host || db.host === 'localhost') ? 'prefer' : 'require',
-  }, process.env)
-  const mapping: Record<string, keyof Omit<typeof db, 'url' | 'pathname' | 'bastionHost' | 'bastionKey' | '_tunnel'>> = {
-    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 as string
-    }
-  })
-  return baseEnv
-}
-
-export type TunnelConfig = createTunnel.Config
-
-export function tunnelConfig(db: ConnectionDetails): TunnelConfig {
-  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 as string, 10)) || undefined,
-    localHost,
-    localPort,
-  }
-}
-
-export function getConfigs(db: ConnectionDetails) {
-  const dbEnv: NodeJS.ProcessEnv = env(db)
-  const dbTunnelConfig = tunnelConfig(db)
-  if (db.bastionKey) {
-    Object.assign(dbEnv, {
-      PGPORT: dbTunnelConfig.localPort,
-      PGHOST: dbTunnelConfig.localHost,
-    })
-  }
-
-  return {
-    dbEnv,
-    dbTunnelConfig,
-  }
-}
-
-class Timeout {
-  private readonly timeout: number
-  private readonly message: string
-  private readonly events = new EventEmitter()
-  private timer: NodeJS.Timeout | undefined
-
-  constructor(timeout: number, message: string) {
-    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')
-  }
-}
-
-export async function sshTunnel(db: ConnectionDetails, dbTunnelConfig: TunnelConfig, timeout = 10000) {
-  if (!db.bastionKey) {
-    return null
-  }
-
-  const timeoutInstance = new Timeout(timeout, 'Establishing a secure tunnel timed out')
-  const createSSHTunnel = promisify(createTunnel)
-  try {
-    return await Promise.race([
-      timeoutInstance.promise(),
-      createSSHTunnel(dbTunnelConfig),
-    ])
-  } catch (error) {
-    debug(error)
-    ux.error('Unable to establish a secure tunnel to your database.')
-  } finally {
-    timeoutInstance.cancel()
-  }
-}
-
-export async function fetchConfig(heroku:APIClient, db: {id: string}) {
-  return heroku.get<{host: string, private_key:string}>(
-    `/client/v11/databases/${encodeURIComponent(db.id)}/bastion`,
-    {
-      hostname: host(),
-    },
-  )
-}
-*/

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,9 +0,0 @@
-const responseByAppId = new Map();
-export 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?.body;
-}

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

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

package/lib/lib/pg/host.js

@@ -1,3 +0,0 @@
-export default function () {
-    return process.env.HEROKU_DATA_HOST || 'api.data.heroku.com';
-}

package/lib/lib/spaces/outbound-rules.js

@@ -1,85 +0,0 @@
-export {};
-/*
-import {ux} from '@oclif/core'
-import {hux} from '@heroku/heroku-cli-util'
-
-import * as Heroku from '@heroku-cli/schema'
-
-export function parsePorts(protocol: string, port: string = '') {
-  if (port === '-1' || port === 'any') {
-    if (protocol === 'icmp') {
-      return [0, 255]
-    }
-
-    return [0, 65535]
-  }
-
-  let actual: number[] = []
-  const ports: number[] = port.split('-').map(port => Number.parseInt(port))
-  if (ports.length === 2) {
-    actual = ports
-  } else if (ports.length === 1) {
-    actual = ports.concat(ports)
-  } else {
-    throw new Error('Specified --port range seems incorrect.')
-  }
-
-  if (actual.length !== 2) {
-    throw new Error('Specified --port range seems incorrect.')
-  }
-
-  return actual
-}
-
-export function displayRules(space: string, ruleset: Heroku.OutboundRuleset) {
-  const rules = ruleset.rules || []
-  if (rules.length > 0) {
-    hux.styledHeader('Outbound Rules')
-    display(ruleset.rules)
-  } else {
-    hux.styledHeader(`${space} has no Outbound Rules. Your Dynos cannot communicate with hosts outside of ${space}.`)
-  }
-}
-
-export function displayRulesAsJSON(ruleset: Heroku.OutboundRuleset) {
-  ux.log(JSON.stringify(ruleset, null, 2))
-}
-
-function display(rules: Heroku.OutboundRuleset['rules']) {
-  hux.table(lined(rules), {
-    line: {
-      header: 'Rule Number',
-    },
-    target: {
-      header: 'Destination',
-    },
-    from_port: {
-      header: 'From Port',
-      get: rule => rule.from_port.toString(),
-    },
-    to_port: {
-      header: 'To Port',
-      get: rule => rule.to_port.toString(),
-    },
-    protocol: {
-      header: 'Protocol',
-    },
-  })
-}
-
-function lined(rules: Heroku.OutboundRuleset['rules']) {
-  const lined = []
-  rules = rules || []
-  for (let i = 0, len = rules.length; i < len; i++) {
-    lined.push({
-      line: i + 1,
-      target: rules[i].target,
-      from_port: rules[i].from_port,
-      to_port: rules[i].to_port,
-      protocol: rules[i].protocol,
-    })
-  }
-
-  return lined
-}
-*/

package/lib/oldCommands/autocomplete/create.d.ts

@@ -1 +0,0 @@
-export {};