Merge branch 'staging' into ISSUE_654

tools/bouncer_worker/package.json

@@ -20,7 +20,6 @@
     "crypto-js": "4.1.1",
     "elastic-apm-node": "3.41.1",
     "moment": "2.29.1",
-    "mongodb": "3.6.6",
     "systeminformation": "5.6.20",
     "tree-kill": "1.2.2",
     "uuid": "8.3.2",

tools/bouncer_worker/src/lib/config.js

@@ -36,9 +36,6 @@ const applyDefaultValuesIfUndefined = (config) => {
 	config.rabbitmq.maxWaitTimeMS = config.rabbitmq.maxWaitTimeMS || 5 * 60 * 1000;
 	config.rabbitmq.waitBeforeShutdownMS = config.rabbitmq.waitBeforeShutdownMS || 60000;
 
-	// toy project configurations
-	config.toyModelDir = config.toyModelDir || path.resolve(__dirname, '../../toy');
-
 	// logging related
 	config.logging = config.logging || {};
 	config.logging.taskLogDir = config.logging.taskLogDir || config.bouncer.log_dir || config.rabbitmq.sharedDir;

tools/bouncer_worker/src/lib/messageDecoder.js

@@ -41,16 +41,6 @@ const messageDecoder = (cmd) => {
 		const args = replaceSharedDirPlaceHolder(cmd).split(/\s+/);
 		res = { command: args[0] };
 		switch (args[0]) {
-			case 'importToy':
-				res = {
-					command: args[0],
-					database: args[1],
-					model: args[2],
-					toyModelID: args[3],
-					user: args[1],
-					skipPostProcessing: (args[4] && JSON.parse(args[4])) || {},
-				};
-				break;
 			case 'import':
 				{
 					// eslint-disable-next-line
@@ -73,7 +63,6 @@ const messageDecoder = (cmd) => {
 						cmdParams: [configPath, ...args],
 						database: cmdFile.database,
 						model: cmdFile.project,
-						toyFed: cmdFile.toyFed,
 						user: cmdFile.owner,
 						...res,
 					};

tools/bouncer_worker/src/queues/jobQueueHandler.js

@@ -20,54 +20,27 @@ const {
 	jobQueueSpecified,
 	logDirExists,
 	sharedDirExists } = require('./common');
-const { importToyModel, validateToyImporterSettings } = require('../tasks/importToy');
-const { ERRCODE_OK, ERRCODE_TOY_IMPORT_FAILED } = require('../constants/errorCodes');
+const { ERRCODE_OK } = require('../constants/errorCodes');
 const { config } = require('../lib/config');
-const { generateTreeStash, runBouncerCommand } = require('../tasks/bouncerClient');
+const { runBouncerCommand } = require('../tasks/bouncerClient');
 const { messageDecoder } = require('../lib/messageDecoder');
 const logger = require('../lib/logger');
 
 const Handler = {};
 
 const logLabel = { label: 'JOBQ' };
 
-const importToy = async ({ database, model, toyModelID, skipPostProcessing }, logDir) => {
-	const returnMessage = {
-		value: ERRCODE_OK,
-		database,
-		project: model,
-	};
-
-	try {
-		await importToyModel(toyModelID, database, model, skipPostProcessing);
-
-		if (!skipPostProcessing.tree) {
-			logger.info('Toy model imported. Generating tree...', logLabel);
-			await generateTreeStash(logDir, database, model, 'tree');
-		}
-	} catch (err) {
-		logger.error(`importToy module error: ${err.message || err}`, logLabel);
-		returnMessage.value = ERRCODE_TOY_IMPORT_FAILED;
-		returnMessage.message = err.message || err;
-	}
-
-	return returnMessage;
-};
-
-const createFed = async ({ database, model, toyFed, cmdParams }, logDir) => {
+const createFed = async ({ database, model, cmdParams }, logDir) => {
 	const returnMessage = {
 		value: ERRCODE_OK,
 		database,
 		project: model,
 	};
 	try {
 		returnMessage.value = await runBouncerCommand(logDir, cmdParams);
-		if (toyFed) {
-			await importToyModel(toyFed, database, model, { tree: 1 });
-		}
 	} catch (err) {
 		logger.error(`Error generating federation: ${err.message || err}`, logLabel);
-		returnMessage.value = toyFed ? ERRCODE_TOY_IMPORT_FAILED : err;
+		returnMessage.value = err;
 		returnMessage.message = err.message || err;
 	}
 
@@ -83,19 +56,13 @@ Handler.onMessageReceived = async (cmd, rid, callback) => {
 		return;
 	}
 
-	if (cmdMsg.command === 'importToy') {
-		const message = await importToy(cmdMsg, logDir);
-		callback(JSON.stringify(message));
-	} else {
-		const message = await createFed(cmdMsg, logDir);
-		callback(JSON.stringify(message));
-	}
+	const message = await createFed(cmdMsg, logDir);
+	callback(JSON.stringify(message));
 };
 
 Handler.validateConfiguration = (label) => logDirExists(label)
 		&& jobQueueSpecified(label)
 		&& sharedDirExists(label)
-		&& callbackQueueSpecified(label)
-		&& validateToyImporterSettings();
+		&& callbackQueueSpecified(label);
 
 module.exports = Handler;