underpost 2.8.531 → 2.8.532

package/bin/build.js

@@ -20,11 +20,15 @@ const logger = loggerFactory(import.meta);
 const confName = process.argv[2];
 const basePath = '../pwa-microservices-template';
 const repoName = `engine-${confName.split('dd-')[1]}`;
+const deployList = (confName === 'dd' ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8') : confName).split(
+  ',',
+);
 
 logger.info('', {
   confName,
   repoName,
   basePath,
+  deployList,
 });
 
 if (process.argv.includes('clean')) {
@@ -35,10 +39,7 @@ if (process.argv.includes('clean')) {
 }
 
 if (process.argv.includes('conf')) {
-  for (const _confName of (confName === 'dd'
-    ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8')
-    : confName
-  ).split(',')) {
+  for (const _confName of deployList) {
     const _repoName = `engine-${_confName.split('dd-')[1]}`;
     const privateRepoName = `${_repoName}-private`;
     const privateGitUri = `${process.env.GITHUB_USERNAME}/${privateRepoName}`;
@@ -58,6 +59,12 @@ if (process.argv.includes('conf')) {
         if (replica.match(_confName))
           fs.copySync(`./engine-private/replica/${replica}`, `../${privateRepoName}/replica/${replica}`);
     }
+    if (fs.existsSync(`./engine-private/itc-scripts`)) {
+      const itcScripts = await fs.readdir(`./engine-private/itc-scripts`);
+      for (const itcScript of itcScripts)
+        if (itcScript.match(_confName))
+          fs.copySync(`./engine-private/itc-scripts/${itcScript}`, `../${privateRepoName}/itc-scripts/${itcScript}`);
+    }
     shellExec(
       `cd ../${privateRepoName}` +
         ` && git add .` +
@@ -68,6 +75,13 @@ if (process.argv.includes('conf')) {
   process.exit(0);
 }
 
+if (confName === 'dd') {
+  for (const _confName of deployList) {
+    shellExec(`node bin/build ${_confName}`);
+  }
+  process.exit(0);
+}
+
 const { DefaultConf } = await import(`../conf.${confName}.js`);
 
 {
@@ -133,6 +147,8 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
     }
   }
 
+  shellExec(`node bin/deploy update-default-conf ${confName}`);
+
   fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
   fs.copyFileSync(
     `./.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,

package/bin/deploy.js

@@ -731,6 +731,7 @@ try {
 
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
+      shellExec(`node bin/build dd`);
       shellExec(`node bin deploy dd --build-manifest --sync --info-router`);
       shellExec(`node bin deploy dd production --build-manifest --sync --info-router`);
       break;
@@ -837,7 +838,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
         DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
         DefaultConf.ssr = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.ssr.json`, 'utf8'));
-        DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
+        // DefaultConf.cron = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.cron.json`, 'utf8'));
 
         for (const host of Object.keys(DefaultConf.server)) {
           for (const path of Object.keys(DefaultConf.server[host])) {

package/bin/index.js

@@ -165,6 +165,7 @@ program
   .argument('<script-name>', 'Script name')
   .argument('[script-value]', 'Literal command, or path')
   .option('--itc', 'Inside container execution context')
+  .option('--itc-path', 'Inside container path options')
   .option('--ns <ns-name>', 'Options name space context')
   .option('--pod-name <pod-name>')
   .description(

package/conf.js

@@ -179,9 +179,7 @@ const DefaultConf = /**/ {
     },
   },
   cron: {
-    ipDaemon: { ip: null },
     records: { A: [{ host: 'example.com', dns: 'dondominio', api_key: '???', user: '???' }] },
-    backups: [{ deployGroupId: 'default-group' }],
     jobs: { dns: { expression: '* * * * *', enabled: true }, backups: { expression: '0 1 * * *', enabled: true } },
   },
 }; /**/

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.531'
+      engine.version: '2.8.532'
     networks:
       - load-balancer
 

package/package.json

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

package/src/cli/script.js

@@ -19,16 +19,22 @@ class UnderpostScript {
       const packageJson = JSON.parse(fs.readFileSync(`${npmRoot}/package.json`, 'utf8'));
       if (options.itc === true) {
         value = packageJson.scripts[key];
-        if (fs.existsSync(`${value}`)) {
-          const podScriptPath = `/${value.split('/').pop()}`;
-          const nameSpace = options.ns && typeof options.ns === 'string' ? options.ns : 'default';
-          const podMatch = options.podName && typeof options.podName === 'string' ? options.podName : key;
+        const podScriptPath = `${options.itcPath && typeof options.itcPath === 'string' ? options.itcPath : '/'}${value
+          .split('/')
+          .pop()}`;
+        const nameSpace = options.ns && typeof options.ns === 'string' ? options.ns : 'default';
+        const podMatch = options.podName && typeof options.podName === 'string' ? options.podName : key;
 
+        if (fs.existsSync(`${value}`)) {
           for (const pod of UnderpostDeploy.API.getPods(podMatch)) {
             shellExec(`sudo kubectl cp ${value} ${nameSpace}/${pod.NAME}:${podScriptPath}`);
-            const cmd = `cd / && node ${podScriptPath}`;
+            const cmd = `node ${podScriptPath}`;
             shellExec(`sudo kubectl exec -i ${pod.NAME} -- sh -c "${cmd}"`);
           }
+        } else {
+          for (const pod of UnderpostDeploy.API.getPods(podMatch)) {
+            shellExec(`sudo kubectl exec -i ${pod.NAME} -- sh -c "${value}"`);
+          }
         }
 
         return;

package/src/index.js

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