Merge pull request #247 from katalon-studio/fix-agent

Fix agent
katalon-studio · Aug 30, 2024 · 0cad3c6 · 0cad3c6
2 parents b555957 + c56d8d2
commit 0cad3c6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/core/api/api.js b/src/core/api/api.js
@@ -82,6 +82,14 @@ module.exports = {
   requestJob(uuid, organizationId) {
     return httpInternal.get(urlParam.requestJob(uuid, organizationId));
   },
+
+  getJob(jobId) {
+    return httpInternal.get(urlParam.requestJob(jobId));
+  },
+
+  requestJob(uuid, teamId) {
+    return httpInternal.get(urlParam.requestJob(uuid, teamId));
+  },
 
   updateJob(body, apiKey) {
     return httpInternal.post(urlParam.updateJob(), body, withAuthorization(apiKey));

diff --git a/src/core/api/url-param.js b/src/core/api/url-param.js
@@ -61,6 +61,10 @@ module.exports = {
     return buildUrl({ params }, PATHS.JOB, 'get-job');
   },
 
+  getJob(jobId) {
+    return buildUrl({}, PATHS.JOB, jobId);
+  },
+
   updateJob() {
     return buildUrl({}, PATHS.JOB, 'update-job');
   },

diff --git a/src/service/agent.js b/src/service/agent.js
@@ -399,14 +399,30 @@ class Agent {
 
       // Read job configuration from file
       const jobBody = fs.readJsonSync('job.json', { encoding: 'utf-8' });
-      const {
+      let {
         id: jobId,
         parameter,
         testProject: { projectId },
       } = jobBody;
+
+      if (!parameter) {
+        const requestJobResponse = await api.getJob(jobId);
+        if (
+          !requestJobResponse ||
+          !requestJobResponse.body ||
+          !requestJobResponse.body.parameter ||
+          !requestJobResponse.body.testProject
+        ) {
+          // There is no job to execute
+          return;
+        }
+        parameter = requestJobResponse.body.parameter;
+        testProject = requestJobResponse.body.testProject;
+      }
+
       const jobApiKey = parameter.environmentVariables
         .find((item) => item.name === jobApiKeyEnv);
-      const apiKey = jobApiKey ? jobApiKey.value : this.apikey;
+      const apiKey = jobApiKey ? jobApiKey.value : this.apikey; 
 
       let ksArgs;
       if (config.isOnPremise) {