Env vars to override DB connection

src/dbos-executor.ts

@@ -198,7 +198,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
   static readonly defaultNotificationTimeoutSec = 60;
 
   readonly debugMode: boolean;
-  readonly debugProxy: string | undefined;
   static systemDBSchemaName = 'dbos';
 
   readonly logger: Logger;
@@ -222,7 +221,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
     systemDatabase?: SystemDatabase,
   ) {
     this.debugMode = config.debugMode ?? false;
-    this.debugProxy = config.debugProxy;
 
     // Set configured environment variables
     if (config.env) {
@@ -247,17 +245,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
 
     if (this.debugMode) {
       this.logger.info('Running in debug mode!');
-      if (this.debugProxy) {
-        try {
-          const url = new URL(this.config.debugProxy!);
-          this.config.poolConfig.host = url.hostname;
-          this.config.poolConfig.port = parseInt(url.port, 10);
-          this.logger.info(`Debugging mode proxy: ${this.config.poolConfig.host}:${this.config.poolConfig.port}`);
-        } catch (err) {
-          this.logger.error(err);
-          throw err;
-        }
-      }
     }
 
     this.procedurePool = new Pool(this.config.poolConfig);
@@ -416,7 +403,9 @@ export class DBOSExecutor implements DBOSExecutorContext {
         this.logger.debug(`Loaded ${length} ORM entities`);
       }
 
-      await createDBIfDoesNotExist(this.config.poolConfig, this.logger);
+      if (!this.debugMode) {
+        await createDBIfDoesNotExist(this.config.poolConfig, this.logger);
+      }
       this.configureDbClient();
 
       if (!this.userDatabase) {

src/dbos-runtime/cli.ts

@@ -86,7 +86,7 @@ program
 program
   .command('debug')
   .description('Debug a workflow')
-  .option('-x, --proxy <string>', 'Specify the time-travel debug proxy URL for debugging cloud traces')
+  .option('-x, --proxy <string>', 'Specify the time-travel debug proxy URL for debugging cloud traces (DEPRECATED)')
   .requiredOption('-u, --uuid <string>', 'Specify the workflow UUID to replay')
   .option('-l, --loglevel <string>', 'Specify log level')
   .option('-c, --configfile <string>', 'Specify the config file path (DEPRECATED)')
@@ -95,7 +95,7 @@ program
   .option('--no-app-version', 'ignore DBOS__APPVERSION environment variable')
   .action(async (options: DBOSDebugOptions) => {
     const [dbosConfig, runtimeConfig]: [DBOSConfig, DBOSRuntimeConfig] = parseConfigFile(options);
-    await debugWorkflow(dbosConfig, runtimeConfig, options.uuid, options.proxy);
+    await debugWorkflow(dbosConfig, runtimeConfig, options.uuid);
   });
 
 program

src/dbos-runtime/config.ts

@@ -120,23 +120,31 @@ export function constructPoolConfig(configFile: ConfigFile, cliOptions?: ParseOp
   const databaseConnection = loadDatabaseConnection();
   if (!cliOptions?.skipLoggingInParse) {
     const logger = new GlobalLogger();
-    if (configFile['database']['hostname']) {
+    if (process.env.DBOS_DBHOST) {
+      logger.info('Loading database connection parameters from debug environment variables');
+    } else if (configFile.database.hostname) {
       logger.info('Loading database connection parameters from dbos-config.yaml');
-    } else if (databaseConnection['hostname']) {
+    } else if (databaseConnection.hostname) {
       logger.info('Loading database connection parameters from .dbos/db_connection');
     } else {
       logger.info('Using default database connection parameters');
     }
   }
-  configFile['database']['hostname'] =
-    configFile['database']['hostname'] || databaseConnection['hostname'] || 'localhost';
-  configFile['database']['port'] = configFile['database']['port'] || databaseConnection['port'] || 5432;
-  configFile['database']['username'] =
-    configFile['database']['username'] || databaseConnection['username'] || 'postgres';
-  configFile['database']['password'] =
-    configFile['database']['password'] || databaseConnection['password'] || process.env.PGPASSWORD || 'dbos';
-  configFile['database']['local_suffix'] =
-    configFile['database']['local_suffix'] || databaseConnection['local_suffix'] || false;
+  configFile.database.hostname =
+    process.env.DBOS_DBHOST ?? configFile.database.hostname ?? databaseConnection.hostname ?? 'localhost';
+  const dbos_dbport = process.env.DBOS_DBPORT ? parseInt(process.env.DBOS_DBPORT) : undefined;
+  configFile.database.port = dbos_dbport ?? configFile.database.port ?? databaseConnection.port ?? 5432;
+  configFile.database.username =
+    process.env.DBOS_DBUSER ?? configFile.database.username ?? databaseConnection.username ?? 'postgres';
+  configFile.database.password =
+    process.env.DBOS_DBPASSWORD ??
+    configFile.database.password ??
+    databaseConnection.password ??
+    process.env.PGPASSWORD ??
+    'dbos';
+  const dbos_dblocalsuffix = process.env.DBOS_DBLOCALSUFFIX ? process.env.DBOS_DBLOCALSUFFIX === 'true' : undefined;
+  configFile.database.local_suffix =
+    dbos_dblocalsuffix ?? configFile.database.local_suffix ?? databaseConnection.local_suffix ?? false;
 
   let databaseName: string | undefined = configFile.database.app_db_name;
   if (databaseName === undefined) {

src/dbos-runtime/debug.ts

@@ -3,13 +3,8 @@ import { DBOSFailLoadOperationsError, DBOSInitializationError, DBOSNotRegistered
 import { GlobalLogger } from '../telemetry/logs';
 import { DBOSRuntime, DBOSRuntimeConfig } from './runtime';
 
-export async function debugWorkflow(
-  dbosConfig: DBOSConfig,
-  runtimeConfig: DBOSRuntimeConfig,
-  workflowUUID: string,
-  proxy?: string,
-) {
-  dbosConfig = { ...dbosConfig, debugProxy: proxy, debugMode: true };
+export async function debugWorkflow(dbosConfig: DBOSConfig, runtimeConfig: DBOSRuntimeConfig, workflowUUID: string) {
+  dbosConfig = { ...dbosConfig, debugMode: true };
   const logger = new GlobalLogger();
   try {
     const dbosExec = new DBOSExecutor(dbosConfig);
@@ -31,11 +26,7 @@ export async function debugWorkflow(
       for (const err of e.errors) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (err.code && err.code === 'ECONNREFUSED') {
-          if (proxy !== undefined) {
-            console.error('\x1b[31m%s\x1b[0m', `Is DBOS time-travel debug proxy running at ${proxy} ?`);
-          } else {
-            console.error('\x1b[31m%s\x1b[0m', `Is database running at ${dbosConfig.poolConfig.host} ?`);
-          }
+          console.error('\x1b[31m%s\x1b[0m', `Is database running at ${dbosConfig.poolConfig.host} ?`);
           break;
         }
       }

tsconfig.build.json

@@ -1,4 +1,5 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["src/**/*", "schemas/**/*"]
+  "include": ["src/**/*", "schemas/**/*"],
+  "exclude": ["dist/**"]
 }