Merge

src/decorators/authorization-decorator.js

@@ -86,4 +86,4 @@ function checkFogToken(f) {
 module.exports = {
   checkAuthToken: checkAuthToken,
   checkFogToken: checkFogToken
-}
+};

src/schemas/agent.js

@@ -104,10 +104,10 @@ const straceData = {
   "id": "/straceData",
   "type": "object",
   "properties": {
-    "microserviceId": {"type": "string"},
+    "microserviceUuid": {"type": "string"},
     "buffer": {"type": "string"}
   },
-  "required": ["microserviceId", "buffer"],
+  "required": ["microserviceUuid", "buffer"],
   "additionalProperties": false
 };
 

src/sequelize/managers/strace-manager.js

@@ -26,7 +26,7 @@ class StraceManager extends BaseManager {
     return Strace
   }
 
-  async pushBufferByMicroserviceId(uuid, pushingData, transaction) {
+  async pushBufferByMicroserviceUuid(uuid, pushingData, transaction) {
     const strace = await this.findOne({
       microserviceUuid: uuid
     }, transaction);

src/services/agent-service.js

@@ -315,9 +315,9 @@ const updateAgentStrace = async function (straceData, fog, transaction) {
   await Validator.validate(straceData, Validator.schemas.updateAgentStrace);
 
   for (const strace of straceData.straceData) {
-    const microserviceId = strace.microserviceId;
+    const microserviceUuid = strace.microserviceUuid;
     const buffer = strace.buffer;
-    await StraceManager.pushBufferByMicroserviceId(microserviceId, buffer, transaction)
+    await StraceManager.pushBufferByMicroserviceUuid(microserviceUuid, buffer, transaction)
   }
 
 };

src/services/diagnostic-service.js

@@ -80,6 +80,11 @@ const getMicroserviceStraceData = async function (id, data, user, isCLI, transac
 const postMicroserviceStraceDatatoFtp = async function (id, data, user, isCLI, transaction) {
   await Validator.validate(data, Validator.schemas.stracePostToFtp);
   const straceData = await StraceDiagnosticManager.findOne({microserviceUuid: id}, transaction);
+
+  if (!straceData) {
+    throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_STRACE, id))
+  }
+
   const dir = config.get('Diagnostics:DiagnosticDir');
   const filePath = dir + '/' + id;