@heroku/heroku-cli-util 9.1.3-beta.6 → 9.1.3-beta.8

package/dist/utils/pg/bastion.d.ts

@@ -1,7 +1,7 @@
 import type { APIClient } from '@heroku-cli/command';
 import { Server } from 'node:net';
 import { ExtendedAddonAttachment } from '../../types/pg/data-api';
-import { BastionConfig, ConnectionDetailsWithAttachment, TunnelConfig } from '../../types/pg/tunnel';
+import { BastionConfig, ConnectionDetails, TunnelConfig } from '../../types/pg/tunnel';
 /**
  * Determines whether the attachment belongs to an add-on installed onto a non-shield Private Space.
  * If true, the bastion information needs to be fetched from the Data API.
@@ -43,7 +43,7 @@ export declare const getBastionConfig: (config: Record<string, string>, baseName
  * @param connectionDetails - The database connection details with attachment information
  * @returns Object containing database environment variables and tunnel configuration
  */
-export declare function getPsqlConfigs(connectionDetails: ConnectionDetailsWithAttachment): {
+export declare function getPsqlConfigs(connectionDetails: ConnectionDetails): {
     dbEnv: NodeJS.ProcessEnv;
     dbTunnelConfig: TunnelConfig;
 };
@@ -58,7 +58,7 @@ export type PsqlConfigs = ReturnType<typeof getPsqlConfigs>;
  * @returns Promise that resolves to the tunnel server or null if no bastion key is provided
  * @throws Error if unable to establish the tunnel
  */
-export declare function sshTunnel(connectionDetails: ConnectionDetailsWithAttachment, dbTunnelConfig: TunnelConfig, timeout?: number, createSSHTunnel?: typeof createSSHTunnelAdapter): Promise<Server | void>;
+export declare function sshTunnel(connectionDetails: ConnectionDetails, dbTunnelConfig: TunnelConfig, timeout?: number, createSSHTunnel?: typeof createSSHTunnelAdapter): Promise<Server | void>;
 /**
  * Adapter for tunnel-ssh v5 API. Translates our TunnelConfig into the v5
  * createTunnel(tunnelOptions, serverOptions, sshOptions, forwardOptions) call

package/dist/utils/pg/databases.d.ts

@@ -57,7 +57,7 @@ export default class DatabaseResolver {
      * @param config - The record of app config vars with their values
      * @returns Connection details with attachment information
      */
-    private getConnectionDetails;
+    getConnectionDetails(attachment: ExtendedAddonAttachment, config?: Record<string, string>): ConnectionDetailsWithAttachment;
     /**
      * Helper function that attempts to find a single addon attachment matching the given database identifier
      * (attachment name, id, or config var name).

package/dist/utils/pg/databases.js

@@ -130,6 +130,7 @@ class DatabaseResolver {
      * @param config - The record of app config vars with their values
      * @returns Connection details with attachment information
      */
+    // eslint-disable-next-line perfectionist/sort-classes
     getConnectionDetails(attachment, config = {}) {
         const connStringVar = (0, config_vars_1.getConfigVarNameFromAttachment)(attachment, config);
         // build the default payload for non-bastion dbs

package/dist/utils/pg/psql.d.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 import { Server } from 'node:net';
-import { ConnectionDetailsWithAttachment, TunnelConfig } from '../../types/pg/tunnel';
+import { ConnectionDetails, TunnelConfig } from '../../types/pg/tunnel';
 import { getPsqlConfigs, sshTunnel } from './bastion';
 /**
  * A small wrapper around tunnel-ssh so that other code doesn't have to worry about whether there is or is not a tunnel.
@@ -22,7 +22,7 @@ export declare class Tunnel {
      * @param tunnelFn - The function to create the SSH tunnel (default: sshTunnel)
      * @returns Promise that resolves to a new Tunnel instance
      */
-    static connect(connectionDetails: ConnectionDetailsWithAttachment, tunnelConfig: TunnelConfig, tunnelFn: typeof sshTunnel): Promise<Tunnel>;
+    static connect(connectionDetails: ConnectionDetails, tunnelConfig: TunnelConfig, tunnelFn: typeof sshTunnel): Promise<Tunnel>;
     /**
      * Closes the tunnel if it exists, or emits a fake close event if no tunnel is needed.
      *
@@ -42,7 +42,7 @@ export default class PsqlService {
     private readonly getPsqlConfigsFn;
     private readonly spawnFn;
     private readonly tunnelFn;
-    constructor(connectionDetails: ConnectionDetailsWithAttachment, getPsqlConfigsFn?: typeof getPsqlConfigs, spawnFn?: typeof spawn, tunnelFn?: typeof sshTunnel);
+    constructor(connectionDetails: ConnectionDetails, getPsqlConfigsFn?: typeof getPsqlConfigs, spawnFn?: typeof spawn, tunnelFn?: typeof sshTunnel);
     /**
      * Executes a PostgreSQL query using the instance's database connection details.
      * It uses the `getPsqlConfigs` function to get the configuration for the database and the tunnel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/heroku-cli-util",
-  "version": "9.1.3-beta.6",
+  "version": "9.1.3-beta.8",
   "description": "Set of helpful CLI utilities",
   "author": "Heroku",
   "license": "ISC",