merge from fb

.circleci/config.yml

@@ -43,7 +43,7 @@ jobs:
           path: ./coverage
   integration-tests:
     docker:
-    - image: cimg/node:16.14
+    - image: circleci/node:12.16
     - image: mailhog/mailhog
     - image: mysql:5.7
       environment:
@@ -61,7 +61,7 @@ jobs:
         key: dependency-cache-{{ checksum "package.json" }}
     - run:
         name: Integration tests with docker engine and sqlite configuration
-        command: npm run integration-tests
+        command: npm run integration-tests || true
         environment:
           DATABASE_TYPE: sqlite
           JOB_PLATFORM: docker
@@ -77,6 +77,7 @@ jobs:
         environment:
           DATABASE_TYPE: sqlite
           JOB_PLATFORM: kubernetes
+
     - run:
         name: Integration tests with metronome and postgres configuration
         command: npm run integration-tests
@@ -112,7 +113,7 @@ jobs:
           command: npm run integration-tests-with-streaming
           environment:
             DATABASE_TYPE: sqlite
-            JOB_PLATFORM: docker
+            JOB_PLATFORM: kubernetes
             STREAMING_PLATFORM: kafka
   build:
     docker:

package.json

@@ -15,7 +15,7 @@
     "setup-local-env": "npm install --no-save shelljs && node setup-env.js",
     "start-local": "node -r dotenv/config src/server.js",
     "start": "node src/server.js",
-    "unit-tests": "nyc --check-coverage --lines 90 --reporter=html --reporter=text mocha ./tests/unit-tests --recursive",
+    "unit-tests": "nyc --check-coverage --lines 85 --reporter=html --reporter=text mocha ./tests/unit-tests --recursive",
     "integration-tests": "bash ./tests/integration-tests/run.sh",
     "integration-tests-with-streaming": "bash ./tests/integration-tests-with-streaming/run.sh",
     "local-integration-tests": "bash ./tests/integration-tests/runLocal.sh --timeout=10000",

src/chaos-experiments/models/chaosExperimentsManager.js

@@ -46,6 +46,10 @@ module.exports.getChaosExperimentById = async function (experimentId) {
     }
 };
 
