underpost 2.89.35 → 2.89.37

package/README.md

@@ -18,7 +18,7 @@
 
 <!-- badges -->
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.89.35)](https://socket.dev/npm/package/underpost/overview/2.89.35) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.89.37)](https://socket.dev/npm/package/underpost/overview/2.89.37) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 <!-- end-badges -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.89.35
+## underpost ci/cd cli v2.89.37
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -106,3 +106,4 @@ Commands:
 ```
 
 <a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.89.35
+## underpost ci/cd cli v2.89.37
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -764,3 +764,4 @@ Options:
   -h, --help                     display help for command
  
 ```
+  

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.89.35
+          image: localhost/rockylinux9-underpost:v2.89.37
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.89.35
+          image: localhost/rockylinux9-underpost:v2.89.37
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.89.35
+          image: localhost/rockylinux9-underpost:v2.89.37
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -35,11 +35,11 @@ spec:
               underpost start --build --run dd-test development
     
           volumeMounts:
-            - name: config-volume
+            - name: config-volume-dd-test-development-blue
               mountPath: /etc/config
     
       volumes:
-        - name: config-volume
+        - name: config-volume-dd-test-development-blue
           configMap:
             name: underpost-config
     
@@ -108,7 +108,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.89.35
+          image: localhost/rockylinux9-underpost:v2.89.37
 #          resources:
 #            requests:
 #              memory: "96294Ki"
@@ -126,11 +126,11 @@ spec:
               underpost start --build --run dd-test development
     
           volumeMounts:
-            - name: config-volume
+            - name: config-volume-dd-test-development-green
               mountPath: /etc/config
     
       volumes:
-        - name: config-volume
+        - name: config-volume-dd-test-development-green
           configMap:
             name: underpost-config
     

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.89.35",
+    "version": "2.89.37",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/api/user/user.model.js

@@ -73,7 +73,16 @@ const ProviderSchema = UserSchema;
 const UserDto = {
   select: {
     get: () => {
-      return { _id: 1, username: 1, email: 1, role: 1, emailConfirmed: 1, profileImageId: 1 };
+      return {
+        _id: 1,
+        username: 1,
+        email: 1,
+        role: 1,
+        emailConfirmed: 1,
+        profileImageId: 1,
+        createdAt: 1,
+        updatedAt: 1,
+      };
     },
     getAll: () => {
       return { _id: 1 };

package/src/cli/deploy.js

@@ -179,7 +179,7 @@ spec:
               npm install -g underpost &&
               underpost secret underpost --create-from-file /etc/config/.env.${env} &&
               underpost start --build --run ${deployId} ${env}
-${UnderpostDeploy.API.volumeFactory(volumes)
+${UnderpostDeploy.API.volumeFactory(volumes.map((v) => ((v.version = `${deployId}-${env}-${suffix}`), v)))
   .render.split(`\n`)
   .map((l) => '    ' + l)
   .join(`\n`)}
@@ -443,6 +443,7 @@ node bin run template-deploy
 node bin run ssh-deploy (sync-)engine-core
 node bin run cluster --dev 'express,dd-test+dd-core'
 node bin run dd-container --dev
+node bin run promote dd-default production
 node bin dockerfile-pull-base-images --dev --path 'image-path' --kind-load
 node bin/deploy update-default-conf <deploy-id>
 
@@ -532,30 +533,34 @@ EOF`);
           continue;
         }
 
-        if (!options.disableUpdateDeployment)
-          for (const version of options.versions.split(',')) {
-            shellExec(`sudo kubectl delete svc ${deployId}-${env}-${version}-service`);
-            shellExec(`sudo kubectl delete deployment ${deployId}-${env}-${version}`);
-          }
-
         const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, '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 (!options.disableUpdateVolume) {
-          for (const volume of confVolume) {
-            shellExec(`kubectl delete pvc ${volume.claimName}`);
-            shellExec(`kubectl delete pv ${volume.claimName.replace('pvc-', 'pv-')}`);
-            shellExec(`kubectl apply -f - <<EOF
+        if (!options.disableUpdateDeployment)
+          for (const version of options.versions.split(',')) {
+            shellExec(`sudo kubectl delete svc ${deployId}-${env}-${version}-service`);
+            shellExec(`sudo kubectl delete deployment ${deployId}-${env}-${version}`);
+            if (!options.disableUpdateVolume) {
+              for (const volume of confVolume) {
+                const pvcId = `${volume.claimName}-${deployId}-${env}-${version}`;
+                const pvId = `${volume.claimName.replace('pvc-', 'pv-')}-${deployId}-${env}-${version}`;
+                const rootVolumeHostPath = `/home/dd/engine/volume/${pvId}`;
+                if (!fs.existsSync(rootVolumeHostPath)) fs.mkdirSync(rootVolumeHostPath, { recursive: true });
+                fs.copySync(volume.volumeMountPath, rootVolumeHostPath);
+                shellExec(`kubectl delete pvc ${pvcId}`);
+                shellExec(`kubectl delete pv ${pvId}`);
+                shellExec(`kubectl apply -f - <<EOF
 ${UnderpostDeploy.API.persistentVolumeFactory({
-  hostPath: volume.volumeMountPath,
-  pvcId: volume.claimName,
+  hostPath: rootVolumeHostPath,
+  pvcId,
 })}
 EOF
 `);
+              }
+            }
           }
-        }
 
         for (const host of Object.keys(confServer)) {
           if (!options.disableUpdateProxy) {
@@ -760,6 +765,7 @@ EOF
           volumeType: 'Directory',
           claimName: null,
           configMap: null,
+          version: null,
         },
       ],
     ) {
@@ -768,7 +774,11 @@ EOF
       let _volumes = `
   volumes:`;
       volumes.map((volumeData) => {
-        const { volumeName, volumeMountPath, volumeHostPath, volumeType, claimName, configMap } = volumeData;
+        let { volumeName, volumeMountPath, volumeHostPath, volumeType, claimName, configMap, version } = volumeData;
+        if (version) {
+          volumeName = `${volumeName}-${version}`;
+          claimName = claimName ? `${claimName}-${version}` : null;
+        }
         _volumeMounts += `
         - name: ${volumeName}
           mountPath: ${volumeMountPath}

package/src/cli/run.js

@@ -340,9 +340,10 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'cluster-build': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const nodeOptions = options.nodeName ? ` --node-name ${options.nodeName}` : '';
       shellExec(`node bin run clean`);
-      shellExec(`node bin run --dev sync-replica template-deploy`);
-      shellExec(`node bin run sync-replica template-deploy`);
+      shellExec(`node bin run --dev sync-replica template-deploy${nodeOptions}`);
+      shellExec(`node bin run sync-replica template-deploy${nodeOptions}`);
       shellExec(`node bin env clean`);
       for (const deployId of fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').split(','))
         shellExec(`node bin/deploy update-default-conf ${deployId.trim()}`);
@@ -1143,7 +1144,11 @@ class UnderpostRun {
         shellExec(`${baseCommand} env ${deployId} ${env}`);
         for (const host of Object.keys(confServer))
           if (_path in confServer[host]) shellExec(`node bin/deploy build-single-replica ${deployId} ${host} ${_path}`);
-        const node = options.dev || !isDeployRunnerContext(path, options) ? 'kind-control-plane' : os.hostname();
+        const node = options.nodeName
+          ? options.nodeName
+          : options.dev || !isDeployRunnerContext(path, options)
+            ? 'kind-control-plane'
+            : os.hostname();
         // deployId, replicas, versions, image, node
         let defaultPath = [deployId, 1, ``, ``, node];
         shellExec(`${baseCommand} run${options.dev === true ? ' --dev' : ''} --build sync ${defaultPath}`);

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.89.35';
+  static version = 'v2.89.37';
   /**
    * Repository cli API
    * @static

package/src/server/start.js

@@ -133,7 +133,7 @@ class UnderpostStartUp {
       const repoName = `engine-${deployId.split('-')[1]}`;
       shellExec(`cd ${buildBasePath} && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}`);
       shellExec(`mkdir -p ${buildBasePath}/engine`);
-      shellExec(`cd ${buildBasePath} && sudo cp -a ./${repoName}/* ./engine`);
+      shellExec(`cd ${buildBasePath} && sudo cp -a ./${repoName}/. ./engine`);
       shellExec(`cd ${buildBasePath} && sudo rm -rf ./${repoName}`);
       shellExec(`cd ${buildBasePath}/engine && underpost clone ${process.env.GITHUB_USERNAME}/${repoName}-private`);
       shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);