remove server abstraction layer

server/app.js

@@ -10,7 +10,9 @@ const transactionRoutes = require('./routes/transactions');
 const automationSchedulerRoutes = require('./routes/automation');
 const path = require('path');
 const apolloServer = require('./graphql-server');
-const setupMockAutomationSchedulerServer = require('./tests/util/mock-automation-scheduler-server');
+const {
+    setupMockAutomationSchedulerServer
+} = require('./tests/util/mock-automation-scheduler-server');
 const transactionMiddleware = require('./middleware/transactionMiddleware');
 const app = express();
 

server/controllers/AutomationController.js

@@ -30,9 +30,6 @@ const getGraphQLContext = require('../graphql-context');
 const httpAgent = new http.Agent({ family: 4 });
 
 const axiosConfig = {
-    headers: {
-        'x-automation-secret': process.env.AUTOMATION_SCHEDULER_SECRET
-    },
     timeout: 1000,
     httpAgent
 };

server/middleware/verifyAutomationScheduler.js

@@ -1,10 +1,19 @@
-const verifyAutomationScheduler = (req, res, next) => {
+const {
+    getCollectionJobById
+} = require('../models/services/CollectionJobService');
+
+const verifyAutomationScheduler = async (req, res, next) => {
     const incomingSecret = req.headers['x-automation-secret'];
+    const { jobId: id } = req.params;
+
+    if (!id) return res.status(404).json({ error: 'unknown jobId param' });
+    const job = await getCollectionJobById(id);
+    if (!job) return res.status(404).json({ error: `Unknown job ${id}` });
+
+    // store the collection job on the request to avoid a second lookup
+    req.collectionJob = job;
 
-    if (
-        incomingSecret &&
-        incomingSecret === process.env.AUTOMATION_SCHEDULER_SECRET
-    ) {
+    if (incomingSecret && incomingSecret === job.secret) {
         next();
     } else {
         res.status(403).json({ error: 'Unauthorized' });

server/migrations/20240525041559-addCollectionJobSecret.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    async up(queryInterface, Sequelize) {
+        return queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.addColumn(
+                'CollectionJob',
+                'secret',
+                {
+                    type: Sequelize.DataTypes.UUID,
+                    allowNull: false,
+                    defaultValue: Sequelize.literal('gen_random_uuid()')
+                },
+                { transaction }
+            );
+        });
+    },
+    async down(queryInterface) {
+        return queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.removeColumn('CollectionJob', 'secret', {
+                transaction
+            });
+        });
+    }
+};

server/models/CollectionJob.js

@@ -31,6 +31,11 @@ module.exports = function (sequelize, DataTypes) {
                 onDelete: 'SET NULL',
                 allowNull: true,
                 unique: true
+            },
+            secret: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                defaultValue: sequelize.literal('gen_random_uuid()')
             }
         },
         {

server/models/services/CollectionJobService.js

@@ -20,10 +20,16 @@ const {
 const { getTestPlanReportById } = require('./TestPlanReportService');
 const { HttpQueryError } = require('apollo-server-core');
 const { default: axios } = require('axios');
+
 const {
     default: createGithubWorkflow,
     isEnabled: isGithubWorkflowEnabled
 } = require('../../services/GithubWorkflowService');
+
+const {
+    startCollectionJobSimulation
+} = require('../../tests/util/mock-automation-scheduler-server');
+
 const runnableTestsResolver = require('../../resolvers/TestPlanReport/runnableTestsResolver');
 const getGraphQLContext = require('../../graphql-context');
 const { getBotUserByAtId } = require('./UserService');
@@ -255,7 +261,7 @@ const createCollectionJob = async ({
         })),
         transaction
     });
-
+    console.log('created job', collectionJobResult, transaction.id);
     return ModelService.getById(CollectionJob, {
         id: collectionJobResult.id,
         attributes: collectionJobAttributes,
@@ -402,17 +408,7 @@ const triggerWorkflow = async (job, testIds, { transaction }) => {
             // TODO: pass the reduced list of testIds along / deal with them somehow
             await createGithubWorkflow({ job, directory, gitSha });
         } else {
-            await axios.post(
-                `${process.env.AUTOMATION_SCHEDULER_URL}/jobs/new`,
-                {
-                    testPlanVersionGitSha: gitSha,
-                    testIds,
-                    testPlanName: directory,
-                    jobId: job.id,
-                    transactionId: transaction.id
-                },
-                axiosConfig
-            );
+            await startCollectionJobSimulation(job, transaction);
         }
     } catch (error) {
         console.error(error);

server/services/GithubWorkflowService.js

@@ -140,7 +140,7 @@ const createGithubWorkflow = async ({ job, directory, gitSha }) => {
     const inputs = {
         callback_url: `https://${callbackUrlHostname}/api/jobs/${job.id}/test/:testRowNumber`,
         status_url: `https://${callbackUrlHostname}/api/jobs/${job.id}`,
-        callback_header: `x-automation-secret:${process.env.AUTOMATION_SCHEDULER_SECRET}`,
+        callback_header: `x-automation-secret:${job.secret}`,
         work_dir: `tests/${directory}`,
         aria_at_ref: gitSha
     };

server/tests/integration/automation-scheduler.test.js

@@ -1,6 +1,8 @@
 const startSupertestServer = require('../util/api-server');
 const automationRoutes = require('../../routes/automation');
-const setupMockAutomationSchedulerServer = require('../util/mock-automation-scheduler-server');
+const {
+    setupMockAutomationSchedulerServer
+} = require('../util/mock-automation-scheduler-server');
 const db = require('../../models/index');
 const { query, mutate } = require('../util/graphql-test-utilities');
 const dbCleaner = require('../util/db-cleaner');
@@ -18,7 +20,7 @@ let mockAutomationSchedulerServer;
 let apiServer;
 let sessionAgent;
 
-const testPlanReportId = '4';
+const testPlanReportId = '18';
 
 beforeAll(async () => {
     apiServer = await startSupertestServer({
@@ -495,9 +497,12 @@ describe('Automation controller', () => {
             const testResultsNumber =
                 collectionJob.testPlanRun.testResults.length;
             const selectedTestIndex = 0;
-            const selectedTestRowNumber = 1;
 
             const selectedTest = tests[selectedTestIndex];
+            const selectedTestRowNumber = selectedTest.rowNumber;
+            console.log(tests);
+            console.log(tests.map(({ rowNumber }) => rowNumber));
+
             const numberOfScenarios = selectedTest.scenarios.filter(
                 scenario => scenario.atId === at.id
             ).length;