Skip to content

Commit ec823e7

Browse files
Fix env vars2 (#538)
* fix envVar option * fix env vars
1 parent e0f9e5a commit ec823e7

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

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

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,9 @@ async function installAgent({
488488
cmd.push('--verbose');
489489
}
490490
if (envVars) {
491-
cmd.push(`--envVars=${envVars}`);
491+
envVars.forEach((element) => {
492+
cmd.push(`--envVars=${element}`);
493+
});
492494
}
493495

494496
await componentRunner.run(components.venona, cmd);
@@ -673,22 +675,6 @@ async function newAgentName(kubeContextName, kubeNamespace, agents) {
673675

674676
return name;
675677
}
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-
}
692678
function keyValueAsStringToObject(nodeSelectorStr) {
693679
if (nodeSelectorStr) {
694680
const kubeNodeSelectorObj = {};

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const {
3030
newAgentName,
3131
detectProxy,
3232
keyValueAsStringToObject,
33-
serealizeToKeyValuePairs,
3433
getRuntimeImagesWithRegistryUrl,
3534
keyValueAsArrayToObject,
3635
INSTALLATION_DEFAULTS,
@@ -205,10 +204,6 @@ const initCmd = new Command({
205204
'https-proxy': httpsProxy,
206205
} = _argv;
207206

208-
if (envVars) {
209-
envVars = keyValueAsArrayToObject(Array.isArray(envVars) ? envVars.join(',') : [envVars]);
210-
}
211-
212207
if (_.get(sdk, 'config.context.isNoAuth') && !token) {
213208
console.log('Not authenticated as a Codefresh account: ');
214209
console.log('In order to install a Codefresh Runner you need to provide ' +
@@ -413,7 +408,7 @@ const initCmd = new Command({
413408
dockerRegistry,
414409
verbose,
415410
agentId: installationPlan.getContext('agentName'),
416-
envVars: serealizeToKeyValuePairs(envVars),
411+
envVars,
417412
});
418413
},
419414
installationEvent: installationProgress.events.AGENT_INSTALLED,

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.71.0",
3+
"version": "0.71.1",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,

0 commit comments

Comments
 (0)