Saas 8261 --values for venonactl (#550)

kosta709 · web-flow · commit 2a290447b499 · 2020-09-06T09:53:56.000+03:00
* added --values
diff --git a/lib/binary/components.js b/lib/binary/components.js
@@ -27,6 +27,7 @@ module.exports = {
             versionFile: 'version.txt',
             dir: 'agent',
             binary: 'venona',
+            alternateBinary: process.env.VENONACTL,
         },
         remote: {
             versionPath: 'venonactl',
diff --git a/lib/binary/runner.js b/lib/binary/runner.js
@@ -11,7 +11,7 @@ class Runner {
 
     async run(component, args) {
         const dir = join(this.location, component.local.dir);
-        const path = join(dir, component.local.binary);
+        const path = component.local.alternateBinary || join(dir, component.local.binary);
         const cp = spawn(path, args, {
             stdio: [process.stdin, process.stdout, process.stderr],
         });
diff --git a/lib/interface/cli/commands/hybrid/delete.cmd.js b/lib/interface/cli/commands/hybrid/delete.cmd.js
@@ -10,6 +10,8 @@ const colors = require('colors');
 const DEFAULTS = require('../../defaults');
 const sdk = require('../../../../logic/sdk');
 const _ = require('lodash');
+const YAML = require('yaml');
+const fs = require('fs');
 const { to } = require('./../../../../logic/cli-config/errors/awaitTo');
 const {
     createErrorHandler,
@@ -65,8 +67,7 @@ const deleteCmd = new Command({
         })
         .option('url', {
             describe: 'Codefresh system custom url',
-            default: DEFAULTS.URL,
-        })
+        })   
         .option('force', {
             describe: 'Run the delete operation without asking to confirm (use with caution!)',
             alias: 'f',
@@ -81,18 +82,20 @@ const deleteCmd = new Command({
         .option('kube-config-path', {
             describe: 'Path to kubeconfig file (default is $HOME/.kube/config)',
         })
+        .option('values', {
+            describe: 'specify values in a YAML file',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
     handler: async (argv) => {
-        const {
-            'kube-config-path': kubeConfigPath,
-            force,
-        } = argv;
         let {
+            'kube-config-path': kubeConfigPath,
+            url, force,
             'kube-context-name': kubeContextName,
             'kube-namespace': kubeNamespace,
             name: agentName,
+            'values': valuesFile,
         } = argv;
 
         const [listReErr, runtimes] = await to(sdk.runtimeEnvs.list({ }));
@@ -106,6 +109,30 @@ const deleteCmd = new Command({
         }
 
         console.log(colors.green('This uninstaller will guide you through the runner uninstallation process'));
+        if (valuesFile) {
+            let valuesFileStr = fs.readFileSync(valuesFile, 'utf8');
+            valuesObj = YAML.parse(valuesFileStr);
+
+            if ( !kubeConfigPath && valuesObj.ConfigPath ) {
+                kubeConfigPath = valuesObj.ConfigPath;
+            }
+            if ( !kubeNamespace && valuesObj.Namespace ) {
+                kubeNamespace = valuesObj.Namespace;
+            }
+            if ( !kubeContextName && valuesObj.Context ) {
+                kubeContextName = valuesObj.Context;
+            }
+            if ( !url && valuesObj.CodefreshHost ) {
+                url = valuesObj.CodefreshHost
+            }
+
+            if ( !agentName && valuesObj.AgentId ) {
+                agentName = valuesObj.AgentId
+            }
+        }
+        if (!url) {
+            url = DEFAULTS.URL
+        }
 
         if (!kubeContextName) {
             const contexts = getAllKubeContexts(kubeConfigPath);
diff --git a/lib/interface/cli/commands/hybrid/helper.js b/lib/interface/cli/commands/hybrid/helper.js
@@ -461,6 +461,9 @@ async function installAgent({
     verbose, // --verbose
     logFormatting = DefaultLogFormatter, // --log-formtter
     envVars,
+    valuesFile, // --values
+    setValue, // --set-value
+    setFile, // --set-file
 }) {
     const binLocation = await downloadVeonona();
     const componentRunner = new Runner(binLocation);
@@ -519,7 +522,15 @@ async function installAgent({
             cmd.push(`--envVars=${element}`);
         });
     }
-
+    if (valuesFile) {
+        cmd.push(`--values=${valuesFile}`);
+    }
+    if (setValue) {
+        cmd.push(`--set-value=${setValue}`);
+    }
+    if (setFile) {
+        cmd.push(`--set-file=${setFile}`);
+    }
     await componentRunner.run(components.venona, cmd);
 }
 
@@ -535,6 +546,7 @@ async function installRuntime({
     kubeConfigPath, // --kube-config-path
     verbose, // --verbose
     name, // --runtimeEnvironmentName
+    valuesFile, // --values
     setValue, // --set-value
     setFile, // --set-file
     kubeNodeSelector, // --kube-node-selector
@@ -577,6 +589,9 @@ async function installRuntime({
     if (verbose) {
         cmd.push('--verbose');
     }
+    if (valuesFile) {
+        cmd.push(`--values=${valuesFile}`);
+    }
     if (setValue) {
         cmd.push(`--set-value=${setValue}`);
     }
@@ -612,6 +627,9 @@ async function attachRuntime({
     verbose, // --verbose
     runtimeName, // --runtimeName
     logFormatting = DefaultLogFormatter, // --log-formtter
+    valuesFile, // --values
+    setValue, // --set-value
+    setFile, // --set-file
 }) {
     const binLocation = await downloadVeonona();
     const componentRunner = new Runner(binLocation);
@@ -653,6 +671,15 @@ async function attachRuntime({
         cmd.push(`--log-formtter=${logFormatting}`);
     }
 
+    if (valuesFile) {
+        cmd.push(`--values=${valuesFile}`);
+    }
+    if (setValue) {
+        cmd.push(`--set-value=${setValue}`);
+    }
+    if (setFile) {
+        cmd.push(`--set-file=${setFile}`);
+    }
     await componentRunner.run(components.venona, cmd);
 }
 
diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js
@@ -15,6 +15,8 @@ const sdk = require('../../../../logic/sdk');
 const installationProgress = require('./installation-process');
 const { to } = require('./../../../../logic/cli-config/errors/awaitTo');
 const { createErrorHandler } = require('./helper');
+const YAML = require('yaml');
+const fs = require('fs');
 const {
     createTestPipeline,
     executeTestPipeline,
@@ -87,7 +89,6 @@ const initCmd = new Command({
         })
         .option('url', {
             describe: 'Codefresh system custom url',
-            default: DEFAULTS.URL,
         })
         .option('kube-context-name', {
             describe: 'Name of the Kubernetes context on which runner should be installed [$CF_ARG_KUBE_CONTEXT_NAME]',
@@ -136,6 +137,9 @@ const initCmd = new Command({
         .option('kube-config-path', {
             describe: 'Path to kubeconfig file (default is $HOME/.kube/config)',
         })
+        .option('values', {
+            describe: 'specify values in a YAML file',
+        })
         .option('set-value', {
             describe: 'Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes',
         })
@@ -177,23 +181,23 @@ const initCmd = new Command({
             _argv = Object.assign(oldInstallationPlan.getContext('argv'), _argv); // restore previous installation environment
         }
 
-        const {
+        let {
             'kube-node-selector': kubeNodeSelector,
             'build-node-selector': buildNodeSelector,
             tolerations,
             'kube-config-path': kubeConfigPath,
             'storage-class-name': storageClassName,
-            yes: noQuestions,
+            'yes': noQuestions,
             verbose,
             name, url,
             token,
+            'values': valuesFile,
             'set-value': setValue,
             'set-file': setFile,
             'skip-cluster-test': skipClusterTest,
             'install-monitor': installMonitor,
             'docker-registry': dockerRegistry,
-        } = _argv;
-        let {
+        
             'kube-context-name': kubeContextName,
             'kube-namespace': kubeNamespace,
             'set-default-runtime': shouldMakeDefaultRe,
@@ -203,6 +207,35 @@ const initCmd = new Command({
             'https-proxy': httpsProxy,
         } = _argv;
 
+        let valuesObj;
+        if (valuesFile) {
+            let valuesFileStr = fs.readFileSync(valuesFile, 'utf8');
+            valuesObj = YAML.parse(valuesFileStr);
+            noQuestions = true;
+
+            if ( !kubeNamespace && valuesObj.Namespace ) {
+                kubeNamespace = valuesObj.Namespace;
+            }
+            if ( !kubeContextName && valuesObj.Context ) {
+                kubeContextName = valuesObj.Context;
+            }
+            if ( !url && valuesObj.CodefreshHost ) {
+                url = valuesObj.CodefreshHost;
+            }
+            if ( !token && valuesObj.Token ) {
+                token = valuesObj.Token;
+            }
+            if ( !name && valuesObj.AgentId ) {
+                name = valuesObj.AgentId;
+            }
+            if ( typeof _.get(valuesObj, "Monitor.Enabled" ) !== 'undefined' ) {
+                installMonitor = _.get(valuesObj, "Monitor.Enabled");
+            }                                             
+        }
+        if (!url) {
+            url = DEFAULTS.URL;
+        }
+
         if (_.get(sdk, 'config.context.isNoAuth') && !token) {
             console.log('Not authenticated as a Codefresh account: ');
             console.log('In order to install a Codefresh Runner you need to provide ' +
@@ -363,14 +396,15 @@ const initCmd = new Command({
         installationPlan.addContext('argv', _argv);
 
         // run cluster acceptance tests
-        installationPlan.addStep({
-            name: 'run cluster acceptance tests',
-            func: runClusterAcceptanceTests,
-            arg: { kubeNamespace, kubeConfigPath },
-            installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
-            condition: !skipClusterTest,
-        });
-
+        if (! _.get(valuesObj, "SkipClusterTest")) {        
+            installationPlan.addStep({
+                name: 'run cluster acceptance tests',
+                func: runClusterAcceptanceTests,
+                arg: { kubeNamespace, kubeConfigPath },
+                installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
+                condition: !skipClusterTest,
+            });
+        }
         // generate new agent name
         installationPlan.addContext('agentName', name ? name.trim() : name);
         installationPlan.addStep({
@@ -414,6 +448,9 @@ const initCmd = new Command({
                     verbose,
                     agentId: installationPlan.getContext('agentName'),
                     envVars,
+                    valuesFile, // --values
+                    setValue, // --set-value
+                    setFile, // --set-file                    
                 });
             },
             installationEvent: installationProgress.events.AGENT_INSTALLED,
@@ -538,6 +575,7 @@ const initCmd = new Command({
                     verbose,
                     kubeNodeSelector,
                     dockerRegistry,
+                    valuesFile,
                     setValue,
                     setFile,
                     storageClassName,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.72.2",
+  "version": "0.72.3",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -71,6 +71,7 @@
     "rimraf": "^2.6.2",
     "semver": "^7.3.2",
     "uuid": "^3.1.0",
+    "yaml": "^1.10.0",
     "yargs": "^15.0.2",
     "yargs-parser": "^13.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
@@ -7324,6 +7324,11 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yaml@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yargs-parser@^13.0.0:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
