Merge pull request #21 from entando-k8s/ENG-1285_fix-cr-interactive-s…

…ession-not-working

Eng 1285 fix custom resource interactive session not working

bin/index.js

@@ -2,7 +2,7 @@
 
 const program = require('commander');
 
-const { generateFromNpm, generateFromGit, generateFromEnv, generateInteractive } = require('../lib/actions');
+const { generateFromNpm, generateFromGit, generateFromEnv, generateInteractivly } = require('../lib/actions');
 const version = require('../package.json').version;
 
 program.storeOptionsAsProperties(false);
@@ -46,5 +46,5 @@ program
 if (process.argv.length > 2) {
   program.parse(process.argv);
 } else {
-  generateInteractive();
+  generateInteractivly();
 }

lib/actions.js

@@ -1,4 +1,6 @@
 const yaml = require('js-yaml');
+const inquirer = require('inquirer');
+const highlight = require('cli-highlight').highlight;
 
 const npmBundler = require('./npm-bundler');
 const gitBundler = require('./git-bundler');
@@ -7,21 +9,44 @@ const { convertNpmModuleToEntandoDeBundle, convertGitRepositoryToEntandoDeBundle
 
 const k8s = require('./k8s');
 
-const generateInteractive = require('./interactive-session').interactiveSession;
+function generateInteractively () {
+  const mainQuestion = [
+    {
+      type: 'list',
+      name: 'action',
+      message: 'What do you want to do?',
+      choices: [
+        { value: 'from-git', name: 'Generate a custom-resource based on an existing bundle project' },
+        { value: 'from-env', name: 'Create a new bundle using components from an environment' },
+      ],
+    },
+  ];
+
+  inquirer
+    .prompt(mainQuestion)
+    .then((answers) => {
+      switch (answers.action) {
+        case 'from-git':
+          gitBundler.interactiveSession().then(answers => generateFromGit(answers));
+          break;
+        case 'from-env':
+          envBundler.interactiveSession().then(answers => generateFromEnv(answers));
+          break;
+        default:
+          console.error(`Illegal command: ${answers.action}`);
+          throw new Error(`Illegal command ${answers.action}`);
+      }
+    })
+    .catch(error => {
+      console.error('An error occurred while running interactive session', error);
+    });
+}
 
 function generate (obj, opts) {
-  const output = yaml.safeDump(obj);
   if (opts.dryRun) {
-    console.log(output);
+    print(obj);
   } else {
-    k8s
-      .apply(obj, opts)
-      .then((data) => {
-        console.log(data);
-      })
-      .catch((err) => {
-        console.error(err);
-      });
+    deploy(obj, opts);
   }
 }
 
@@ -62,9 +87,26 @@ function generateFromEnv (options) {
     });
 }
 
+function print (obj) {
+  const output = `---\n${highlight(yaml.safeDump(obj), { language: 'yaml' })}`;
+  console.log(output);
+}
+
+function deploy (obj, opts) {
+  console.log('\nDeploying the bundle on kuberentes\n\n');
+  k8s
+    .apply(obj, opts)
+    .then((data) => {
+      console.log(data);
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+}
+
 module.exports = {
   generateFromNpm,
   generateFromGit,
   generateFromEnv,
-  generateInteractive,
+  generateInteractivly: generateInteractively,
 };