Skip to content

Maksimchepelev/bugs #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2018
Merged

Maksimchepelev/bugs #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85b052d
fix(iofog): add validation for version command
mchepelev Dec 27, 2018
e51049d
fix(code): fix logger is not defined error in app-helper
mchepelev Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/helpers/app-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
const crypto = require('crypto');
const Errors = require('./errors');

const logger = require('../logger');
const fs = require('fs');
const Config = require('../config');
const path = require('path');
Expand Down
3 changes: 2 additions & 1 deletion src/helpers/error-messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@ module.exports = {
INVALID_INTERNAL_PORT: 'Internal parsing error. Please provide valid internal port.',
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.'
CONNECTOR_IS_IN_USE: 'You can\'t delete connector, because it is used for routing now.',
INVALID_VERSION_COMMAND: 'Can\'t {} version now.'
};
5 changes: 5 additions & 0 deletions src/services/iofog-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +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))
}

await _generateProvisioningKey({uuid: fogVersionData.uuid}, user, isCli, transaction);
await FogVersionCommandManager.updateOrCreate({iofogUuid: fogVersionData.uuid}, newVersionCommand, transaction);
await ChangeTrackingService.update(fogVersionData.uuid, ChangeTrackingService.events.version, transaction)
Expand Down