Skip to content

bug(fix) CLI diagnostics ftp: invalid microservice id (update) #440

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 17, 2018
Merged

bug(fix) CLI diagnostics ftp: invalid microservice id (update) #440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b787e44
bug(fix) CLI diagnostics ftp: invalid microservice id (update)
alexandershpak Dec 17, 2018
5a3db2c
bug(fix): update id to uuid
alexandershpak Dec 17, 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
35 changes: 19 additions & 16 deletions src/services/diagnostic-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,40 @@ const path = require('path');
const mime = require('mime');


const changeMicroserviceStraceState = async function (id, data, user, isCLI, transaction) {
const changeMicroserviceStraceState = async function (uuid, data, user, isCLI, transaction) {
await Validator.validate(data, Validator.schemas.straceStateUpdate);
const microservice = await MicroserviceService.getMicroservice(id, user, isCLI, transaction);
const microservice = await MicroserviceService.getMicroservice(uuid, user, isCLI, transaction);
if (microservice.iofogUuid === null) {
throw new Errors.ValidationError(ErrorMessages.STRACE_WITHOUT_FOG);
}

const straceObj = {
straceRun: data.enable,
microserviceUuid: id
microserviceUuid: uuid
};

await StraceDiagnosticManager.updateOrCreate({microserviceUuid: id}, straceObj, transaction);
await StraceDiagnosticManager.updateOrCreate({microserviceUuid: uuid}, straceObj, transaction);
await ChangeTrackingService.update(microservice.iofogUuid, ChangeTrackingService.events.diagnostics, transaction)
};

const getMicroserviceStraceData = async function (id, data, user, isCLI, transaction) {
const getMicroserviceStraceData = async function (uuid, data, user, isCLI, transaction) {
await Validator.validate(data, Validator.schemas.straceGetData);

const microserviceWhere = isCLI
? {uuid: id}
: {uuid: id, userId: user.id};
? {uuid: uuid}
: {uuid: uuid, userId: user.id};
const microservice = await MicroserviceManager.findOne(microserviceWhere, transaction);
if (!microservice) {
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, id))
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, uuid))
}

const straceData = await StraceDiagnosticManager.findOne({microserviceUuid: id}, transaction);
const straceData = await StraceDiagnosticManager.findOne({microserviceUuid: uuid}, transaction);
if (!straceData) {
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_STRACE, id))
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_STRACE, uuid))
}

const dir = config.get('Diagnostics:DiagnosticDir') || 'diagnostics';
const filePath = dir + '/' + id;
const filePath = dir + '/' + uuid;

let result = straceData.buffer;

Expand All @@ -77,21 +77,24 @@ const getMicroserviceStraceData = async function (id, data, user, isCLI, transac
};
};

const postMicroserviceStraceDatatoFtp = async function (id, data, user, isCLI, transaction) {
const postMicroserviceStraceDatatoFtp = async function (uuid, data, user, isCLI, transaction) {
await Validator.validate(data, Validator.schemas.stracePostToFtp);

const microserviceWhere = isCLI
? {uuid: uuid}
: {uuid: uuid, userId: user.id};
const microservice = await MicroserviceManager.findOne(microserviceWhere, transaction);
if (!microservice) {
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, id))
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, uuid))
}
const straceData = await StraceDiagnosticManager.findOne({microserviceUuid: id}, transaction);
const straceData = await StraceDiagnosticManager.findOne({microserviceUuid: uuid}, transaction);

if (!straceData) {
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_STRACE, id))
throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_STRACE, uuid))
}

const dir = config.get('Diagnostics:DiagnosticDir');
const filePath = dir + '/' + id;
const filePath = dir + '/' + uuid;

_createDirectoryIfNotExists(dir);
_writeBufferToFile(filePath, straceData.buffer);
Expand Down