@underpostnet/underpost 2.98.3 → 2.99.0

package/src/cli/cluster.js

@@ -7,11 +7,9 @@
 import { getNpmRootPath } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
-import UnderpostBaremetal from './baremetal.js';
-import UnderpostDeploy from './deploy.js';
-import UnderpostTest from './test.js';
 import os from 'os';
 import fs from 'fs-extra';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -103,21 +101,21 @@ class UnderpostCluster {
       },
     ) {
       // Handles initial host setup (installing docker, podman, kind, kubeadm, helm)
-      if (options.initHost === true) return UnderpostCluster.API.initHost();
+      if (options.initHost === true) return Underpost.cluster.initHost();
 
       // Handles initial host setup (installing docker, podman, kind, kubeadm, helm)
-      if (options.uninstallHost === true) return UnderpostCluster.API.uninstallHost();
+      if (options.uninstallHost === true) return Underpost.cluster.uninstallHost();
 
       // Applies general host configuration (SELinux, containerd, sysctl)
-      if (options.config === true) return UnderpostCluster.API.config();
+      if (options.config === true) return Underpost.cluster.config();
 
       // Sets up kubectl configuration for the current user
-      if (options.chown === true) return UnderpostCluster.API.chown();
+      if (options.chown === true) return Underpost.cluster.chown();
 
       const npmRoot = getNpmRootPath();
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
 
-      if (options.listPods === true) return console.table(UnderpostDeploy.API.get(podName ?? undefined));
+      if (options.listPods === true) return console.table(Underpost.deploy.get(podName ?? undefined));
       // Set default namespace if not specified
       if (!options.namespace) options.namespace = 'default';
 
@@ -143,22 +141,22 @@ class UnderpostCluster {
 
       // Reset Kubernetes cluster components (Kind/Kubeadm/K3s) and container runtimes
       if (options.reset === true)
-        return await UnderpostCluster.API.safeReset({
+        return await Underpost.cluster.safeReset({
           underpostRoot,
           removeVolumeHostPaths: options.removeVolumeHostPaths,
         });
 
       // Check if a cluster (Kind, Kubeadm, or K3s) is already initialized
-      const alreadyKubeadmCluster = UnderpostDeploy.API.get('calico-kube-controllers')[0];
-      const alreadyKindCluster = UnderpostDeploy.API.get('kube-apiserver-kind-control-plane')[0];
+      const alreadyKubeadmCluster = Underpost.deploy.get('calico-kube-controllers')[0];
+      const alreadyKindCluster = Underpost.deploy.get('kube-apiserver-kind-control-plane')[0];
       // K3s pods often contain 'svclb-traefik' in the kube-system namespace
-      const alreadyK3sCluster = UnderpostDeploy.API.get('svclb-traefik')[0];
+      const alreadyK3sCluster = Underpost.deploy.get('svclb-traefik')[0];
 
       // --- Kubeadm/Kind/K3s Cluster Initialization ---
       // This block handles the initial setup of the Kubernetes cluster (control plane or worker).
       // It prevents re-initialization if a cluster is already detected.
       if (!options.worker && !alreadyKubeadmCluster && !alreadyKindCluster && !alreadyK3sCluster) {
-        UnderpostCluster.API.config();
+        Underpost.cluster.config();
         if (options.k3s === true) {
           logger.info('Initializing K3s control plane...');
           // Install K3s
@@ -173,7 +171,7 @@ class UnderpostCluster {
 
           // Configure kubectl for the current user for K3s *before* checking readiness
           // This ensures kubectl can find the K3s kubeconfig immediately after K3s installation.
-          UnderpostCluster.API.chown('k3s');
+          Underpost.cluster.chown('k3s');
 
           // Wait for K3s to be ready
           logger.info('Waiting for K3s to be ready...');
@@ -226,7 +224,7 @@ class UnderpostCluster {
             `sudo kubeadm init --pod-network-cidr=${podNetworkCidr} --control-plane-endpoint="${controlPlaneEndpoint}"`,
           );
           // Configure kubectl for the current user
-          UnderpostCluster.API.chown('kubeadm'); // Pass 'kubeadm' to chown
+          Underpost.cluster.chown('kubeadm'); // Pass 'kubeadm' to chown
 
           // Install Calico CNI
           logger.info('Installing Calico CNI...');
@@ -254,7 +252,7 @@ class UnderpostCluster {
               options?.dev === true ? '-dev' : ''
             }.yaml`,
           );
-          UnderpostCluster.API.chown('kind'); // Pass 'kind' to chown
+          Underpost.cluster.chown('kind'); // Pass 'kind' to chown
         }
       } else if (options.worker === true) {
         // Worker node specific configuration (kubeadm join command needs to be executed separately)
@@ -321,7 +319,7 @@ EOF
         }
         shellExec(`kubectl delete statefulset valkey-service -n ${options.namespace} --ignore-not-found`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/valkey -n ${options.namespace}`);
-        await UnderpostTest.API.statusMonitor('valkey-service', 'Running', 'pods', 1000, 60);
+        await Underpost.test.statusMonitor('valkey-service', 'Running', 'pods', 1000, 60 * 10);
       }
       if (options.full === true || options.mariadb === true) {
         shellExec(
@@ -380,7 +378,7 @@ EOF
 
         const deploymentName = 'mongodb-deployment';
 
-        const successInstance = await UnderpostTest.API.statusMonitor(deploymentName);
+        const successInstance = await Underpost.test.statusMonitor(deploymentName);
 
         if (successInstance) {
           if (!options.mongoDbHost) options.mongoDbHost = 'mongodb-service';
@@ -389,7 +387,7 @@ EOF
             members: [{ _id: 0, host: `${options.mongoDbHost}:27017` }],
           };
 
-          const [pod] = UnderpostDeploy.API.get(deploymentName);
+          const [pod] = Underpost.deploy.get(deploymentName);
 
           shellExec(
             `sudo kubectl exec -i ${pod.NAME} -- mongo --quiet \
@@ -416,7 +414,7 @@ EOF
         shellExec(`kubectl apply -f ${underpostRoot}/manifests/mongodb/storage-class.yaml -n ${options.namespace}`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/mongodb -n ${options.namespace}`);
 
-        const successInstance = await UnderpostTest.API.statusMonitor('mongodb-0', 'Running', 'pods', 1000, 60 * 10);
+        const successInstance = await Underpost.test.statusMonitor('mongodb-0', 'Running', 'pods', 1000, 60 * 10);
 
         if (successInstance) {
           if (!options.mongoDbHost) options.mongoDbHost = 'mongodb-0.mongodb-service';
@@ -449,7 +447,7 @@ EOF
       }
 
       if (options.full === true || options.certManager === true) {
-        if (!UnderpostDeploy.API.get('cert-manager').find((p) => p.STATUS === 'Running')) {
+        if (!Underpost.deploy.get('cert-manager').find((p) => p.STATUS === 'Running')) {
           shellExec(`helm repo add jetstack https://charts.jetstack.io --force-update`);
           shellExec(
             `helm install cert-manager jetstack/cert-manager \
@@ -686,7 +684,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
         // Phase 6: Reload daemon and finalize
         logger.info('Phase 7/7: Reloading the system daemon and finalizing...');
         // shellExec('sudo systemctl daemon-reload');
-        UnderpostCluster.API.config();
+        Underpost.cluster.config();
         logger.info('Safe and complete reset finished. The system is ready for a new cluster initialization.');
       } catch (error) {
         logger.error(`Error during reset: ${error.message}`);
@@ -705,7 +703,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
       const resources = {};
       const nodeName = node
         ? node
-        : UnderpostDeploy.API.get('kind-control-plane', 'node').length > 0
+        : Underpost.deploy.get('kind-control-plane', 'node').length > 0
           ? 'kind-control-plane'
           : os.hostname();
       const info = shellExec(`kubectl describe node ${nodeName} | grep -E '(Allocatable:|Capacity:)' -A 6`, {
@@ -738,7 +736,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
      * @memberof UnderpostCluster
      */
     initHost() {
-      const archData = UnderpostBaremetal.API.getHostArch();
+      const archData = Underpost.baremetal.getHostArch();
       logger.info('Installing essential host-level prerequisites for Kubernetes...', archData);
 
       // Install base rocky setup and updates

package/src/cli/db.js

@@ -10,12 +10,9 @@ import { mergeFile, splitFileFactory } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
-import os from 'os';
-import UnderpostDeploy from './deploy.js';
-import UnderpostCron from './cron.js';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
-
+import Underpost from '../index.js';
 const logger = loggerFactory(import.meta);
 
 /**
@@ -100,8 +97,8 @@ class UnderpostDB {
       const { podNames, namespace = 'default', deployId } = criteria;
 
       try {
-        // Get all pods using UnderpostDeploy.API.get
-        let pods = UnderpostDeploy.API.get(deployId || '', 'pods', namespace);
+        // Get all pods using Underpost.deploy.get
+        let pods = Underpost.deploy.get(deployId || '', 'pods', namespace);
 
         // Filter by pod names if specified
         if (podNames) {
@@ -158,7 +155,7 @@ class UnderpostDB {
     _copyToPod({ sourcePath, podName, namespace, destPath }) {
       try {
         const command = `sudo kubectl cp ${sourcePath} ${namespace}/${podName}:${destPath}`;
-        UnderpostDB.API._executeKubectl(command, { context: `copy to pod ${podName}` });
+        Underpost.db._executeKubectl(command, { context: `copy to pod ${podName}` });
         return true;
       } catch (error) {
         logger.error('Failed to copy file to pod', { sourcePath, podName, destPath, error: error.message });
@@ -180,7 +177,7 @@ class UnderpostDB {
     _copyFromPod({ podName, namespace, sourcePath, destPath }) {
       try {
         const command = `sudo kubectl cp ${namespace}/${podName}:${sourcePath} ${destPath}`;
-        UnderpostDB.API._executeKubectl(command, { context: `copy from pod ${podName}` });
+        Underpost.db._executeKubectl(command, { context: `copy from pod ${podName}` });
         return true;
       } catch (error) {
         logger.error('Failed to copy file from pod', { podName, sourcePath, destPath, error: error.message });
@@ -201,7 +198,7 @@ class UnderpostDB {
     _execInPod({ podName, namespace, command }) {
       try {
         const kubectlCmd = `sudo kubectl exec -n ${namespace} -i ${podName} -- sh -c "${command}"`;
-        return UnderpostDB.API._executeKubectl(kubectlCmd, { context: `exec in pod ${podName}` });
+        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 });
         throw error;
@@ -348,7 +345,7 @@ class UnderpostDB {
         logger.info('Importing MariaDB database', { podName, dbName });
 
         // Remove existing SQL file in container
-        UnderpostDB.API._execInPod({
+        Underpost.db._execInPod({
           podName,
           namespace,
           command: `rm -rf ${containerSqlPath}`,
@@ -356,7 +353,7 @@ class UnderpostDB {
 
         // Copy SQL file to pod
         if (
-          !UnderpostDB.API._copyToPod({
+          !Underpost.db._copyToPod({
             sourcePath: sqlPath,
             podName,
             namespace,
@@ -367,14 +364,14 @@ class UnderpostDB {
         }
 
         // Create database if it doesn't exist
-        UnderpostDB.API._executeKubectl(
+        Underpost.db._executeKubectl(
           `kubectl exec -n ${namespace} -i ${podName} -- mariadb -p${password} -e 'CREATE DATABASE IF NOT EXISTS ${dbName};'`,
           { context: `create database ${dbName}` },
         );
 
         // Import SQL file
         const importCmd = `mariadb -u ${user} -p${password} ${dbName} < ${containerSqlPath}`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: importCmd });
+        Underpost.db._execInPod({ podName, namespace, command: importCmd });
 
         logger.info('Successfully imported MariaDB database', { podName, dbName });
         return true;
@@ -405,7 +402,7 @@ class UnderpostDB {
         logger.info('Exporting MariaDB database', { podName, dbName });
 
         // Remove existing SQL file in container
-        UnderpostDB.API._execInPod({
+        Underpost.db._execInPod({
           podName,
           namespace,
           command: `rm -rf ${containerSqlPath}`,
@@ -413,11 +410,11 @@ class UnderpostDB {
 
         // Dump database
         const dumpCmd = `mariadb-dump --user=${user} --password=${password} --lock-tables ${dbName} > ${containerSqlPath}`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
+        Underpost.db._execInPod({ podName, namespace, command: dumpCmd });
 
         // Copy SQL file from pod
         if (
-          !UnderpostDB.API._copyFromPod({
+          !Underpost.db._copyFromPod({
             podName,
             namespace,
             sourcePath: containerSqlPath,
@@ -461,7 +458,7 @@ class UnderpostDB {
         logger.info('Importing MongoDB database', { podName, dbName });
 
         // Remove existing BSON directory in container
-        UnderpostDB.API._execInPod({
+        Underpost.db._execInPod({
           podName,
           namespace,
           command: `rm -rf ${containerBsonPath}`,
@@ -469,7 +466,7 @@ class UnderpostDB {
 
         // Copy BSON directory to pod
         if (
-          !UnderpostDB.API._copyToPod({
+          !Underpost.db._copyToPod({
             sourcePath: bsonPath,
             podName,
             namespace,
@@ -483,7 +480,7 @@ class UnderpostDB {
         const restoreCmd = `mongorestore -d ${dbName} ${containerBsonPath}${drop ? ' --drop' : ''}${
           preserveUUID ? ' --preserveUUID' : ''
         }`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: restoreCmd });
+        Underpost.db._execInPod({ podName, namespace, command: restoreCmd });
 
         logger.info('Successfully imported MongoDB database', { podName, dbName });
         return true;
@@ -513,7 +510,7 @@ class UnderpostDB {
         logger.info('Exporting MongoDB database', { podName, dbName, collections });
 
         // Remove existing BSON directory in container
-        UnderpostDB.API._execInPod({
+        Underpost.db._execInPod({
           podName,
           namespace,
           command: `rm -rf ${containerBsonPath}`,
@@ -524,16 +521,16 @@ class UnderpostDB {
           const collectionList = collections.split(',').map((c) => c.trim());
           for (const collection of collectionList) {
             const dumpCmd = `mongodump -d ${dbName} --collection ${collection} -o /`;
-            UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
+            Underpost.db._execInPod({ podName, namespace, command: dumpCmd });
           }
         } else {
           const dumpCmd = `mongodump -d ${dbName} -o /`;
-          UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
+          Underpost.db._execInPod({ podName, namespace, command: dumpCmd });
         }
 
         // Copy BSON directory from pod
         if (
-          !UnderpostDB.API._copyFromPod({
+          !Underpost.db._copyFromPod({
             podName,
             namespace,
             sourcePath: containerBsonPath,
@@ -799,7 +796,7 @@ class UnderpostDB {
       // Handle clean-fs-collection operation
       if (options.cleanFsCollection || options.cleanFsDryRun) {
         logger.info('Starting File collection cleanup operation', { deployList });
-        await UnderpostDB.API.cleanFsCollection(deployList, {
+        await Underpost.db.cleanFsCollection(deployList, {
           hosts: options.hosts,
           paths: options.paths,
           dryRun: options.cleanFsDryRun,
@@ -815,7 +812,7 @@ class UnderpostDB {
       });
 
       if (options.primaryPodEnsure) {
-        const primaryPodName = UnderpostDB.API.getMongoPrimaryPodName({ namespace, podName: options.primaryPodEnsure });
+        const primaryPodName = Underpost.db.getMongoPrimaryPodName({ namespace, podName: options.primaryPodEnsure });
         if (!primaryPodName) {
           const baseCommand = options.dev ? 'node bin' : 'underpost';
           const baseClusterCommand = options.dev ? ' --dev' : '';
@@ -874,15 +871,15 @@ class UnderpostDB {
         if (!processedRepos.has(repoName)) {
           logger.info('Processing Git operations for repository', { repoName, deployId });
           if (options.git === true) {
-            UnderpostDB.API._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
-            UnderpostDB.API._manageGitRepo({ repoName, operation: 'pull' });
+            Underpost.db._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
+            Underpost.db._manageGitRepo({ repoName, operation: 'pull' });
           }
 
           if (options.macroRollbackExport) {
             // Only clone if not already done by git option above
             if (options.git !== true) {
-              UnderpostDB.API._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
-              UnderpostDB.API._manageGitRepo({ repoName, operation: 'pull' });
+              Underpost.db._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
+              Underpost.db._manageGitRepo({ repoName, operation: 'pull' });
             }
 
             const nCommits = parseInt(options.macroRollbackExport);
@@ -947,7 +944,7 @@ class UnderpostDB {
             logger.info('Processing database', { hostFolder, provider, dbName, deployId });
 
             const backUpPath = `../${repoName}/${hostFolder}`;
-            const backupInfo = UnderpostDB.API._manageBackupTimestamps(
+            const backupInfo = Underpost.db._manageBackupTimestamps(
               backUpPath,
               newBackupTimestamp,
               options.export === true,
@@ -980,15 +977,11 @@ class UnderpostDB {
               deployId: provider === 'mariadb' ? 'mariadb' : 'mongo',
             };
 
-            targetPods = UnderpostDB.API._getFilteredPods(podCriteria);
+            targetPods = Underpost.db._getFilteredPods(podCriteria);
 
             // Fallback to default if no custom pods specified
             if (targetPods.length === 0 && !options.podName) {
-              const defaultPods = UnderpostDeploy.API.get(
-                provider === 'mariadb' ? 'mariadb' : 'mongo',
-                'pods',
-                namespace,
-              );
+              const defaultPods = Underpost.deploy.get(provider === 'mariadb' ? 'mariadb' : 'mongo', 'pods', namespace);
               console.log('defaultPods', defaultPods);
               targetPods = defaultPods;
             }
@@ -1007,7 +1000,7 @@ class UnderpostDB {
                 podsToProcess = [];
               } else {
                 const firstPod = targetPods[0].NAME;
-                const primaryPodName = UnderpostDB.API.getMongoPrimaryPodName({ namespace, podName: firstPod });
+                const primaryPodName = Underpost.db.getMongoPrimaryPodName({ namespace, podName: firstPod });
 
                 if (primaryPodName) {
                   const primaryPod = targetPods.find((p) => p.NAME === primaryPodName);
@@ -1040,7 +1033,7 @@ class UnderpostDB {
               switch (provider) {
                 case 'mariadb': {
                   if (options.stats === true) {
-                    const stats = UnderpostDB.API._getMariaDBStats({
+                    const stats = Underpost.db._getMariaDBStats({
                       podName: pod.NAME,
                       namespace,
                       dbName,
@@ -1048,12 +1041,12 @@ class UnderpostDB {
                       password,
                     });
                     if (stats) {
-                      UnderpostDB.API._displayStats({ provider, dbName, stats });
+                      Underpost.db._displayStats({ provider, dbName, stats });
                     }
                   }
 
                   if (options.import === true) {
-                    UnderpostDB.API._importMariaDB({
+                    Underpost.db._importMariaDB({
                       pod,
                       namespace,
                       dbName,
@@ -1065,7 +1058,7 @@ class UnderpostDB {
 
                   if (options.export === true) {
                     const outputPath = options.outPath || toNewSqlPath;
-                    await UnderpostDB.API._exportMariaDB({
+                    await Underpost.db._exportMariaDB({
                       pod,
                       namespace,
                       dbName,
@@ -1079,19 +1072,19 @@ class UnderpostDB {
 
                 case 'mongoose': {
                   if (options.stats === true) {
-                    const stats = UnderpostDB.API._getMongoStats({
+                    const stats = Underpost.db._getMongoStats({
                       podName: pod.NAME,
                       namespace,
                       dbName,
                     });
                     if (stats) {
-                      UnderpostDB.API._displayStats({ provider, dbName, stats });
+                      Underpost.db._displayStats({ provider, dbName, stats });
                     }
                   }
 
                   if (options.import === true) {
                     const bsonPath = options.outPath || toBsonPath;
-                    UnderpostDB.API._importMongoDB({
+                    Underpost.db._importMongoDB({
                       pod,
                       namespace,
                       dbName,
@@ -1103,7 +1096,7 @@ class UnderpostDB {
 
                   if (options.export === true) {
                     const outputPath = options.outPath || toNewBsonPath;
-                    UnderpostDB.API._exportMongoDB({
+                    Underpost.db._exportMongoDB({
                       pod,
                       namespace,
                       dbName,
@@ -1130,8 +1123,8 @@ class UnderpostDB {
           const commitMessage = `${new Date(newBackupTimestamp).toLocaleDateString()} ${new Date(
             newBackupTimestamp,
           ).toLocaleTimeString()}`;
-          UnderpostDB.API._manageGitRepo({ repoName, operation: 'commit', message: commitMessage });
-          UnderpostDB.API._manageGitRepo({ repoName, operation: 'push' });
+          Underpost.db._manageGitRepo({ repoName, operation: 'commit', message: commitMessage });
+          Underpost.db._manageGitRepo({ repoName, operation: 'push' });
           processedRepos.add(`${repoName}-committed`);
         }
       }
@@ -1202,7 +1195,7 @@ class UnderpostDB {
           }
 
           const confServer = loadReplicas(deployId, JSON.parse(fs.readFileSync(confServerPath, 'utf8')));
-          const router = await UnderpostDeploy.API.routerFactory(deployId, env);
+          const router = await Underpost.deploy.routerFactory(deployId, env);
           const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
 
           for (const host of Object.keys(confServer)) {
@@ -1296,7 +1289,7 @@ class UnderpostDB {
         for (const jobId of Object.keys(confCron.jobs)) {
           const body = {
             jobId,
-            deployId: UnderpostCron.API.getRelatedDeployIdList(jobId),
+            deployId: Underpost.cron.getRelatedDeployIdList(jobId),
             expression: confCron.jobs[jobId].expression,
             enabled: confCron.jobs[jobId].enabled,
           };
@@ -1573,7 +1566,7 @@ class UnderpostDB {
 
       if (options.generate === true) {
         logger.info('Generating cluster metadata');
-        await UnderpostDB.API.clusterMetadataFactory(deployId, host, path);
+        await Underpost.db.clusterMetadataFactory(deployId, host, path);
       }
 
       if (options.instances === true) {