From 6416c23224dbea55ac1e5c8e09a75bda67d816ab Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 27 Dec 2018 17:17:44 +0300 Subject: [PATCH 1/2] fix(iofog): add validation for version command compare version command with isReadyToUpgrade and isReadyToRollback fields Closes EWC-448 --- src/helpers/error-messages.js | 3 ++- src/services/iofog-service.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/helpers/error-messages.js b/src/helpers/error-messages.js index 0ad086a46..7e88f9689 100644 --- a/src/helpers/error-messages.js +++ b/src/helpers/error-messages.js @@ -73,5 +73,6 @@ module.exports = { INVALID_ROUTE: 'Route parsing error. Please provide valid route.' }, CONNECTOR_IS_IN_USE: 'You can\'t delete connector, because it is used for routing now.', - INVALID_VERSION_COMMAND: 'Can\'t {} version now.' + INVALID_VERSION_COMMAND_UPGRADE: 'Can\'t upgrade version now. Latest already installed', + INVALID_VERSION_COMMAND_ROLLBACK: 'Can\'t rollback version now. There is no backups on agent' }; diff --git a/src/services/iofog-service.js b/src/services/iofog-service.js index 0776cee92..b665416be 100644 --- a/src/services/iofog-service.js +++ b/src/services/iofog-service.js @@ -280,9 +280,11 @@ async function _setFogVersionCommand(fogVersionData, user, isCli, transaction) { throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_FOG_NODE_UUID, fogData.uuid)) } - if ((!fog.isReadyToRollback && fogVersionData.versionCommand === 'rollback') - || (!fog.isReadyToUpgrade && fogVersionData.versionCommand === 'upgrade')) { - throw new Errors.ValidationError(AppHelper.formatMessage(ErrorMessages.INVALID_VERSION_COMMAND, fogVersionData.versionCommand)) + if (!fog.isReadyToRollback && fogVersionData.versionCommand === 'rollback') { + throw new Errors.ValidationError(ErrorMessages.INVALID_VERSION_COMMAND_ROLLBACK) + } + if (!fog.isReadyToUpgrade && fogVersionData.versionCommand === 'upgrade') { + throw new Errors.ValidationError(ErrorMessages.INVALID_VERSION_COMMAND_UPGRADE) } await _generateProvisioningKey({uuid: fogVersionData.uuid}, user, isCli, transaction); From de6d4dbe0d3d74005e5551d8d477a5ecdeaf154a Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Thu, 27 Dec 2018 17:25:05 +0300 Subject: [PATCH 2/2] fix(cli): fix data types and descriptions in help '... settings JSON file' -> 'Path to ... settings JSON file' flowId and catalogId type 'string' -> 'number' in help Closes EWC-445 EWC-446 --- src/helpers/error-messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/error-messages.js b/src/helpers/error-messages.js index 7e88f9689..37e68e8d7 100644 --- a/src/helpers/error-messages.js +++ b/src/helpers/error-messages.js @@ -73,6 +73,6 @@ module.exports = { INVALID_ROUTE: 'Route parsing error. Please provide valid route.' }, CONNECTOR_IS_IN_USE: 'You can\'t delete connector, because it is used for routing now.', - INVALID_VERSION_COMMAND_UPGRADE: 'Can\'t upgrade version now. Latest already installed', - INVALID_VERSION_COMMAND_ROLLBACK: 'Can\'t rollback version now. There is no backups on agent' + INVALID_VERSION_COMMAND_UPGRADE: 'Can\'t upgrade version now. Latest is already installed', + INVALID_VERSION_COMMAND_ROLLBACK: 'Can\'t rollback version now. There are no backups on agent' };