From 832a38787338e64e58d1b03019fd61b91bb20e9a Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Fri, 12 Feb 2021 13:47:57 +0100 Subject: [PATCH] F #3951: Remove provider yaml (#802) Co-authored-by: Jorge Lobo --- src/fireedge/src/server/routes/api/provision/functions.js | 5 ++++- .../src/server/routes/api/provision/provision-functions.js | 7 +++++-- 2 files changed, 9 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 44828f5172..6f5c81d386 100644 --- a/src/fireedge/src/server/routes/api/provision/functions.js +++ b/src/fireedge/src/server/routes/api/provision/functions.js @@ -173,7 +173,7 @@ const removeFile = (path = '') => { } } -const renameFolder = (path = '', name = '', type = 'replace') => { +const renameFolder = (path = '', name = '', type = 'replace', callback) => { let rtn = false if (path) { let internalPath = path @@ -194,6 +194,9 @@ const renameFolder = (path = '', name = '', type = 'replace') => { default: break } + if (callback && typeof callback === 'function') { + callback(path) + } renameSync(internalPath, newPath) rtn = newPath } 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 0a9adf1fa6..2214ac71bf 100644 --- a/src/fireedge/src/server/routes/api/provision/provision-functions.js +++ b/src/fireedge/src/server/routes/api/provision/provision-functions.js @@ -509,8 +509,11 @@ const createProvision = (res = {}, next = () => undefined, params = {}, userData // This function is only executed if the command is completed const close = (success, lastLine) => { stream.end() + const removeConfigFile = (file) => { + removeFile(file) + } if (success && regexp.test(lastLine)) { - const newPath = renameFolder(config.path, lastLine.match('\\d+')) + const newPath = renameFolder(config.path, lastLine.match('\\d+'), 'replace', removeConfigFile) if (newPath) { existsFile( relFileYML, @@ -538,7 +541,7 @@ const createProvision = (res = {}, next = () => undefined, params = {}, userData } } if (success === false) { - renameFolder(config.path, appendError, 'append') + renameFolder(config.path, appendError, 'append', removeConfigFile) } }