Skip to content

Commit e0f9e5a

Browse files
fix envVar option (#537)
1 parent e43ac4b commit e0f9e5a

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

lib/interface/cli/commands/hybrid/helper.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,22 @@ async function newAgentName(kubeContextName, kubeNamespace, agents) {
673673

674674
return name;
675675
}
676-
676+
// eslint-disable-next-line consistent-return
677+
function keyValueAsArrayToObject(array) {
678+
if (array) {
679+
const obj = {};
680+
for (let index = 0; index < array.length; index++) {
681+
const element = array[index];
682+
const envVar = element.split('=');
683+
if (envVar.length !== 2) {
684+
throw new Error(`invalid env-var parameter ${envVar}`);
685+
}
686+
// eslint-disable-next-line prefer-destructuring
687+
obj[envVar[0]] = envVar[1];
688+
}
689+
return obj;
690+
}
691+
}
677692
function keyValueAsStringToObject(nodeSelectorStr) {
678693
if (nodeSelectorStr) {
679694
const kubeNodeSelectorObj = {};
@@ -744,6 +759,7 @@ module.exports = {
744759
detectProxy,
745760
serealizeToKeyValuePairs,
746761
getRuntimeImagesWithRegistryUrl,
762+
keyValueAsArrayToObject,
747763
INSTALLATION_DEFAULTS,
748764
DefaultLogFormatter,
749765
};

lib/interface/cli/commands/hybrid/init.cmd.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const {
3232
keyValueAsStringToObject,
3333
serealizeToKeyValuePairs,
3434
getRuntimeImagesWithRegistryUrl,
35+
keyValueAsArrayToObject,
3536
INSTALLATION_DEFAULTS,
3637
} = require('./helper');
3738
const InstallationPlan = require('./InstallationPlan');
@@ -205,7 +206,7 @@ const initCmd = new Command({
205206
} = _argv;
206207

207208
if (envVars) {
208-
envVars = keyValueAsStringToObject(envVars.join(','));
209+
envVars = keyValueAsArrayToObject(Array.isArray(envVars) ? envVars.join(',') : [envVars]);
209210
}
210211

211212
if (_.get(sdk, 'config.context.isNoAuth') && !token) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codefresh",
3-
"version": "0.70.9",
3+
"version": "0.71.0",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,

0 commit comments

Comments
 (0)