diff --git a/src/core/api/url-param.js b/src/core/api/url-param.js index c9ee59f..79d36ed 100644 --- a/src/core/api/url-param.js +++ b/src/core/api/url-param.js @@ -62,7 +62,10 @@ module.exports = { }, getJob(jobId) { - return buildUrl({ fields: ['sensitiveData'] }, PATHS.JOB, jobId); + const params = { + fields: 'sensitiveData', + }; + return buildUrl({ params }, PATHS.JOB, jobId); }, updateJob() { diff --git a/src/service/agent.js b/src/service/agent.js index bdc202d..b3dc1d8 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -234,15 +234,6 @@ async function executeJob(jobInfo, keepFiles) { // ignored logger.debug('Error when removing tmp directory:', err); } - - // try { - // console.log('QQQQQQ1 tmpDirPath', tmpDirPath); - // console.log('QQQQQQ1 fs', fs); - // fs.rmSync(tmpDirPath, { recursive: true, force: true }); - // console.log('QQQQQQ2 tmpDirPath', tmpDirPath); - // } catch (err1) { - // logger.error('Error 2 when removing tmp directory:', err1); - // } } } } @@ -398,31 +389,25 @@ class Agent { // Read job configuration from file const jobBody = fs.readJsonSync('job.json', { encoding: 'utf-8' }); - const { id: jobId } = jobBody; - let { parameter, testProject } = jobBody; + const { id: jobId, testProject } = jobBody; + let { parameter } = jobBody; let projectId = testProject ? testProject.projectId : undefined; if (!parameter || !projectId) { const requestJobResponse = await api.getJob(jobId); - if (!(requestJobResponse && requestJobResponse.body - && requestJobResponse.body.parameter && requestJobResponse.body.testProject)) { + if (!(requestJobResponse && requestJobResponse.body && + requestJobResponse.body.parameter && requestJobResponse.body.testProject)) { // There is no job to execute return; } - logger.info(`QQQQQQ0: ${parameter}`); - logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter}`); if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; - logger.info(`QQQQQQ2: ${parameter}`); } else { - parameter = requestJobResponse.body.parameter - logger.info(`QQQQQQ3: ${parameter}`); + parameter = requestJobResponse.body.parameter; } projectId = requestJobResponse.body.testProject.projectId; - logger.info(`QQQQQQ4: ${projectId}`); } - logger.info(`QQQQQQ5: ${parameter}`); const jobApiKey = parameter.environmentVariables .find((item) => item.name === jobApiKeyEnv);