@cyklang/cli 0.7.3 → 0.7.4

package/build/index.js

@@ -73,32 +73,40 @@ async function startServer() {
         if (orchestrator === 'kubernetes') {
             // apply resource files
             await (0, Cmd_1.spawnCommand)('kubectl', ['apply', '-f', path_1.default.join(process.cwd(), 'k8s')]);
+            // port-forward
+            const portForwardPath = path_1.default.join(process.cwd(), 'k8s', 'port-forward');
+            if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
+                throw portForwardPath + ' file not found';
+            const portForwardContent = JSON.parse(fs.readFileSync(portForwardPath).toString());
             // wait for the services to be available
             while (true) {
-                const services = await (0, Cmd_1.spawnCommandData)('kubectl', ['get', 'svc', '-o', 'name']);
-                if (services.includes('service/nodejs') && services.includes('service/postgres')) {
-                    const availNodejs = await serviceAvailable('nodejs');
-                    const availPostgres = await serviceAvailable('postgres');
-                    if (availNodejs && availPostgres)
+                const declared_services = await (0, Cmd_1.spawnCommandData)('kubectl', ['get', 'svc', '-o', 'name']);
+                let ok = true;
+                for (const service in portForwardContent) {
+                    if (!Object.prototype.hasOwnProperty.call(portForwardContent, service))
+                        continue;
+                    if (!declared_services.includes(`service/${service}`)) {
+                        ok = false;
+                        break;
+                    }
+                    const avail = await serviceAvailable(service);
+                    if (!avail) {
+                        ok = false;
                         break;
+                    }
                 }
+                if (ok)
+                    break;
                 // wait for 1 second
                 logger.info('Wait for nodejs and postgres services...');
                 await new Promise((resolve) => setTimeout(() => {
                     resolve();
                 }, 1000));
             }
-            // port-forward
-            const portForwardPath = path_1.default.join(process.cwd(), 'k8s', 'port-forward');
-            if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
-                throw portForwardPath + ' file not found';
-            const config = JSON.parse(fs.readFileSync(portForwardPath).toString());
-            if (!config.postgres || !config.nodejs)
-                throw portForwardPath + ' : file format incorrect';
-            (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', 'svc/postgres', config.postgres + ':5432']);
-            logger.info('Postgresql proxy at localhost:' + config.postgres);
-            (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', 'svc/nodejs', config.nodejs + ':3000']);
-            logger.info('Nodejs proxy at localhost:' + config.nodejs);
+            for (const service in portForwardContent) {
+                (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', `svc/${service}`, portForwardContent[service]]);
+                logger.info(`${service} proxy via localhost ${portForwardContent[service].split(':')[0]}`);
+            }
         }
         if (!orchestrator) {
             logger.error('No cyk server is defined in current folder ' + process.cwd());
@@ -173,7 +181,7 @@ class StopCommand extends commander_1.Command {
  */
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.3');
+    .version('0.7.4');
 program.addCommand(new StartCommand('start'));
 program.addCommand(new StopCommand('stop'));
 program.addCommand(new InstallCommand_1.InstallCommand('install'));

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.7.3",
+   "version": "0.7.4",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {

package/src/index.ts

@@ -52,18 +52,35 @@ async function startServer() {
             // apply resource files
             await spawnCommand('kubectl', ['apply', '-f', path.join(process.cwd(), 'k8s')])
 
+            // port-forward
+            const portForwardPath = path.join(process.cwd(), 'k8s', 'port-forward')
+            if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
+                throw portForwardPath + ' file not found'
+            const portForwardContent = JSON.parse(fs.readFileSync(portForwardPath).toString())
+
             // wait for the services to be available
 
             while (true) {
 
-                const services = await spawnCommandData('kubectl', ['get', 'svc', '-o', 'name'])
-
-                if (services.includes('service/nodejs') && services.includes('service/postgres')) {
-                    const availNodejs = await serviceAvailable('nodejs')
-                    const availPostgres = await serviceAvailable('postgres')
-                    if (availNodejs && availPostgres) break
+                const declared_services = await spawnCommandData('kubectl', ['get', 'svc', '-o', 'name'])
+
+                let ok = true
+
+                for(const service in portForwardContent) {
+                    if (! Object.prototype.hasOwnProperty.call(portForwardContent, service)) continue
+                    if (! declared_services.includes(`service/${service}`)) {
+                        ok = false
+                        break
+                    }
+                    const avail = await serviceAvailable(service)
+                    if (! avail) {
+                        ok = false
+                        break
+                    }
                 }
-                    
+
+                if (ok) break
+
                 // wait for 1 second
                 logger.info('Wait for nodejs and postgres services...')
                 await new Promise<void>((resolve) =>
@@ -73,17 +90,11 @@ async function startServer() {
                 );
             }
 
-            // port-forward
-            const portForwardPath = path.join(process.cwd(), 'k8s', 'port-forward')
-            if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
-                throw portForwardPath + ' file not found'
-            const config = JSON.parse(fs.readFileSync(portForwardPath).toString())
-            if (!config.postgres || !config.nodejs)
-                throw portForwardPath + ' : file format incorrect'
-            spawnCommand('kubectl', ['port-forward', 'svc/postgres', config.postgres + ':5432'])
-            logger.info('Postgresql proxy at localhost:' + config.postgres)
-            spawnCommand('kubectl', ['port-forward', 'svc/nodejs', config.nodejs + ':3000'])
-            logger.info('Nodejs proxy at localhost:' + config.nodejs)
+            for(const service in portForwardContent) {
+                spawnCommand('kubectl', ['port-forward', `svc/${service}`, portForwardContent[service]])
+                logger.info(`${service} proxy via localhost ${portForwardContent[service].split(':')[0]}`)
+            }
+
         }
         if (!orchestrator) {
             logger.error('No cyk server is defined in current folder ' + process.cwd())
@@ -100,12 +111,12 @@ async function startServer() {
  * @returns 
  */
 async function serviceAvailable(service: string): Promise<boolean> {
-    
+
     const descNodejs = await spawnCommandData('kubectl', ['describe', 'service', service])
     const lines = descNodejs.split('\n')
-    for(const line of lines) {
+    for (const line of lines) {
         if (line.includes('Endpoints')) {
-            return ! line.includes('<none>')
+            return !line.includes('<none>')
         }
     }
     return false
@@ -164,7 +175,7 @@ class StopCommand extends Command {
  */
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.3')
+    .version('0.7.4')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))