fix envVar option (#537)

codefresh-io · Jul 21, 2020 · e0f9e5a · e0f9e5a
1 parent e43ac4b
commit e0f9e5a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/interface/cli/commands/hybrid/helper.js b/lib/interface/cli/commands/hybrid/helper.js
@@ -673,7 +673,22 @@ async function newAgentName(kubeContextName, kubeNamespace, agents) {
 
     return name;
 }
-
+// eslint-disable-next-line consistent-return
+function keyValueAsArrayToObject(array) {
+    if (array) {
+        const obj = {};
+        for (let index = 0; index < array.length; index++) {
+            const element = array[index];
+            const envVar = element.split('=');
+            if (envVar.length !== 2) {
+                throw new Error(`invalid env-var parameter ${envVar}`);
+            }
+            // eslint-disable-next-line prefer-destructuring
+            obj[envVar[0]] = envVar[1];
+        }
+        return obj;
+    }
+}
 function keyValueAsStringToObject(nodeSelectorStr) {
     if (nodeSelectorStr) {
         const kubeNodeSelectorObj = {};
@@ -744,6 +759,7 @@ module.exports = {
     detectProxy,
     serealizeToKeyValuePairs,
     getRuntimeImagesWithRegistryUrl,
+    keyValueAsArrayToObject,
     INSTALLATION_DEFAULTS,
     DefaultLogFormatter,
 };
diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js
@@ -32,6 +32,7 @@ const {
     keyValueAsStringToObject,
     serealizeToKeyValuePairs,
     getRuntimeImagesWithRegistryUrl,
+    keyValueAsArrayToObject,
     INSTALLATION_DEFAULTS,
 } = require('./helper');
 const InstallationPlan = require('./InstallationPlan');
@@ -205,7 +206,7 @@ const initCmd = new Command({
         } = _argv;
 
         if (envVars) {
-            envVars = keyValueAsStringToObject(envVars.join(','));
+            envVars = keyValueAsArrayToObject(Array.isArray(envVars) ? envVars.join(',') : [envVars]);
         }
 
         if (_.get(sdk, 'config.context.isNoAuth') && !token) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.70.9",
+  "version": "0.71.0",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,