underpost 3.0.2 → 3.1.0

package/src/cli/db.js

@@ -6,15 +6,30 @@
  * Supports MariaDB and MongoDB with import/export capabilities, Git integration, and multi-pod operations.
  */
 
-import { mergeFile, splitFileFactory } from '../server/conf.js';
+import { mergeFile, splitFileFactory, loadConfServerJson, resolveConfSecrets } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
-import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
+import { loadReplicas, pathPortAssignmentFactory, loadCronDeployEnv } from '../server/conf.js';
 import Underpost from '../index.js';
 const logger = loggerFactory(import.meta);
 
+/**
+ * Redacts credentials from shell command strings before logging.
+ * Masks passwords in `-p<password>`, `--password=<password>`, and `-P <password>` patterns.
+ * @param {string} cmd - The raw command string.
+ * @memberof UnderpostDB
+ * @returns {string} The command with credentials replaced by `***`.
+ */
+const sanitizeCommand = (cmd) => {
+  if (typeof cmd !== 'string') return cmd;
+  return cmd
+    .replace(/-p['"]?[^\s'"]+/g, '-p***')
+    .replace(/--password=['"]?[^\s'"]+/g, '--password=***')
+    .replace(/-P\s+['"]?[^\s'"]+/g, '-P ***');
+};
+
 /**
  * Constants for database operations
  * @constant {number} MAX_BACKUP_RETENTION - Maximum number of backups to retain
@@ -133,10 +148,10 @@ class UnderpostDB {
       const { context = '' } = options;
 
       try {
-        logger.info(`Executing kubectl command`, { command, context });
-        return shellExec(command, { stdout: true });
+        logger.info(`Executing kubectl command`, { command: sanitizeCommand(command), context });
+        return shellExec(command, { stdout: true, disableLog: true });
       } catch (error) {
-        logger.error(`kubectl command failed`, { command, error: error.message, context });
+        logger.error(`kubectl command failed`, { command: sanitizeCommand(command), error: error.message, context });
         throw error;
       }
     },
@@ -200,11 +215,30 @@ class UnderpostDB {
         const kubectlCmd = `sudo kubectl exec -n ${namespace} -i ${podName} -- sh -c "${command}"`;
         return Underpost.db._executeKubectl(kubectlCmd, { context: `exec in pod ${podName}` });
       } catch (error) {
-        logger.error('Failed to execute command in pod', { podName, command, error: error.message });
+        logger.error('Failed to execute command in pod', {
+          podName,
+          command: sanitizeCommand(command),
+          error: error.message,
+        });
         throw error;
       }
     },
 
+    /**
+     * Helper: Resolves the latest backup timestamp from an existing backup directory.
+     * Scans the directory for numeric (epoch) sub-folders and returns the most recent one.
+     * @method _getLatestBackupTimestamp
+     * @memberof UnderpostDB
+     * @param {string} backupDir - Path to the host-folder backup directory.
+     * @return {string|null} The latest timestamp string, or null if none found.
+     */
+    _getLatestBackupTimestamp(backupDir) {
+      if (!fs.existsSync(backupDir)) return null;
+      const entries = fs.readdirSync(backupDir).filter((e) => /^\d+$/.test(e));
+      if (entries.length === 0) return null;
+      return entries.sort((a, b) => parseInt(b) - parseInt(a))[0];
+    },
+
     /**
      * Helper: Manages Git repository for backups.
      * @method _manageGitRepo
@@ -275,55 +309,6 @@ class UnderpostDB {
       }
     },
 
-    /**
-     * Helper: Manages backup timestamps and cleanup.
-     * @method _manageBackupTimestamps
-     * @memberof UnderpostDB
-     * @param {string} backupPath - Backup directory path.
-     * @param {number} newTimestamp - New backup timestamp.
-     * @param {boolean} shouldCleanup - Whether to cleanup old backups.
-     * @return {Object} Backup info with current and removed timestamps.
-     */
-    _manageBackupTimestamps(backupPath, newTimestamp, shouldCleanup) {
-      try {
-        if (!fs.existsSync(backupPath)) {
-          fs.mkdirSync(backupPath, { recursive: true });
-        }
-
-        // Delete empty folders
-        shellExec(`cd ${backupPath} && find . -type d -empty -delete`);
-
-        const times = fs.readdirSync(backupPath);
-        const validTimes = times.map((t) => parseInt(t)).filter((t) => !isNaN(t));
-
-        const currentBackupTimestamp = validTimes.length > 0 ? Math.max(...validTimes) : null;
-        const removeBackupTimestamp = validTimes.length > 0 ? Math.min(...validTimes) : null;
-
-        // Cleanup old backups if we have too many
-        if (shouldCleanup && validTimes.length >= MAX_BACKUP_RETENTION && removeBackupTimestamp) {
-          const removeDir = `${backupPath}/${removeBackupTimestamp}`;
-          logger.info('Removing old backup', { path: removeDir });
-          fs.removeSync(removeDir);
-        }
-
-        // Create new backup directory
-        if (shouldCleanup) {
-          const newBackupDir = `${backupPath}/${newTimestamp}`;
-          logger.info('Creating new backup directory', { path: newBackupDir });
-          fs.mkdirSync(newBackupDir, { recursive: true });
-        }
-
-        return {
-          current: currentBackupTimestamp,
-          removed: removeBackupTimestamp,
-          count: validTimes.length,
-        };
-      } catch (error) {
-        logger.error('Error managing backup timestamps', { backupPath, error: error.message });
-        return { current: null, removed: null, count: 0 };
-      }
-    },
-
     /**
      * Helper: Performs MariaDB import operation.
      * @method _importMariaDB
@@ -624,7 +609,7 @@ class UnderpostDB {
         logger.info('Getting MariaDB table statistics', { podName, dbName });
 
         const command = `sudo kubectl exec -n ${namespace} -i ${podName} -- mariadb -u ${user} -p${password} ${dbName} -e "SELECT TABLE_NAME as 'table', TABLE_ROWS as 'count' FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${dbName}' ORDER BY TABLE_NAME;" --skip-column-names --batch`;
-        const output = shellExec(command, { stdout: true, silent: true });
+        const output = shellExec(command, { stdout: true, silent: true, disableLog: true });
 
         if (!output || output.trim() === '') {
           logger.warn('No tables found or empty output');
@@ -788,6 +773,7 @@ class UnderpostDB {
         kind: false,
       },
     ) {
+      loadCronDeployEnv();
       const newBackupTimestamp = new Date().getTime();
       const namespace = options.ns && typeof options.ns === 'string' ? options.ns : 'default';
 
@@ -844,7 +830,7 @@ class UnderpostDB {
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
+        const confServer = loadConfServerJson(confServerPath, { resolve: true });
 
         // Build database configuration map
         for (const host of Object.keys(confServer)) {
@@ -943,16 +929,11 @@ class UnderpostDB {
 
             logger.info('Processing database', { hostFolder, provider, dbName, deployId });
 
-            const backUpPath = `../${repoName}/${hostFolder}`;
-            const backupInfo = Underpost.db._manageBackupTimestamps(
-              backUpPath,
-              newBackupTimestamp,
-              options.export === true,
-            );
+            const latestBackupTimestamp = Underpost.db._getLatestBackupTimestamp(`../${repoName}/${hostFolder}`);
 
-            dbs[provider][dbName].currentBackupTimestamp = backupInfo.current;
+            dbs[provider][dbName].currentBackupTimestamp = latestBackupTimestamp;
 
-            const currentTimestamp = backupInfo.current || newBackupTimestamp;
+            const currentTimestamp = latestBackupTimestamp || newBackupTimestamp;
             const sqlContainerPath = `/home/${dbName}.sql`;
             const fromPartsPath = `../${repoName}/${hostFolder}/${currentTimestamp}/${dbName}-parths.json`;
             const toSqlPath = `../${repoName}/${hostFolder}/${currentTimestamp}/${dbName}.sql`;
@@ -1149,6 +1130,7 @@ class UnderpostDB {
       host = process.env.DEFAULT_DEPLOY_HOST,
       path = process.env.DEFAULT_DEPLOY_PATH,
     ) {
+      loadCronDeployEnv();
       deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
       host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
       path = path ? path : process.env.DEFAULT_DEPLOY_PATH;
@@ -1171,7 +1153,7 @@ class UnderpostDB {
         throw new Error(`Server configuration not found: ${confServerPath}`);
       }
 
-      const { db } = JSON.parse(fs.readFileSync(confServerPath, 'utf8'))[host][path];
+      const { db } = loadConfServerJson(confServerPath, { resolve: true })[host][path];
 
       try {
         await DataBaseProvider.load({ apis: ['instance', 'cron'], host, path, db });
@@ -1194,7 +1176,7 @@ class UnderpostDB {
             continue;
           }
 
-          const confServer = loadReplicas(deployId, JSON.parse(fs.readFileSync(confServerPath, 'utf8')));
+          const confServer = loadReplicas(deployId, loadConfServerJson(confServerPath, { resolve: true }));
           const router = await Underpost.deploy.routerFactory(deployId, env);
           const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
 
@@ -1257,7 +1239,7 @@ class UnderpostDB {
           }
         }
       } catch (error) {
-        logger.error('Failed to create instance metadata', { error: error.message, stack: error.stack });
+        logger.error('Failed to create instance metadata', { error: error.message });
         throw error;
       }
 
@@ -1297,7 +1279,7 @@ class UnderpostDB {
           await new Cron(body).save();
         }
       } catch (error) {
-        logger.error('Failed to create cron metadata', { error: error.message, stack: error.stack });
+        logger.error('Failed to create cron metadata', { error: error.message });
       }
 
       await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
@@ -1325,6 +1307,7 @@ class UnderpostDB {
         dryRun: false,
       },
     ) {
+      loadCronDeployEnv();
       if (deployList === 'dd') deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
 
       logger.info('Starting File collection cleanup', { deployList, options });
@@ -1359,7 +1342,7 @@ class UnderpostDB {
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
+        const confServer = loadConfServerJson(confServerPath, { resolve: true });
 
         // Process each host+path combination
         for (const host of Object.keys(confServer)) {
@@ -1499,7 +1482,6 @@ class UnderpostDB {
                 host,
                 path,
                 error: error.message,
-                stack: error.stack,
               });
             }
           }
@@ -1553,6 +1535,7 @@ class UnderpostDB {
         crons: false,
       },
     ) {
+      loadCronDeployEnv();
       deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
       host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
       path = path ? path : process.env.DEFAULT_DEPLOY_PATH;

package/src/cli/deploy.js

@@ -11,6 +11,7 @@ import {
   Config,
   deployRangePortFactory,
   getDataDeploy,
+  loadConfServerJson,
   loadReplicas,
   pathPortAssignmentFactory,
 } from '../server/conf.js';
@@ -132,7 +133,7 @@ class UnderpostDeploy {
           `npm install -g npm@11.2.0`,
           `npm install -g underpost`,
           `underpost secret underpost --create-from-file /etc/config/.env.${env}`,
-          `underpost start --build --run --underpost-quickly-install ${deployId} ${env}`,
+          `underpost start --build --run ${deployId} ${env}`,
         ];
       const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
       if (!volumes)
@@ -230,7 +231,7 @@ spec:
         if (!deployId) continue;
         const confServer = loadReplicas(
           deployId,
-          JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+          loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`),
         );
         const router = await Underpost.deploy.routerFactory(deployId, env);
         const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
@@ -259,6 +260,27 @@ ${Underpost.deploy
         }
         fs.writeFileSync(`./engine-private/conf/${deployId}/build/${env}/deployment.yaml`, deploymentYamlParts, 'utf8');
 
+        const confVolume = fs.existsSync(`./engine-private/conf/${deployId}/conf.volume.json`)
+          ? JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.volume.json`, 'utf8'))
+          : [];
+        if (confVolume.length > 0) {
+          let volumeYaml = '';
+          for (const deploymentVersion of deploymentVersions) {
+            for (const volume of confVolume) {
+              if (!volume.claimName) continue;
+              const pvcId = `${volume.claimName}-${deployId}-${env}-${deploymentVersion}`;
+              const pvId = pvcId.replace(/^pvc-/, 'pv-');
+              const hostPath = `/home/dd/engine/volume/${pvId}`;
+              volumeYaml += `---\n${Underpost.deploy.persistentVolumeFactory({
+                pvcId,
+                namespace: options.namespace,
+                hostPath,
+              })}\n`;
+            }
+          }
+          fs.writeFileSync(`./engine-private/conf/${deployId}/build/${env}/pv-pvc.yaml`, volumeYaml, 'utf8');
+        }
+
         let proxyYaml = '';
         let secretYaml = '';
         const customServices = fs.existsSync(`./engine-private/conf/${deployId}/conf.services.json`)
@@ -335,7 +357,7 @@ ${Underpost.deploy
           const yamlPath = `./engine-private/conf/${deployId}/build/${env}/secret.yaml`;
           fs.writeFileSync(yamlPath, secretYaml, 'utf8');
         } else {
-          const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml'];
+          const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'pv-pvc.yaml'];
           for (const file of deploymentsFiles) {
             if (fs.existsSync(`./engine-private/conf/${deployId}/build/${env}/${file}`)) {
               fs.copyFileSync(
@@ -385,7 +407,7 @@ spec:
       // kubectl get deploy,sts,svc,configmap,secret -n default -o yaml --export > default.yaml
       const hostTest = options?.hostTest
         ? options.hostTest
-        : Object.keys(JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')))[0];
+        : Object.keys(loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`))[0];
       const info = shellExec(`sudo kubectl get HTTPProxy/${hostTest} -n ${options.namespace} -o yaml`, {
         silent: true,
         stdout: true,
@@ -550,7 +572,7 @@ EOF`);
       if (!(options.versions && typeof options.versions === 'string')) options.versions = 'blue,green';
       if (!options.replicas) options.replicas = 1;
       if (options.sync)
-        getDataDeploy({
+        await getDataDeploy({
           buildSingleReplica: true,
         });
       if (options.buildManifest === true) await Underpost.deploy.buildManifest(deployList, env, options);
@@ -591,7 +613,7 @@ EOF`);
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
+        const confServer = loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`);
         const confVolume = fs.existsSync(`./engine-private/conf/${deployId}/conf.volume.json`)
           ? JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.volume.json`, 'utf8'))
           : [];
@@ -844,6 +866,7 @@ EOF`);
 ${Underpost.deploy.persistentVolumeFactory({
   hostPath: rootVolumeHostPath,
   pvcId,
+  namespace,
 })}
 EOF
 `);
@@ -914,15 +937,44 @@ EOF
      * @param {object} options - Options for the persistent volume and claim creation.
      * @param {string} options.hostPath - Host path for the persistent volume.
      * @param {string} options.pvcId - Persistent volume claim ID.
+     * @param {string} [options.namespace='default'] - Kubernetes namespace for the PVC claimRef.
      * @returns {string} - YAML configuration for the persistent volume and claim.
      * @memberof UnderpostDeploy
      */
-    persistentVolumeFactory({ hostPath, pvcId }) {
-      return fs
-        .readFileSync(`./manifests/pv-pvc-dd.yaml`, 'utf8')
-        .replace('/home/dd', hostPath)
-        .replace('pv-dd', pvcId.replace('pvc-', 'pv-'))
-        .replace('pvc-dd', pvcId);
+    persistentVolumeFactory({ hostPath, pvcId, namespace = 'default' }) {
+      const pvId = pvcId.replace(/^pvc-/, 'pv-');
+      return `apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: ${pvId}
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: ${pvcId}
+    namespace: ${namespace}
+  hostPath:
+    path: ${hostPath}
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ${pvcId}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: ${pvId}
+  resources:
+    requests:
+      storage: 5Gi`;
     },
 
     /**

package/src/cli/env.js

@@ -10,12 +10,10 @@ import { loggerFactory } from '../server/logger.js';
 import dotenv from 'dotenv';
 import { pbcopy } from '../server/process.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**
- * @class UnderpostEnv
+ * @class UnderpostRootEnv
  * @description Manages the environment variables of the underpost root.
  * @memberof UnderpostEnv
  */
@@ -41,7 +39,9 @@ class UnderpostRootEnv {
       if (options.build) {
         const deployIdList = options.deployId
           ? [options.deployId]
-          : fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',');
+          : fs.existsSync(`./engine-private/deploy/dd.router`)
+            ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(',')
+            : [DEFAULT_DEPLOY_ID];
         for (const deployId of deployIdList)
           for (const envFile of ['test', 'development', 'production'])
             _set(`./engine-private/conf/${deployId}/.env.${envFile}`, key, value);

package/src/cli/fs.js

@@ -6,14 +6,12 @@
 
 import { v2 as cloudinary } from 'cloudinary';
 import { loggerFactory } from '../server/logger.js';
-import dotenv from 'dotenv';
 import AdmZip from 'adm-zip';
 import * as dir from 'path';
 import fs from 'fs-extra';
 import Downloader from '../server/downloader.js';
 import { shellExec } from '../server/process.js';
 import Underpost from '../index.js';
-dotenv.config();
 
 const logger = loggerFactory(import.meta);
 

package/src/cli/image.js

@@ -5,14 +5,11 @@
  */
 
 import fs from 'fs-extra';
-import dotenv from 'dotenv';
 import { loggerFactory } from '../server/logger.js';
 import Underpost from '../index.js';
 import { getNpmRootPath, getUnderpostRootPath } from '../server/conf.js';
 import { shellExec } from '../server/process.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**

package/src/cli/index.js

@@ -7,11 +7,10 @@ import { commitData } from '../client/components/core/CommonJs.js';
 
 import Underpost from '../index.js';
 
-const underpostRootPath = getUnderpostRootPath();
+const underpostGlobalEnv = `${getUnderpostRootPath()}/.env`;
 
-fs.existsSync(`${underpostRootPath}/.env`)
-  ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
-  : dotenv.config();
+if (fs.existsSync(underpostGlobalEnv)) dotenv.config({ path: underpostGlobalEnv, override: true });
+else dotenv.config();
 
 const program = new Command();
 
@@ -27,6 +26,10 @@ program
   .option('--build', 'Build the deployment to pwa-microservices-template (requires --deploy-id)')
   .option('--clean-template', 'Clean the build directory (pwa-microservices-template)')
   .option('--sync-conf', 'Sync configuration to private repositories (requires --deploy-id)')
+  .option(
+    '--sync-start',
+    "Sync start scripts in deploy ID package.json with root package.json (use 'dd' as --deploy-id to sync all dd.router)",
+  )
   .option('--purge', 'Remove deploy ID conf and all related repositories (requires --deploy-id)')
   .option('--dev', 'Sets the development cli context')
   .option('--default-conf', 'Create default deploy ID conf env files')
@@ -34,6 +37,17 @@ program
   .description('Initializes a new Underpost project, service, or configuration.')
   .action(Underpost.repo.new);
 
+program
+  .command('client')
+  .argument('[deploy-id]', 'The deployment ID to build.', 'dd-default')
+  .argument('[sub-conf]', 'The sub-configuration for the build.', '')
+  .argument('[host]', 'Comma-separated hosts to filter the build.', '')
+  .argument('[path]', 'Comma-separated paths to filter the build.', '')
+  .option('--sync-env-port', 'Sync environment port assignments across all deploy IDs')
+  .option('--single-replica', 'Build single replica folders instead of full client')
+  .description('Builds client assets, single replicas, and/or syncs environment ports.')
+  .action(Underpost.repo.client);
+
 program
   .command('start')
   .argument('<deploy-id>', 'The unique identifier for the deployment configuration.')
@@ -51,7 +65,7 @@ program
   .command('clone')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .option('--bare', 'Performs a bare clone, downloading only the .git files.')
-  .option('-g8', 'Uses the g8 repository extension for cloning.')
+  .option('--g8', 'Uses the g8 repository extension for cloning.')
   .description('Clones a specified GitHub repository into the current directory.')
   .action(Underpost.repo.clone);
 
@@ -60,7 +74,7 @@ program
   .argument('<path>', 'The absolute or relative directory path where the repository is located.')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .description('Pulls the latest changes from a specified GitHub repository.')
-  .option('-g8', 'Uses the g8 repository extension for pulling.')
+  .option('--g8', 'Uses the g8 repository extension for pulling.')
   .action(Underpost.repo.pull);
 
 program
@@ -90,6 +104,7 @@ program
     '--changelog-no-hash',
     'Excludes commit hashes from the generated changelog entries (used with --changelog-build).',
   )
+  .option('-b', 'Shows the current Git branch name.')
   .description('Manages commits to a GitHub repository, supporting various commit types and options.')
   .action(Underpost.repo.commit);
 
@@ -98,7 +113,7 @@ program
   .argument('<path>', 'The absolute or relative directory path of the repository.')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
   .option('-f', 'Forces the push, overwriting the remote repository history.')
-  .option('-g8', 'Uses the g8 repository extension for pushing.')
+  .option('--g8', 'Uses the g8 repository extension for pushing.')
   .description('Pushes committed changes from a local repository to a remote GitHub repository.')
   .action(Underpost.repo.push);
 
@@ -112,11 +127,11 @@ program
   .argument('[subConf]', 'Optional: The sub configuration to set.')
   .description('Sets environment variables and configurations related to a specific deployment ID.')
   .action((deployId, env, subConf) => {
-    if (fs.existsSync(`./engine-private/conf/${deployId}/.env.${env}`))
-      dotenv.config({ path: `./engine-private/conf/${deployId}/.env.${env}`, override: true });
-    else if (deployId === 'root') {
-      deployId = Underpost.env.get('DEPLOY_ID');
-    } else dotenv.config({ path: `./.env`, override: true });
+    if (deployId === 'root') {
+      const underpostRootDeployId = Underpost.env.get('DEPLOY_ID');
+      if (underpostRootDeployId) deployId = underpostRootDeployId;
+    }
+    if (env) process.env.NODE_ENV = env;
     loadConf(deployId, subConf);
   });
 
@@ -556,7 +571,6 @@ program
   .option('--force', 'Forces operation, overriding any warnings or conflicts.')
   .option('--tls', 'Enables TLS for the runner execution.')
   .option('--reset', 'Resets the runner state before execution.')
-  .option('--terminal', 'Enables terminal mode for interactive script execution.')
   .option('--dev-proxy-port-offset <port-offset>', 'Sets a custom port offset for development proxy.')
   .option('--host-network', 'Enables host network mode for the runner execution.')
   .option('--requests-memory <requests-memory>', 'Requests memory limit for the runner execution.')
@@ -612,6 +626,12 @@ program
     '--create-job-now',
     'After applying cron manifests, immediately create a Job from each CronJob (forwarded to cron runner).',
   )
+  .option(
+    '--host-aliases <host-aliases>',
+    'Adds entries to the Pod /etc/hosts via hostAliases. ' +
+      'Format: semicolon-separated entries of "ip=hostname1,hostname2" ' +
+      '(e.g., "127.0.0.1=foo.local,bar.local;10.1.2.3=foo.remote,bar.remote").',
+  )
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 

package/src/cli/monitor.js

@@ -4,7 +4,7 @@
  * @namespace UnderpostMonitor
  */
 
-import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
+import { loadReplicas, pathPortAssignmentFactory, loadConfServerJson, loadCronDeployEnv } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import axios from 'axios';
 import fs from 'fs-extra';
@@ -71,6 +71,7 @@ class UnderpostMonitor {
       commanderOptions,
       auxRouter,
     ) {
+      loadCronDeployEnv();
       if (!options.namespace) options.namespace = 'default';
       if (!options.replicas) options.replicas = '1';
       if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
@@ -100,7 +101,7 @@ class UnderpostMonitor {
 
       const confServer = loadReplicas(
         deployId,
-        JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+        loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`),
       );
 
       const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
@@ -127,7 +128,7 @@ class UnderpostMonitor {
 
       const switchTraffic = (targetTraffic) => {
         const nextTraffic = targetTraffic ?? (traffic === 'blue' ? 'green' : 'blue');
-        // Delegate traffic switching to centralized deploy implementation so behavior is consistent
+        // Delegate traffic switching to deploy implementation so behavior is consistent
         Underpost.deploy.switchTraffic(deployId, env, nextTraffic, options.replicas, options.namespace, options);
         // Keep local traffic in sync with the environment
         traffic = nextTraffic;
@@ -168,9 +169,7 @@ class UnderpostMonitor {
                   switch (options.type) {
                     case 'blue-green':
                     default: {
-                      const confServer = JSON.parse(
-                        fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
-                      );
+                      const confServer = loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`);
 
                       const namespace = options.namespace;
                       Underpost.deploy.configMap(env, namespace);