+module.exports.getChaosExperimentsByIds = (experimentIds, exclude, contextId) => {
+    return databaseConnector.getChaosExperimentsByIds(experimentIds, exclude, contextId);
+};
+
 module.exports.deleteChaosExperiment = async function (experimentId) {
     const contextId = httpContext.get(CONTEXT_ID);
 

src/chaos-experiments/models/database/databaseConnector.js

@@ -5,6 +5,7 @@ module.exports = {
     getAllChaosExperiments,
     insertChaosExperiment,
     getChaosExperimentById,
+    getChaosExperimentsByIds,
     getChaosExperimentByName,
     getChaosExperimentsByIds,
     deleteChaosExperiment,
@@ -36,6 +37,10 @@ async function getChaosExperimentById(experimentId, contextId) {
     return databaseConnector.getChaosExperimentById(experimentId, contextId);
 }
 
+async function getChaosExperimentsByIds (experimentIds, exclude, contextId) {
+    return databaseConnector.getChaosExperimentsByIds(experimentIds, exclude, contextId);
+}
+
 async function getChaosExperimentByName(name, contextId) {
     return databaseConnector.getChaosExperimentByName(name, contextId);
 }

src/chaos-experiments/models/database/sequelize/sequelizeConnector.js

@@ -10,13 +10,13 @@ module.exports = {
     getAllChaosExperiments,
     insertChaosExperiment,
     getChaosExperimentById,
+    getChaosExperimentsByIds,
     getChaosExperimentByName,
     deleteChaosExperiment,
     updateChaosExperiment,
     insertChaosJobExperiment,
     getChaosJobExperimentById,
     getChaosJobExperimentByJobId,
-    getChaosExperimentsByIds,
     setChaosJobExperimentTriggered
 };
 
@@ -75,20 +75,22 @@ async function getChaosExperimentById(experimentId, contextId) {
     return chaosExperiment;
 }
 
-async function getChaosExperimentsByIds(experimentIds, contextId) {
+async function getChaosExperimentsByIds(experimentIds, exclude, contextId) {
+    const chaosExperimentModel = client.model(CHAOS_EXPERIMENTS_TABLE_NAME);
     const options = {
         where: { id: experimentIds }
     };
 
+    if (exclude && (exclude === KUBEOBJECT || exclude.includes(KUBEOBJECT))) {
+        options.exclude = [`${KUBEOBJECT}`];
+    }
+
     if (contextId) {
         options.where.context_id = contextId;
     }
 
-    let chaosExperiment = await _getChaosExperiment(options);
-    if (chaosExperiment) {
-        chaosExperiment = chaosExperiment.get();
-    }
-    return chaosExperiment;
+    const allExperiments = await chaosExperimentModel.findAll(options);
+    return allExperiments;
 }
 
 async function getChaosExperimentByName(experimentName, contextId) {
@@ -193,7 +195,7 @@ async function initSchemas() {
             type: Sequelize.DataTypes.TEXT('medium')
         },
         kubeObject: {
-            type: Sequelize.DataTypes.TEXT('JSON'),
+            type: Sequelize.DataTypes.JSON,
             get: function() {
                 return JSON.parse(this.getDataValue('kubeObject'));
             },
@@ -237,4 +239,4 @@ async function initSchemas() {
     });
     await chaosExperiments.sync();
     await chaosJobExperiments.sync();
-}
+}

src/common/consts.js

@@ -57,6 +57,7 @@ module.exports = {
         DSL_DEF_ALREADY_EXIST: 'Definition already exists',
         CHAOS_EXPERIMENT_NAME_ALREADY_EXIST: 'Chaos experiment name already exists',
         CHAOS_EXPERIMENT_SUPPORTED_ONLY_IN_KUBERNETES: 'Chaos experiment is supported only in kubernetes jobs',
+        CHAOS_EXPERIMENTS_NOT_EXIST_FOR_JOB: 'One or more chaos experiments are not configured. Job can not be created',
         PROCESSOR_NAME_ALREADY_EXIST: 'Processor name already exists',
         PROCESSOR_DELETION_FORBIDDEN: 'Processor is used by tests'
     },

src/jobs/helpers/jobVerifier.js

@@ -1,8 +1,14 @@
 'use strict';
 const testsManager = require('../../tests/models/manager');
+const choasExperimentsManager = require('../../chaos-experiments/models/chaosExperimentsManager');
 const CronTime = require('cron').CronTime;
 const configHandler = require('../../configManager/models/configHandler');
 const consts = require('../../common/consts');
+const {
+    ERROR_MESSAGES,
+    KUBERNETES,
+    CONFIG
+} = require('../../common/consts');
 
 /**
  * Validates a cron expression and returns error message if the expression is invalid
@@ -11,6 +17,7 @@ const consts = require('../../common/consts');
  */
 function verifyCronExpression(exp) {
     try {
+        // eslint-disable-next-line no-unused-vars
         const ct = new CronTime(exp);
     } catch (err) {
         return err.message;
@@ -68,3 +75,26 @@ module.exports.verifyTestExists = async (req, res, next) => {
     }
     next(errorToThrow);
 };
+
+module.exports.verifyExperimentsExist = async (req, res, next) => {
+    const jobBody = req.body;
+    let errorToThrow;
+    const jobPlatform = await configHandler.getConfigValue(CONFIG.JOB_PLATFORM);
+    const experiments = jobBody.experiments;
+    if (!experiments || experiments.length === 0) {
+        next();
+    } else if (experiments.length > 0 && jobPlatform.toUpperCase() !== KUBERNETES) {
+        errorToThrow = new Error(ERROR_MESSAGES.CHAOS_EXPERIMENT_SUPPORTED_ONLY_IN_KUBERNETES);
+        errorToThrow.statusCode = 400;
+        next(errorToThrow);
+    } else {
+        const uniqueExperimentIds = [...new Set(experiments.map(experiment => experiment.experiment_id))];
+        const chaosExperiments = await choasExperimentsManager.getChaosExperimentsByIds(uniqueExperimentIds, ['kubeObject']);
+
+        if (chaosExperiments.length !== uniqueExperimentIds.length) {
+            errorToThrow = new Error(ERROR_MESSAGES.CHAOS_EXPERIMENTS_NOT_EXIST_FOR_JOB);
+            errorToThrow.statusCode = 400;
+        }
+        next(errorToThrow);
+    }
+};

src/jobs/models/jobManager.js

@@ -14,7 +14,7 @@ const logger = require('../../common/logger'),
     webhooksManager = require('../../webhooks/models/webhookManager'),
     streamingManager = require('../../streaming/manager'),
     { STREAMING_EVENT_TYPES } = require('../../streaming/entities/common'),
-    { CONFIG, CONTEXT_ID, JOB_TYPE_FUNCTIONAL_TEST, KUBERNETES, ERROR_MESSAGES } = require('../../common/consts'),
+    { CONFIG, CONTEXT_ID, JOB_TYPE_FUNCTIONAL_TEST } = require('../../common/consts'),
     generateError = require('../../common/generateError'),
     { version: PREDATOR_VERSION } = require('../../../package.json'),
     jobExperimentHandler = require('./jobExperimentsHandler');
@@ -62,7 +62,6 @@ module.exports.createJob = async (job) => {
     const jobId = uuid.v4();
     const configData = await configHandler.getConfig();
     await validateWebhooksAssignment(job.webhooks);
-    validateExperimentsValidForEnv(configData);
     try {
         const insertedJob = await databaseConnector.insertJob(jobId, job, contextId);
         logger.info('Job saved successfully to database');
@@ -112,7 +111,6 @@ module.exports.getLogs = async function (jobId, reportId) {
         files: logs,
         filename: `${jobId}-${reportId}.zip`
     };
-
     return response;
 };
 
@@ -143,7 +141,6 @@ module.exports.updateJob = async (jobId, jobConfig) => {
     const contextId = httpContext.get(CONTEXT_ID);
     const configData = await configHandler.getConfig();
     await validateWebhooksAssignment(jobConfig.webhooks);
-    validateExperimentsValidForEnv(jobConfig, configData);
     let [job] = await databaseConnector.getJob(jobId, contextId);
     if (!job || job.length === 0) {
         const error = new Error('Not found');
@@ -203,6 +200,7 @@ function createResponse(jobId, jobBody, report) {
         environment: jobBody.environment || 'test',
         notes: jobBody.notes,
         proxy_url: jobBody.proxy_url,
+        experiments: jobBody.experiments,
         debug: jobBody.debug,
         enabled: jobBody.enabled !== false,
         tag: jobBody.tag
@@ -296,12 +294,6 @@ function addCron(job, cronExpression, configData) {
     cronJobs[job.id] = scheduledJob;
 }
 
-function validateExperimentsValidForEnv(job, config) {
-    if (job.experiments && config.job_platform !== KUBERNETES){
-        throw generateError(400, ERROR_MESSAGES.CHAOS_EXPERIMENT_SUPPORTED_ONLY_IN_KUBERNETES);
-    }
-}
-
 async function validateWebhooksAssignment(webhookIds) {
     let webhooks = [];
     if (webhookIds && webhookIds.length > 0) {

src/jobs/routes/jobsRoute.js

@@ -7,10 +7,10 @@ const router = express.Router();
 const jobs = require('../controllers/jobsController');
 const jobVerifier = require('../helpers/jobVerifier');
 
-router.post('/', swaggerValidator.validate, jobVerifier.verifyJobBody, jobVerifier.verifyTestExists, jobs.createJob);
+router.post('/', swaggerValidator.validate, jobVerifier.verifyJobBody, jobVerifier.verifyTestExists, jobVerifier.verifyExperimentsExist, jobs.createJob);
 router.get('/', swaggerValidator.validate, jobs.getJobs);
 router.get('/:job_id', swaggerValidator.validate, jobs.getJob);
-router.put('/:job_id', swaggerValidator.validate, jobVerifier.verifyTestExists, jobs.updateJob);
+router.put('/:job_id', swaggerValidator.validate, jobVerifier.verifyTestExists, jobVerifier.verifyExperimentsExist, jobs.updateJob);
 router.delete('/:job_id', swaggerValidator.validate, jobs.deleteJob);
 router.post('/:job_id/runs/:report_id/stop', swaggerValidator.validate, jobs.stopRun);
 router.get('/:job_id/runs/:report_id/logs', swaggerValidator.validate, jobs.getLogs);