@nrwl/nx-cloud 12.5.2 → 13.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/nx-cloud.js +5 -5
- package/bin/nx-cloud.js.map +1 -1
- package/lib/core/api/run-group.api.d.ts +1 -1
- package/lib/core/api/run-group.api.js +59 -1
- package/lib/core/api/run-group.api.js.map +1 -1
- package/lib/core/commands/clean-up-agents.js +2 -2
- package/lib/core/commands/clean-up-agents.js.map +1 -1
- package/lib/core/commands/start-ci-run.js +4 -4
- package/lib/core/commands/start-ci-run.js.map +1 -1
- package/lib/core/commands/stop-all-agents.js +3 -3
- package/lib/core/commands/stop-all-agents.js.map +1 -1
- package/lib/core/file-storage/e2e-encryption.js +7 -7
- package/lib/core/file-storage/e2e-encryption.js.map +1 -1
- package/lib/core/file-storage/file-storage.js +43 -24
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/models/run-data.model.d.ts +1 -1
- package/lib/core/runners/cloud-enabled/{task-runner-life-cycle.d.ts → cloud-enabled-life-cycle.d.ts} +4 -3
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +120 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +164 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +113 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +135 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +73 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/{distributed-agent.runner.d.ts → distributed-agent.impl.d.ts} +0 -0
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +233 -0
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -0
- package/lib/core/runners/distributed-execution/distributed-execution.api.d.ts +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +115 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +270 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -5
- package/lib/core/terminal-output/end-of-run-message.js +4 -41
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/lib/core/terminal-output/message-reporter.js +1 -1
- package/lib/core/terminal-output/message-reporter.js.map +1 -1
- package/lib/core/terminal-output/output-obfuscator.js +1 -1
- package/lib/core/terminal-output/output-obfuscator.js.map +1 -1
- package/lib/generators/init/init.js +1 -1
- package/lib/generators/init/init.js.map +1 -1
- package/lib/nx-cloud-tasks-runner.js +7 -7
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/axios.js +1 -1
- package/lib/utilities/axios.js.map +1 -1
- package/lib/utilities/environment.d.ts +2 -1
- package/lib/utilities/environment.js +6 -5
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/metric-logger.d.ts +34 -0
- package/lib/utilities/metric-logger.js +77 -0
- package/lib/utilities/metric-logger.js.map +1 -0
- package/package.json +1 -1
- package/lib/core/runners/cloud-enabled/task-runner-life-cycle.js +0 -1
- package/lib/core/runners/cloud-enabled/task-runner-life-cycle.js.map +0 -1
- package/lib/core/runners/distributed-agent/distributed-agent.runner.js +0 -1
- package/lib/core/runners/distributed-agent/distributed-agent.runner.js.map +0 -1
package/bin/nx-cloud.js
CHANGED
|
@@ -1,31 +1,31 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
const
|
|
4
|
+
const distributed_agent_impl_1 = require("../lib/core/runners/distributed-agent/distributed-agent.impl");
|
|
5
5
|
const start_ci_run_1 = require("../lib/core/commands/start-ci-run");
|
|
6
6
|
const stop_all_agents_1 = require("../lib/core/commands/stop-all-agents");
|
|
7
7
|
const clean_up_agents_1 = require("../lib/core/commands/clean-up-agents");
|
|
8
8
|
const command = process.argv[2];
|
|
9
9
|
if (command === 'start-agent') {
|
|
10
|
-
|
|
10
|
+
(0, distributed_agent_impl_1.startAgent)().catch((e) => {
|
|
11
11
|
console.error(e);
|
|
12
12
|
process.exit(1);
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
15
|
else if (command === 'stop-all-agents') {
|
|
16
|
-
stop_all_agents_1.stopAllAgents().catch((e) => {
|
|
16
|
+
(0, stop_all_agents_1.stopAllAgents)().catch((e) => {
|
|
17
17
|
console.error(e);
|
|
18
18
|
process.exit(1);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
else if (command === 'start-ci-run') {
|
|
22
|
-
start_ci_run_1.startCiRun().catch((e) => {
|
|
22
|
+
(0, start_ci_run_1.startCiRun)().catch((e) => {
|
|
23
23
|
console.error(e);
|
|
24
24
|
process.exit(1);
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
else if (command === 'clean-up-agents') {
|
|
28
|
-
clean_up_agents_1.cleanUpAgents().catch((e) => {
|
|
28
|
+
(0, clean_up_agents_1.cleanUpAgents)().catch((e) => {
|
|
29
29
|
console.error(e);
|
|
30
30
|
process.exit(1);
|
|
31
31
|
});
|
package/bin/nx-cloud.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/src/bin/nx-cloud.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"nx-cloud.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/src/bin/nx-cloud.ts"],"names":[],"mappings":";;;AAEA,yGAA0F;AAC1F,oEAA+D;AAC/D,0EAAqE;AACrE,0EAAqE;AAErE,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEhC,IAAI,OAAO,KAAK,aAAa,EAAE;IAC7B,IAAA,mCAAU,GAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACJ;KAAM,IAAI,OAAO,KAAK,iBAAiB,EAAE;IACxC,IAAA,+BAAa,GAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACJ;KAAM,IAAI,OAAO,KAAK,cAAc,EAAE;IACrC,IAAA,yBAAU,GAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACJ;KAAM,IAAI,OAAO,KAAK,iBAAiB,EAAE;IACxC,IAAA,+BAAa,GAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACJ;KAAM;IACL,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;CACtE"}
|
|
@@ -2,6 +2,6 @@ import { CloudTaskRunnerOptions } from '../models/cloud-task-runner-options';
|
|
|
2
2
|
export declare class RunGroupApi {
|
|
3
3
|
private apiAxiosInstance;
|
|
4
4
|
constructor(options: CloudTaskRunnerOptions);
|
|
5
|
-
createRunGroup(branch: string, runGroup: string): Promise<void>;
|
|
5
|
+
createRunGroup(branch: string | null, runGroup: string): Promise<void>;
|
|
6
6
|
completeRunGroup(runGroup: string): Promise<void>;
|
|
7
7
|
}
|
|
@@ -1 +1,59 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.RunGroupApi = void 0;
|
|
13
|
+
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
|
+
const axios_1 = require("../../utilities/axios");
|
|
15
|
+
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
16
|
+
class RunGroupApi {
|
|
17
|
+
constructor(options) {
|
|
18
|
+
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
19
|
+
}
|
|
20
|
+
createRunGroup(branch, runGroup) {
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
23
|
+
try {
|
|
24
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/create-run-group', {
|
|
25
|
+
branch: branch,
|
|
26
|
+
runGroup: runGroup,
|
|
27
|
+
}), 3);
|
|
28
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
29
|
+
}
|
|
30
|
+
catch (e) {
|
|
31
|
+
recorder.recordMetric(metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
32
|
+
output_1.output.error({
|
|
33
|
+
title: e.message,
|
|
34
|
+
});
|
|
35
|
+
process.exit(1);
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
completeRunGroup(runGroup) {
|
|
40
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
42
|
+
try {
|
|
43
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/complete-run-group', {
|
|
44
|
+
runGroup: runGroup,
|
|
45
|
+
}), 3);
|
|
46
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
recorder.recordMetric(metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
50
|
+
output_1.output.error({
|
|
51
|
+
title: e.message,
|
|
52
|
+
});
|
|
53
|
+
process.exit(1);
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
exports.RunGroupApi = RunGroupApi;
|
|
59
|
+
//# sourceMappingURL=run-group.api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAE9D,iDAG+B;
|
|
1
|
+
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAE9D,iDAG+B;AAC/B,iEAIuC;AAEvC,MAAa,WAAW;IAGtB,YAAY,OAA+B;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEK,cAAc,CAAC,MAAqB,EAAE,QAAgB;;YAC1D,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EACnC,GAAG,EAAE,CACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,EAAE;oBAClE,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,QAAQ;iBACnB,CAAC,EACJ,CAAC,CACF,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CAAC,yCAAyB,CAAC,CAAC;gBAEjD,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC;KAAA;IAEK,gBAAgB,CAAC,QAAgB;;YACrC,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YAExD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EACnC,GAAG,EAAE,CACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CACxB,yCAAyC,EACzC;oBACE,QAAQ,EAAE,QAAQ;iBACnB,CACF,EACH,CAAC,CACF,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CAAC,yCAAyB,CAAC,CAAC;gBAEjD,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC;KAAA;CACF;AArDD,kCAqDC"}
|
|
@@ -16,7 +16,7 @@ const environment_1 = require("../../utilities/environment");
|
|
|
16
16
|
const fs_1 = require("fs");
|
|
17
17
|
function cleanUpAgents() {
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
const options = JSON.parse(stripJsonComments(fs_1.readFileSync('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
19
|
+
const options = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
20
20
|
const cacheDirectory = options.cacheDirectory || './node_modules/.cache/nx';
|
|
21
21
|
const lockFileDirectory = `${cacheDirectory}/lockfiles`;
|
|
22
22
|
if (environment_1.VERBOSE_LOGGING) {
|
|
@@ -24,7 +24,7 @@ function cleanUpAgents() {
|
|
|
24
24
|
title: `Cleaning up agent metadata for this workspace.`,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
-
return fs_1.rm(lockFileDirectory, { recursive: true, force: true }, (err) => {
|
|
27
|
+
return (0, fs_1.rm)(lockFileDirectory, { recursive: true, force: true }, (err) => {
|
|
28
28
|
if (err)
|
|
29
29
|
throw err;
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-up-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/clean-up-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,iEAA8D;AAC9D,6DAA8D;AAC9D,2BAAsC;AAEtC,SAAsB,aAAa;;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,iBAAY,
|
|
1
|
+
{"version":3,"file":"clean-up-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/clean-up-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,iEAA8D;AAC9D,6DAA8D;AAC9D,2BAAsC;AAEtC,SAAsB,aAAa;;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;QACrC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,0BAA0B,CAAC;QAC5E,MAAM,iBAAiB,GAAG,GAAG,cAAc,YAAY,CAAC;QAExD,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,gDAAgD;aACxD,CAAC,CAAC;SACJ;QAED,OAAO,IAAA,OAAE,EAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;YACrE,IAAI,GAAG;gBAAE,MAAM,GAAG,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,sCAgBC"}
|
|
@@ -18,10 +18,10 @@ const run_group_api_1 = require("../api/run-group.api");
|
|
|
18
18
|
const fs_1 = require("fs");
|
|
19
19
|
function startCiRun() {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
const branch = environment_1.getBranch();
|
|
22
|
-
const runGroup = environment_1.getRunGroup();
|
|
21
|
+
const branch = (0, environment_1.getBranch)();
|
|
22
|
+
const runGroup = (0, environment_1.getRunGroup)();
|
|
23
23
|
if (!runGroup) {
|
|
24
|
-
print_run_group_error_1.printRunGroupError();
|
|
24
|
+
(0, print_run_group_error_1.printRunGroupError)();
|
|
25
25
|
process.exit(1);
|
|
26
26
|
}
|
|
27
27
|
if (environment_1.VERBOSE_LOGGING) {
|
|
@@ -29,7 +29,7 @@ function startCiRun() {
|
|
|
29
29
|
title: `Creating run group ${runGroup}`,
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
-
const options = JSON.parse(stripJsonComments(fs_1.readFileSync('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
32
|
+
const options = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
33
33
|
const api = new run_group_api_1.RunGroupApi(options);
|
|
34
34
|
yield api.createRunGroup(branch, runGroup);
|
|
35
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,yDAAyD;AACzD,6DAIqC;AACrC,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAElC,SAAsB,UAAU;;QAC9B,MAAM,MAAM,GAAG,uBAAS,
|
|
1
|
+
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,yDAAyD;AACzD,6DAIqC;AACrC,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAElC,SAAsB,UAAU;;QAC9B,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAE/B,IAAI,CAAC,QAAQ,EAAE;YACb,IAAA,0CAAkB,GAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sBAAsB,QAAQ,EAAE;aACxC,CAAC,CAAC;SACJ;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;QAErC,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;CAAA;AApBD,gCAoBC"}
|
|
@@ -18,9 +18,9 @@ const run_group_api_1 = require("../api/run-group.api");
|
|
|
18
18
|
const fs_1 = require("fs");
|
|
19
19
|
function stopAllAgents() {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
const runGroup = environment_1.getRunGroup();
|
|
21
|
+
const runGroup = (0, environment_1.getRunGroup)();
|
|
22
22
|
if (!runGroup) {
|
|
23
|
-
print_run_group_error_1.printRunGroupError();
|
|
23
|
+
(0, print_run_group_error_1.printRunGroupError)();
|
|
24
24
|
process.exit(1);
|
|
25
25
|
}
|
|
26
26
|
if (environment_1.VERBOSE_LOGGING) {
|
|
@@ -28,7 +28,7 @@ function stopAllAgents() {
|
|
|
28
28
|
title: `Stopping all agents running tasks for run group ${runGroup}`,
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
-
const options = JSON.parse(stripJsonComments(fs_1.readFileSync('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
31
|
+
const options = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
32
32
|
const api = new run_group_api_1.RunGroupApi(options);
|
|
33
33
|
yield api.completeRunGroup(runGroup);
|
|
34
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,yDAAyD;AACzD,6DAA2E;AAC3E,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAElC,SAAsB,aAAa;;QACjC,MAAM,QAAQ,GAAG,yBAAW,
|
|
1
|
+
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,yDAAyD;AACzD,6DAA2E;AAC3E,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAElC,SAAsB,aAAa;;QACjC,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,EAAE;YACb,IAAA,0CAAkB,GAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,mDAAmD,QAAQ,EAAE;aACrE,CAAC,CAAC;SACJ;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;QAErC,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;CAAA;AAlBD,sCAkBC"}
|
|
@@ -20,22 +20,22 @@ class E2EEncryption {
|
|
|
20
20
|
return !!this.encryptionKey;
|
|
21
21
|
}
|
|
22
22
|
encryptFile(file) {
|
|
23
|
-
const iv = crypto_1.randomBytes(16);
|
|
24
|
-
const cipher = crypto_1.createCipheriv('aes-256-cbc', this.encryptionKey, iv);
|
|
25
|
-
const decryptedFileContents = fs_1.readFileSync(file);
|
|
23
|
+
const iv = (0, crypto_1.randomBytes)(16);
|
|
24
|
+
const cipher = (0, crypto_1.createCipheriv)('aes-256-cbc', this.encryptionKey, iv);
|
|
25
|
+
const decryptedFileContents = (0, fs_1.readFileSync)(file);
|
|
26
26
|
const e = cipher.update(decryptedFileContents);
|
|
27
27
|
const encryptedFileContents = Buffer.concat([iv, e, cipher.final()]);
|
|
28
|
-
fs_1.writeFileSync(file, encryptedFileContents);
|
|
28
|
+
(0, fs_1.writeFileSync)(file, encryptedFileContents);
|
|
29
29
|
}
|
|
30
30
|
decryptFile(file) {
|
|
31
|
-
const encryptedFileContents = fs_1.readFileSync(file);
|
|
31
|
+
const encryptedFileContents = (0, fs_1.readFileSync)(file);
|
|
32
32
|
try {
|
|
33
|
-
const decipher = crypto_1.createDecipheriv('aes-256-cbc', this.encryptionKey, encryptedFileContents.slice(0, 16) // iv
|
|
33
|
+
const decipher = (0, crypto_1.createDecipheriv)('aes-256-cbc', this.encryptionKey, encryptedFileContents.slice(0, 16) // iv
|
|
34
34
|
);
|
|
35
35
|
const encryptedText = encryptedFileContents.slice(16); // remove the iv
|
|
36
36
|
const d = decipher.update(encryptedText);
|
|
37
37
|
const decryptedFileContents = Buffer.concat([d, decipher.final()]);
|
|
38
|
-
fs_1.writeFileSync(file, decryptedFileContents);
|
|
38
|
+
(0, fs_1.writeFileSync)(file, decryptedFileContents);
|
|
39
39
|
}
|
|
40
40
|
catch (e) {
|
|
41
41
|
throw new Error(`Could not decrypt the artifact. Please check your encryption key.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e-encryption.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/file-storage/e2e-encryption.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AACjD,mCAAuE;AAEvE,MAAa,aAAa;IAGxB,YAAY,GAAuB;QACjC,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,SAAS,CAAC,GAAW;QAC3B,IAAI,GAAG,GAAG,GAAG,CAAC;QACd,OAAO,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE;YACtB,GAAG,IAAI,GAAG,CAAC;SACZ;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,MAAM,EAAE,GAAG,oBAAW,
|
|
1
|
+
{"version":3,"file":"e2e-encryption.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/file-storage/e2e-encryption.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AACjD,mCAAuE;AAEvE,MAAa,aAAa;IAGxB,YAAY,GAAuB;QACjC,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,SAAS,CAAC,GAAW;QAC3B,IAAI,GAAG,GAAG,GAAG,CAAC;QACd,OAAO,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE;YACtB,GAAG,IAAI,GAAG,CAAC;SACZ;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,MAAM,EAAE,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,aAAa,EAAE,IAAI,CAAC,aAAc,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,qBAAqB,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC/C,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrE,IAAA,kBAAa,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,MAAM,qBAAqB,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC;QAEjD,IAAI;YACF,MAAM,QAAQ,GAAG,IAAA,yBAAgB,EAC/B,aAAa,EACb,IAAI,CAAC,aAAc,EACnB,qBAAqB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK;aACzC,CAAC;YACF,MAAM,aAAa,GAAG,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB;YACvE,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACzC,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnE,IAAA,kBAAa,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;SAC5C;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;SACH;IACH,CAAC;CACF;AAjDD,sCAiDC"}
|
|
@@ -16,6 +16,7 @@ const environment_1 = require("../../utilities/environment");
|
|
|
16
16
|
const axios_1 = require("../../utilities/axios");
|
|
17
17
|
const fs_1 = require("fs");
|
|
18
18
|
const waiter_1 = require("../../utilities/waiter");
|
|
19
|
+
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
19
20
|
const axios = require('axios');
|
|
20
21
|
const tar = require('tar');
|
|
21
22
|
class FileStorage {
|
|
@@ -60,32 +61,42 @@ class FileStorage {
|
|
|
60
61
|
}
|
|
61
62
|
downloadFile(url, tgz, commitFilePath) {
|
|
62
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
64
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('retrieveFile');
|
|
65
|
+
let resp;
|
|
66
|
+
try {
|
|
67
|
+
resp = yield (0, axios_1.axiosMultipleTries)(() => axios(url, {
|
|
68
|
+
method: 'GET',
|
|
69
|
+
responseType: 'stream',
|
|
70
|
+
maxContentLength: 1000 * 1000 * 300,
|
|
71
|
+
maxBodyLength: 1000 * 1000 * 300,
|
|
72
|
+
timeout: environment_1.NX_CLOUD_NO_TIMEOUTS ? environment_1.UNLIMITED_TIMEOUT : 60000,
|
|
73
|
+
}), this.numberOfTries);
|
|
74
|
+
recorder.recordMetric(Object.assign(Object.assign({}, (0, metric_logger_1.mapRespToPerfEntry)(resp)), { fileSize: resp.data.headers['content-length'] }));
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
// Log performance metrics before re-throwing
|
|
78
|
+
recorder.recordMetric(metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
79
|
+
throw e;
|
|
80
|
+
}
|
|
70
81
|
// if the tar file is here, we wait for the commit file to appear for 25 seconds
|
|
71
82
|
// this is to avoid race conditions, where two processes are downloading the same
|
|
72
83
|
// artifact in parallel
|
|
73
|
-
if (fs_1.existsSync(tgz)) {
|
|
84
|
+
if ((0, fs_1.existsSync)(tgz)) {
|
|
74
85
|
let i = 0;
|
|
75
86
|
while (i++ < 50) {
|
|
76
|
-
if (fs_1.existsSync(commitFilePath))
|
|
87
|
+
if ((0, fs_1.existsSync)(commitFilePath))
|
|
77
88
|
return;
|
|
78
|
-
yield waiter_1.wait(500);
|
|
89
|
+
yield (0, waiter_1.wait)(500);
|
|
79
90
|
}
|
|
80
91
|
}
|
|
81
92
|
// if the tar file is already here, do nothing, wait for the commit file to appear
|
|
82
93
|
if (this.encryption.hasEncryption()) {
|
|
83
94
|
yield new Promise((res) => {
|
|
84
|
-
const f = resp.data.pipe(fs_1.createWriteStream(tgz));
|
|
95
|
+
const f = resp.data.pipe((0, fs_1.createWriteStream)(tgz));
|
|
85
96
|
f.on('close', () => res(null));
|
|
86
97
|
});
|
|
87
98
|
this.encryption.decryptFile(tgz);
|
|
88
|
-
const q = fs_1.createReadStream(tgz).pipe(tar.x({
|
|
99
|
+
const q = (0, fs_1.createReadStream)(tgz).pipe(tar.x({
|
|
89
100
|
cwd: path.dirname(tgz),
|
|
90
101
|
}));
|
|
91
102
|
return new Promise((res) => {
|
|
@@ -103,7 +114,7 @@ class FileStorage {
|
|
|
103
114
|
});
|
|
104
115
|
}
|
|
105
116
|
createCommitFile(commitFilePath) {
|
|
106
|
-
fs_1.writeFileSync(commitFilePath, 'true');
|
|
117
|
+
(0, fs_1.writeFileSync)(commitFilePath, 'true');
|
|
107
118
|
}
|
|
108
119
|
createCommitFilePath(hash, cacheDirectory) {
|
|
109
120
|
return path.join(cacheDirectory, `${hash}.commit`);
|
|
@@ -124,17 +135,25 @@ class FileStorage {
|
|
|
124
135
|
}
|
|
125
136
|
uploadFile(url, tgz) {
|
|
126
137
|
return __awaiter(this, void 0, void 0, function* () {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('storeFile');
|
|
139
|
+
try {
|
|
140
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => axios(url, {
|
|
141
|
+
method: 'PUT',
|
|
142
|
+
data: (0, fs_1.readFileSync)(tgz),
|
|
143
|
+
headers: {
|
|
144
|
+
'Content-Type': 'application/octet-stream',
|
|
145
|
+
'x-ms-blob-type': 'BlockBlob',
|
|
146
|
+
},
|
|
147
|
+
maxContentLength: 1000 * 1000 * 300,
|
|
148
|
+
maxBodyLength: 1000 * 1000 * 300,
|
|
149
|
+
timeout: environment_1.NX_CLOUD_NO_TIMEOUTS ? environment_1.UNLIMITED_TIMEOUT : 120000,
|
|
150
|
+
}), this.numberOfTries);
|
|
151
|
+
recorder.recordMetric(Object.assign(Object.assign({}, (0, metric_logger_1.mapRespToPerfEntry)(resp)), { fileSize: resp.config.headers['Content-Length'] }));
|
|
152
|
+
}
|
|
153
|
+
catch (e) {
|
|
154
|
+
recorder.recordMetric(metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
155
|
+
throw e;
|
|
156
|
+
}
|
|
138
157
|
});
|
|
139
158
|
}
|
|
140
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,6BAA6B;AAC7B,6DAIqC;AACrC,iDAA2D;AAE3D,2BAMY;AACZ,mDAA8C;
|
|
1
|
+
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":"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"}
|
package/lib/core/runners/cloud-enabled/{task-runner-life-cycle.d.ts → cloud-enabled-life-cycle.d.ts}
RENAMED
|
@@ -2,20 +2,21 @@ import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
|
|
|
2
2
|
import { RunContext } from '../../models/run-context.model';
|
|
3
3
|
import { TaskExecution } from '../../models/task-execution.model';
|
|
4
4
|
import { OutputObfuscator } from '../../terminal-output/output-obfuscator';
|
|
5
|
-
export declare class
|
|
5
|
+
export declare class CloudEnabledLifeCycle {
|
|
6
6
|
private readonly runContext;
|
|
7
7
|
private readonly cacheDirectory;
|
|
8
8
|
private readonly collectTerminalOutput;
|
|
9
9
|
private readonly cacheableOperations;
|
|
10
10
|
private readonly outputObfuscator;
|
|
11
|
+
private readonly tasks;
|
|
11
12
|
private static MAX_CHARACTERS_FAILED_TASK;
|
|
12
13
|
private static MAX_CHARACTERS_SUCCESSFUL_TASK;
|
|
13
14
|
private static MAX_CHARACTERS_CACHED_TASK;
|
|
14
|
-
|
|
15
|
-
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator);
|
|
15
|
+
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator, tasks: TaskExecution[]);
|
|
16
16
|
scheduleTask(task: Task): void;
|
|
17
17
|
startTask(task: Task): void;
|
|
18
18
|
endTask(task: Task, code: number): void;
|
|
19
|
+
endCommand(): void;
|
|
19
20
|
private getTerminalOutput;
|
|
20
21
|
private cleanUpHashDetails;
|
|
21
22
|
private readTerminalOutputFile;
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CloudEnabledLifeCycle = void 0;
|
|
4
|
+
const utils_1 = require("@nrwl/workspace/src/tasks-runner/utils");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
const path = require("path");
|
|
9
|
+
class CloudEnabledLifeCycle {
|
|
10
|
+
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
11
|
+
this.runContext = runContext;
|
|
12
|
+
this.cacheDirectory = cacheDirectory;
|
|
13
|
+
this.collectTerminalOutput = collectTerminalOutput;
|
|
14
|
+
this.cacheableOperations = cacheableOperations;
|
|
15
|
+
this.outputObfuscator = outputObfuscator;
|
|
16
|
+
this.tasks = tasks;
|
|
17
|
+
}
|
|
18
|
+
scheduleTask(task) {
|
|
19
|
+
this.runContext.scheduledTasks.push(task);
|
|
20
|
+
}
|
|
21
|
+
startTask(task) {
|
|
22
|
+
const overrides = Object.assign({}, (task.overrides || {}));
|
|
23
|
+
if (task.target.configuration) {
|
|
24
|
+
overrides['configuration'] = task.target.configuration;
|
|
25
|
+
}
|
|
26
|
+
this.tasks.push({
|
|
27
|
+
taskId: task.id,
|
|
28
|
+
startTime: new Date().toISOString(),
|
|
29
|
+
target: task.target.target,
|
|
30
|
+
projectName: task.target.project,
|
|
31
|
+
hash: task.hash,
|
|
32
|
+
hashDetails: this.cleanUpHashDetails(task.hashDetails),
|
|
33
|
+
params: (0, utils_1.unparse)(overrides).join(' '),
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
endTask(task, code) {
|
|
37
|
+
const startedTask = this.tasks.find((t) => t.taskId === task.id);
|
|
38
|
+
if (!startedTask) {
|
|
39
|
+
throw new Error(`Cannot find task ${task.id}`);
|
|
40
|
+
}
|
|
41
|
+
startedTask.endTime = new Date().toISOString();
|
|
42
|
+
startedTask.status = code;
|
|
43
|
+
startedTask.params = this.outputObfuscator.obfuscate(startedTask.params);
|
|
44
|
+
if (this.runContext.statuses[task.hash]) {
|
|
45
|
+
startedTask.cacheStatus = this.runContext.statuses[task.hash];
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
if (this.cacheableOperations.indexOf(task.target.target) > -1) {
|
|
49
|
+
startedTask.cacheStatus = 'local-cache-hit';
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
startedTask.cacheStatus = 'cache-miss';
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
if (this.collectTerminalOutput) {
|
|
56
|
+
startedTask.terminalOutput = this.getTerminalOutput(task.hash, startedTask.cacheStatus, code);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
endCommand() { }
|
|
60
|
+
getTerminalOutput(hash, cacheStatus, code) {
|
|
61
|
+
let dir;
|
|
62
|
+
if (this.cacheDirectory) {
|
|
63
|
+
if (this.cacheDirectory.startsWith('./')) {
|
|
64
|
+
dir = (0, path_1.join)(app_root_1.appRootPath, this.cacheDirectory);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
dir = this.cacheDirectory;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
dir = (0, path_1.join)(app_root_1.appRootPath, 'node_modules', '.cache', 'nx');
|
|
72
|
+
}
|
|
73
|
+
try {
|
|
74
|
+
const taskOutput = this.readTerminalOutputFile(dir, hash);
|
|
75
|
+
const taskOutputSanitized = this.outputObfuscator.obfuscate(taskOutput);
|
|
76
|
+
const maxCharacters = cacheStatus === 'cache-miss'
|
|
77
|
+
? code === 0
|
|
78
|
+
? CloudEnabledLifeCycle.MAX_CHARACTERS_SUCCESSFUL_TASK
|
|
79
|
+
: CloudEnabledLifeCycle.MAX_CHARACTERS_FAILED_TASK
|
|
80
|
+
: CloudEnabledLifeCycle.MAX_CHARACTERS_CACHED_TASK;
|
|
81
|
+
return taskOutputSanitized.length > maxCharacters
|
|
82
|
+
? `TRUNCATED\n\n${taskOutputSanitized.slice(taskOutputSanitized.length - maxCharacters)}`
|
|
83
|
+
: taskOutputSanitized;
|
|
84
|
+
}
|
|
85
|
+
catch (e) {
|
|
86
|
+
return '';
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
cleanUpHashDetails(hashDetails) {
|
|
90
|
+
const nodes = {};
|
|
91
|
+
Object.keys(hashDetails.nodes)
|
|
92
|
+
.filter((k) => !k.startsWith('npm:'))
|
|
93
|
+
.forEach((k) => {
|
|
94
|
+
nodes[k] = hashDetails.nodes[k];
|
|
95
|
+
});
|
|
96
|
+
return {
|
|
97
|
+
nodes,
|
|
98
|
+
runtime: hashDetails.runtime,
|
|
99
|
+
implicitDeps: hashDetails.implicitDeps,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
readTerminalOutputFile(dir, hash) {
|
|
103
|
+
try {
|
|
104
|
+
return (0, fs_1.readFileSync)(path.join(dir, 'terminalOutputs', hash)).toString();
|
|
105
|
+
}
|
|
106
|
+
catch (_a) {
|
|
107
|
+
try {
|
|
108
|
+
return (0, fs_1.readFileSync)(path.join(dir, hash, 'terminalOutput')).toString();
|
|
109
|
+
}
|
|
110
|
+
catch (_b) {
|
|
111
|
+
return '';
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
exports.CloudEnabledLifeCycle = CloudEnabledLifeCycle;
|
|
117
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_FAILED_TASK = 200000;
|
|
118
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_SUCCESSFUL_TASK = 20000;
|
|
119
|
+
CloudEnabledLifeCycle.MAX_CHARACTERS_CACHED_TASK = 5000;
|
|
120
|
+
//# sourceMappingURL=cloud-enabled-life-cycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":"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"}
|