From 6df4809e57b85701c41b199a45402fd844450e4e Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:12:23 +0700 Subject: [PATCH 01/11] Fix bug --- src/service/agent.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/service/agent.js b/src/service/agent.js index bdc202d..c9e845a 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -411,18 +411,29 @@ class Agent { } logger.info(`QQQQQQ0: ${parameter}`); - logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter}`); + logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter.repository} + ${requestJobResponse.body.parameter.branch} + ${requestJobResponse.body.parameter.username} + ${requestJobResponse.body.parameter.password}`); if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; - logger.info(`QQQQQQ2: ${parameter}`); + logger.info(`QQQQQQ2: ${parameter.repository} + ${parameter.branch} + ${parameter.username} + ${parameter.password}`); } else { parameter = requestJobResponse.body.parameter - logger.info(`QQQQQQ3: ${parameter}`); + logger.info(`QQQQQQ3: ${parameter.repository} + ${parameter.branch} + ${parameter.username} + ${parameter.password}`); } projectId = requestJobResponse.body.testProject.projectId; - logger.info(`QQQQQQ4: ${projectId}`); } - logger.info(`QQQQQQ5: ${parameter}`); + logger.info(`QQQQQQ4: ${parameter.repository} + ${parameter.branch} + ${parameter.username} + ${parameter.password}`); const jobApiKey = parameter.environmentVariables .find((item) => item.name === jobApiKeyEnv); From bd9ca03a8cfe1b2d18b7329c661cd5fa4f2d6b59 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:19:23 +0700 Subject: [PATCH 02/11] Fix bug --- src/service/agent.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/service/agent.js b/src/service/agent.js index c9e845a..eb1ead0 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -411,29 +411,33 @@ class Agent { } logger.info(`QQQQQQ0: ${parameter}`); - logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter.repository} - ${requestJobResponse.body.parameter.branch} - ${requestJobResponse.body.parameter.username} - ${requestJobResponse.body.parameter.password}`); + logger.info(`QQQQQQ1: + ${requestJobResponse.body.parameter.gitRepositoryResource.repository} + ${requestJobResponse.body.parameter.gitRepositoryResource.branch} + ${requestJobResponse.body.parameter.gitRepositoryResource.username} + ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; - logger.info(`QQQQQQ2: ${parameter.repository} - ${parameter.branch} - ${parameter.username} - ${parameter.password}`); + logger.info(`QQQQQQ2: + ${requestJobResponse.body.parameter.gitRepositoryResource.repository} + ${requestJobResponse.body.parameter.gitRepositoryResource.branch} + ${requestJobResponse.body.parameter.gitRepositoryResource.username} + ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); } else { parameter = requestJobResponse.body.parameter - logger.info(`QQQQQQ3: ${parameter.repository} - ${parameter.branch} - ${parameter.username} - ${parameter.password}`); + logger.info(`QQQQQQ3: + ${requestJobResponse.body.parameter.gitRepositoryResource.repository} + ${requestJobResponse.body.parameter.gitRepositoryResource.branch} + ${requestJobResponse.body.parameter.gitRepositoryResource.username} + ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); } projectId = requestJobResponse.body.testProject.projectId; } - logger.info(`QQQQQQ4: ${parameter.repository} - ${parameter.branch} - ${parameter.username} - ${parameter.password}`); + logger.info(`QQQQQQ4: + ${requestJobResponse.body.parameter.gitRepositoryResource.repository} + ${requestJobResponse.body.parameter.gitRepositoryResource.branch} + ${requestJobResponse.body.parameter.gitRepositoryResource.username} + ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); const jobApiKey = parameter.environmentVariables .find((item) => item.name === jobApiKeyEnv); From 2694202843a47457d781da33d5db168d6246a807 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:20:13 +0700 Subject: [PATCH 03/11] Fix bug --- src/service/agent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/agent.js b/src/service/agent.js index eb1ead0..9207577 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -410,7 +410,7 @@ class Agent { return; } - logger.info(`QQQQQQ0: ${parameter}`); + logger.info(`QQQQQQ0: ${JSON.stringify(parameter)}`); logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter.gitRepositoryResource.repository} ${requestJobResponse.body.parameter.gitRepositoryResource.branch} From 983821b7bab1d50d935000aadd0f90e79f710499 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:20:42 +0700 Subject: [PATCH 04/11] Fix bug --- src/service/agent.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/service/agent.js b/src/service/agent.js index 9207577..cabfbf1 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -411,6 +411,7 @@ class Agent { } logger.info(`QQQQQQ0: ${JSON.stringify(parameter)}`); + logger.info(`QQQQQQ01: ${JSON.stringify(requestJobResponse.body.parameter)}`); logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter.gitRepositoryResource.repository} ${requestJobResponse.body.parameter.gitRepositoryResource.branch} From bfa01a3dbf11668b3701a184ec1b9900612095a8 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:28:55 +0700 Subject: [PATCH 05/11] Fix bug --- src/service/agent.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/service/agent.js b/src/service/agent.js index cabfbf1..d0dbdc7 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -419,18 +419,8 @@ class Agent { ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; - logger.info(`QQQQQQ2: - ${requestJobResponse.body.parameter.gitRepositoryResource.repository} - ${requestJobResponse.body.parameter.gitRepositoryResource.branch} - ${requestJobResponse.body.parameter.gitRepositoryResource.username} - ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); } else { parameter = requestJobResponse.body.parameter - logger.info(`QQQQQQ3: - ${requestJobResponse.body.parameter.gitRepositoryResource.repository} - ${requestJobResponse.body.parameter.gitRepositoryResource.branch} - ${requestJobResponse.body.parameter.gitRepositoryResource.username} - ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); } projectId = requestJobResponse.body.testProject.projectId; } From 36424deafdc883cddd43920a9a622f8784a313a1 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:37:03 +0700 Subject: [PATCH 06/11] Fix bug --- src/core/api/url-param.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/api/url-param.js b/src/core/api/url-param.js index c9ee59f..880aafe 100644 --- a/src/core/api/url-param.js +++ b/src/core/api/url-param.js @@ -62,7 +62,7 @@ module.exports = { }, getJob(jobId) { - return buildUrl({ fields: ['sensitiveData'] }, PATHS.JOB, jobId); + return buildUrl({ fields: 'sensitiveData' }, PATHS.JOB, jobId); }, updateJob() { From 199d2ad5d6c2ddcdd851f8609a915c7969bc245e Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:46:50 +0700 Subject: [PATCH 07/11] Fix bug --- src/service/agent.js | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/service/agent.js b/src/service/agent.js index d0dbdc7..1af5f0e 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); - // } } } } @@ -411,12 +402,7 @@ class Agent { } logger.info(`QQQQQQ0: ${JSON.stringify(parameter)}`); - logger.info(`QQQQQQ01: ${JSON.stringify(requestJobResponse.body.parameter)}`); - logger.info(`QQQQQQ1: - ${requestJobResponse.body.parameter.gitRepositoryResource.repository} - ${requestJobResponse.body.parameter.gitRepositoryResource.branch} - ${requestJobResponse.body.parameter.gitRepositoryResource.username} - ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); + logger.info(`QQQQQQ1: ${JSON.stringify(requestJobResponse.body.parameter.gitRepositoryResource)}`); if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; } else { @@ -424,11 +410,7 @@ class Agent { } projectId = requestJobResponse.body.testProject.projectId; } - logger.info(`QQQQQQ4: - ${requestJobResponse.body.parameter.gitRepositoryResource.repository} - ${requestJobResponse.body.parameter.gitRepositoryResource.branch} - ${requestJobResponse.body.parameter.gitRepositoryResource.username} - ${requestJobResponse.body.parameter.gitRepositoryResource.password}`); + logger.info(`QQQQQQ2: ${JSON.stringify(parameter.gitRepositoryResource)}`); const jobApiKey = parameter.environmentVariables .find((item) => item.name === jobApiKeyEnv); From a9fd1da648fdc7df08d447f04be081603f0acbc1 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:51:40 +0700 Subject: [PATCH 08/11] Fix bug --- src/core/api/http.js | 1 + src/core/api/url-param.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/api/http.js b/src/core/api/http.js index a676dcb..1dc7fd5 100644 --- a/src/core/api/http.js +++ b/src/core/api/http.js @@ -120,6 +120,7 @@ module.exports = { }, request(method, urlParam, data = {}, headers = {}, overrideOpts = {}) { + console.log('QQQQQ8 urlParam:', urlParam.url, 'urlParam:', urlParam.params); return axios({ method, url: urlParam.url, diff --git a/src/core/api/url-param.js b/src/core/api/url-param.js index 880aafe..5877b72 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() { From 924d2fa7d21df9834cba0ee5a24186eaeb0fd126 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:58:41 +0700 Subject: [PATCH 09/11] Fix bug --- src/core/api/url-param.js | 2 +- src/service/agent.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/api/url-param.js b/src/core/api/url-param.js index 5877b72..79d36ed 100644 --- a/src/core/api/url-param.js +++ b/src/core/api/url-param.js @@ -65,7 +65,7 @@ module.exports = { const params = { fields: 'sensitiveData', }; - return buildUrl(params, PATHS.JOB, jobId); + return buildUrl({ params }, PATHS.JOB, jobId); }, updateJob() { diff --git a/src/service/agent.js b/src/service/agent.js index 1af5f0e..8c83c35 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -400,9 +400,7 @@ class Agent { // There is no job to execute return; } - - logger.info(`QQQQQQ0: ${JSON.stringify(parameter)}`); - logger.info(`QQQQQQ1: ${JSON.stringify(requestJobResponse.body.parameter.gitRepositoryResource)}`); + if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; } else { @@ -410,7 +408,6 @@ class Agent { } projectId = requestJobResponse.body.testProject.projectId; } - logger.info(`QQQQQQ2: ${JSON.stringify(parameter.gitRepositoryResource)}`); const jobApiKey = parameter.environmentVariables .find((item) => item.name === jobApiKeyEnv); From 367b323fda0f8a35fd39a1388ff1ecf49aa3c1a8 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:33:15 +0700 Subject: [PATCH 10/11] Fix bug --- src/core/api/http.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/api/http.js b/src/core/api/http.js index 1dc7fd5..a676dcb 100644 --- a/src/core/api/http.js +++ b/src/core/api/http.js @@ -120,7 +120,6 @@ module.exports = { }, request(method, urlParam, data = {}, headers = {}, overrideOpts = {}) { - console.log('QQQQQ8 urlParam:', urlParam.url, 'urlParam:', urlParam.params); return axios({ method, url: urlParam.url, From 5e772435e1c5ec03dbad58433856b704279c8f64 Mon Sep 17 00:00:00 2001 From: quidl <43738052+quidl@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:35:55 +0700 Subject: [PATCH 11/11] Fix bug --- src/service/agent.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/service/agent.js b/src/service/agent.js index 8c83c35..b3dc1d8 100644 --- a/src/service/agent.js +++ b/src/service/agent.js @@ -389,22 +389,22 @@ 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; } - + if (parameter) { parameter = { ...requestJobResponse.body.parameter, ...parameter }; } else { - parameter = requestJobResponse.body.parameter + parameter = requestJobResponse.body.parameter; } projectId = requestJobResponse.body.testProject.projectId; }