From 55adb8c64c33afb13a67822cbbbc588f902eff89 Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Wed, 27 Jan 2021 19:05:17 +0100 Subject: [PATCH] F #3951: fix prepend command (#698) --- .../src/server/routes/api/provision/functions.js | 11 ++++++++--- .../routes/api/provision/provision-functions.js | 10 ++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/fireedge/src/server/routes/api/provision/functions.js b/src/fireedge/src/server/routes/api/provision/functions.js index be4a996f41..0a866109a9 100644 --- a/src/fireedge/src/server/routes/api/provision/functions.js +++ b/src/fireedge/src/server/routes/api/provision/functions.js @@ -228,10 +228,15 @@ const addPrependCommand = (command = '', resource = '') => { let newRsc = rsc if (prependCommand) { - let splitPrepend = prependCommand.split(' ') + const splitPrepend = prependCommand.split(' ').filter(el => el !== '') newCommand = splitPrepend[0] - splitPrepend = splitPrepend.splice(1) - newRsc = [...splitPrepend, command, ...rsc].filter(el => el !== '') + // remove command + splitPrepend.shift() + + // stringify the rest of the parameters + const stringifyRestCommand = [command, ...rsc].join(' ') + + newRsc = [...splitPrepend, stringifyRestCommand] } return { diff --git a/src/fireedge/src/server/routes/api/provision/provision-functions.js b/src/fireedge/src/server/routes/api/provision/provision-functions.js index 3baefa243c..cc6e9eda68 100644 --- a/src/fireedge/src/server/routes/api/provision/provision-functions.js +++ b/src/fireedge/src/server/routes/api/provision/provision-functions.js @@ -571,6 +571,16 @@ const configureProvision = (res = {}, next = () => undefined, params = {}, userD const command = 'configure' const endpoint = getEndpoint() const authCommand = ['--user', user, '--password', password] + const paramsCommand = [command, params.id, '--debug', '--json', '--fail_cleanup', '--batch', '--force', ...authCommand, ...endpoint] + let lastLine = '' + const uuid = v4() + const emit = message => { + message.toString().split(/\r|\n/).map(line => { + if (line) { + lastLine = line + publish(defaultCommandProvision, { id: params.id, data: lastLine, command: command, commandId: uuid }) + } + }) const paramsCommand = [command, params.id, '--debug', '--json', '--force', '--fail_cleanup', '--batch', ...authCommand, ...endpoint] // get Log file