@nrwl/nx-cloud 13.2.0-beta.2 → 13.2.0-beta.3
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/lib/core/api/run-group.api.js +3 -3
- 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 +2 -2
- package/lib/core/commands/start-ci-run.js.map +1 -1
- package/lib/core/commands/stop-all-agents.js +2 -2
- package/lib/core/commands/stop-all-agents.js.map +1 -1
- package/lib/core/error/print-run-group-error.js +2 -2
- package/lib/core/error/print-run-group-error.js.map +1 -1
- package/lib/core/file-storage/file-storage.js +5 -5
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/models/cloud-task-runner-options.d.ts +11 -1
- package/lib/core/models/distributed-agent/index.js +5 -1
- package/lib/core/models/distributed-agent/index.js.map +1 -1
- package/lib/core/models/run-context.model.d.ts +30 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.d.ts +1 -3
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +5 -6
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.d.ts +2 -2
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +6 -7
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.d.ts +1 -2
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +4 -4
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +5 -5
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +3 -3
- package/lib/core/runners/distributed-agent/distributed-agent.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +9 -9
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.d.ts +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +3 -4
- package/lib/core/runners/distributed-execution/distributed-execution.api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.d.ts +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +17 -19
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/terminal-output/message-reporter.js +2 -2
- package/lib/core/terminal-output/message-reporter.js.map +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 +6 -7
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/axios.js +2 -2
- package/lib/utilities/axios.js.map +1 -1
- package/lib/utilities/create-no-new-messages-timeout.js +2 -2
- package/lib/utilities/create-no-new-messages-timeout.js.map +1 -1
- package/lib/utilities/environment.js +2 -2
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/nx-imports.d.ts +0 -0
- package/lib/utilities/nx-imports.js +39 -0
- package/lib/utilities/nx-imports.js.map +1 -0
- package/lib/utilities/print-message.js +8 -8
- package/lib/utilities/print-message.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.RunGroupApi = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const axios_1 = require("../../utilities/axios");
|
|
15
14
|
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
15
|
+
const { output } = require('../../utilities/nx-imports');
|
|
16
16
|
class RunGroupApi {
|
|
17
17
|
constructor(options) {
|
|
18
18
|
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
@@ -32,7 +32,7 @@ class RunGroupApi {
|
|
|
32
32
|
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
33
33
|
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
34
34
|
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
35
|
-
|
|
35
|
+
output.error({
|
|
36
36
|
title: e.message,
|
|
37
37
|
});
|
|
38
38
|
process.exit(1);
|
|
@@ -53,7 +53,7 @@ class RunGroupApi {
|
|
|
53
53
|
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
54
54
|
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
55
55
|
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
56
|
-
|
|
56
|
+
output.error({
|
|
57
57
|
title: e.message,
|
|
58
58
|
});
|
|
59
59
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAG+B;AAC/B,iEAIuC;AAEvC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,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,EAAC,GAAG,EAAE,CACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,EAAE;oBAClE,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,QAAQ;iBACnB,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;;KACF;IAEK,gBAAgB,CAAC,QAAgB;;;YACrC,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YAExD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,yCAAyC,EAAE;oBACpE,QAAQ,EAAE,QAAQ;iBACnB,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;;KACF;CACF;AAtDD,kCAsDC"}
|
|
@@ -11,16 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.cleanUpAgents = void 0;
|
|
13
13
|
const stripJsonComments = require("strip-json-comments");
|
|
14
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
15
14
|
const environment_1 = require("../../utilities/environment");
|
|
16
15
|
const fs_1 = require("fs");
|
|
16
|
+
const { output } = require('../../utilities/nx-imports');
|
|
17
17
|
function cleanUpAgents() {
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
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) {
|
|
23
|
-
|
|
23
|
+
output.note({
|
|
24
24
|
title: `Cleaning up agent metadata for this workspace.`,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-up-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/clean-up-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"clean-up-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/clean-up-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,6DAA8D;AAC9D,2BAAsC;AAEtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACzD,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,MAAM,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"}
|
|
@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.startCiRun = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const stripJsonComments = require("strip-json-comments");
|
|
15
14
|
const environment_1 = require("../../utilities/environment");
|
|
16
15
|
const print_run_group_error_1 = require("../error/print-run-group-error");
|
|
17
16
|
const run_group_api_1 = require("../api/run-group.api");
|
|
18
17
|
const fs_1 = require("fs");
|
|
18
|
+
const { output } = require('../../utilities/nx-imports');
|
|
19
19
|
function startCiRun() {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
const branch = (0, environment_1.getBranch)();
|
|
@@ -25,7 +25,7 @@ function startCiRun() {
|
|
|
25
25
|
process.exit(1);
|
|
26
26
|
}
|
|
27
27
|
if (environment_1.VERBOSE_LOGGING) {
|
|
28
|
-
|
|
28
|
+
output.note({
|
|
29
29
|
title: `Creating run group ${runGroup}`,
|
|
30
30
|
});
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,6DAIqC;AACrC,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAElC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACzD,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,MAAM,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"}
|
|
@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.stopAllAgents = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const stripJsonComments = require("strip-json-comments");
|
|
15
14
|
const environment_1 = require("../../utilities/environment");
|
|
16
15
|
const print_run_group_error_1 = require("../error/print-run-group-error");
|
|
17
16
|
const run_group_api_1 = require("../api/run-group.api");
|
|
18
17
|
const fs_1 = require("fs");
|
|
18
|
+
const { output } = require('../../utilities/nx-imports');
|
|
19
19
|
function stopAllAgents() {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
const runGroup = (0, environment_1.getRunGroup)();
|
|
@@ -24,7 +24,7 @@ function stopAllAgents() {
|
|
|
24
24
|
process.exit(1);
|
|
25
25
|
}
|
|
26
26
|
if (environment_1.VERBOSE_LOGGING) {
|
|
27
|
-
|
|
27
|
+
output.note({
|
|
28
28
|
title: `Stopping all agents running tasks for run group ${runGroup}`,
|
|
29
29
|
});
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,6DAA2E;AAC3E,0EAAoE;AACpE,wDAAmD;AACnD,2BAAkC;AAClC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,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,MAAM,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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.printRunGroupError = void 0;
|
|
4
|
-
const
|
|
4
|
+
const { output } = require('../../utilities/nx-imports');
|
|
5
5
|
function printRunGroupError() {
|
|
6
|
-
|
|
6
|
+
output.error({
|
|
7
7
|
title: `Unable to determine NX_RUN_GROUP`,
|
|
8
8
|
bodyLines: [
|
|
9
9
|
'- Agents run tasks for a given run group (which often corresponds to a run in CI).',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-run-group-error.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/error/print-run-group-error.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"print-run-group-error.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/error/print-run-group-error.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,SAAgB,kBAAkB;IAChC,MAAM,CAAC,KAAK,CAAC;QACX,KAAK,EAAE,kCAAkC;QACzC,SAAS,EAAE;YACT,oFAAoF;YACpF,+EAA+E;YAC/E,oEAAoE;SACrE;KACF,CAAC,CAAC;AACL,CAAC;AATD,gDASC"}
|
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.FileStorage = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const path = require("path");
|
|
15
14
|
const environment_1 = require("../../utilities/environment");
|
|
16
15
|
const axios_1 = require("../../utilities/axios");
|
|
@@ -19,6 +18,7 @@ const waiter_1 = require("../../utilities/waiter");
|
|
|
19
18
|
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
20
19
|
const axios = require('axios');
|
|
21
20
|
const tar = require('tar');
|
|
21
|
+
const { output } = require('../../utilities/nx-imports');
|
|
22
22
|
class FileStorage {
|
|
23
23
|
constructor(encryption) {
|
|
24
24
|
this.encryption = encryption;
|
|
@@ -26,7 +26,7 @@ class FileStorage {
|
|
|
26
26
|
retrieve(hash, url, cacheDirectory) {
|
|
27
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
28
|
if (environment_1.VERBOSE_LOGGING) {
|
|
29
|
-
|
|
29
|
+
output.note({
|
|
30
30
|
title: `Nx Cloud: Downloading ${hash}`,
|
|
31
31
|
bodyLines: [`RETRIEVAL URL: ${url}`],
|
|
32
32
|
});
|
|
@@ -36,14 +36,14 @@ class FileStorage {
|
|
|
36
36
|
yield this.downloadFile(url, tgz, commitFilePath);
|
|
37
37
|
this.createCommitFile(commitFilePath);
|
|
38
38
|
if (environment_1.VERBOSE_LOGGING) {
|
|
39
|
-
|
|
39
|
+
output.note({ title: `Nx Cloud: Downloaded ${hash}` });
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
store(hash, url, cacheDirectory) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
if (environment_1.VERBOSE_LOGGING) {
|
|
46
|
-
|
|
46
|
+
output.note({
|
|
47
47
|
title: `Nx Cloud: Storing ${hash}`,
|
|
48
48
|
bodyLines: [`STORAGE URL: ${url}`],
|
|
49
49
|
});
|
|
@@ -51,7 +51,7 @@ class FileStorage {
|
|
|
51
51
|
const tgz = yield this.createFile(hash, cacheDirectory);
|
|
52
52
|
yield this.uploadFile(url, tgz);
|
|
53
53
|
if (environment_1.VERBOSE_LOGGING) {
|
|
54
|
-
|
|
54
|
+
output.note({ title: `Nx Cloud: Stored ${hash}` });
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,14 @@
|
|
|
1
|
-
|
|
1
|
+
export interface DefaultTasksRunnerOptions {
|
|
2
|
+
parallel?: number;
|
|
3
|
+
cacheableOperations?: string[];
|
|
4
|
+
cacheableTargets?: string[];
|
|
5
|
+
runtimeCacheInputs?: string[];
|
|
6
|
+
cacheDirectory?: string;
|
|
7
|
+
remoteCache?: any;
|
|
8
|
+
lifeCycle: any;
|
|
9
|
+
captureStderr?: boolean;
|
|
10
|
+
skipNxCache?: boolean;
|
|
11
|
+
}
|
|
2
12
|
export interface CloudTaskRunnerOptions extends DefaultTasksRunnerOptions {
|
|
3
13
|
accessToken?: string;
|
|
4
14
|
canTrackAnalytics?: boolean;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/models/distributed-agent/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/models/distributed-agent/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,0DAAwC;AACxC,6DAA2C"}
|
|
@@ -1,5 +1,34 @@
|
|
|
1
|
-
import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
|
|
2
1
|
import { CacheUrls } from './cache-urls.model';
|
|
2
|
+
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
|
|
3
|
+
export interface TaskResult {
|
|
4
|
+
task: Task;
|
|
5
|
+
status: TaskStatus;
|
|
6
|
+
code: number;
|
|
7
|
+
terminalOutput?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface Task {
|
|
10
|
+
id: string;
|
|
11
|
+
target: {
|
|
12
|
+
project: string;
|
|
13
|
+
target: string;
|
|
14
|
+
configuration?: string;
|
|
15
|
+
};
|
|
16
|
+
overrides: any;
|
|
17
|
+
projectRoot?: string;
|
|
18
|
+
hash?: string;
|
|
19
|
+
hashDetails?: {
|
|
20
|
+
command: string;
|
|
21
|
+
nodes: {
|
|
22
|
+
[name: string]: string;
|
|
23
|
+
};
|
|
24
|
+
implicitDeps: {
|
|
25
|
+
[fileName: string]: string;
|
|
26
|
+
};
|
|
27
|
+
runtime: {
|
|
28
|
+
[input: string]: string;
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
}
|
|
3
32
|
export declare type RunContext = {
|
|
4
33
|
statuses: {
|
|
5
34
|
[hash: string]: 'remote-cache-hit' | 'cache-miss';
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { Task } from '
|
|
2
|
-
import { RunContext } from '../../models/run-context.model';
|
|
1
|
+
import { RunContext, Task, TaskResult } from '../../models/run-context.model';
|
|
3
2
|
import { TaskExecution } from '../../models/task-execution.model';
|
|
4
3
|
import { OutputObfuscator } from '../../terminal-output/output-obfuscator';
|
|
5
|
-
import { TaskResult } from '@nrwl/workspace/src/tasks-runner/life-cycle';
|
|
6
4
|
export declare class CloudEnabledLifeCycle {
|
|
7
5
|
private readonly runContext;
|
|
8
6
|
private readonly cacheDirectory;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CloudEnabledLifeCycle = void 0;
|
|
4
|
-
const
|
|
4
|
+
const path = require("path");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
|
|
7
6
|
const fs_1 = require("fs");
|
|
8
|
-
const
|
|
7
|
+
const { appRootPath, unparse } = require('../../../utilities/nx-imports');
|
|
9
8
|
class CloudEnabledLifeCycle {
|
|
10
9
|
constructor(runContext, cacheDirectory, skipNxCache, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
11
10
|
this.runContext = runContext;
|
|
@@ -31,7 +30,7 @@ class CloudEnabledLifeCycle {
|
|
|
31
30
|
projectName: task.target.project,
|
|
32
31
|
hash: task.hash,
|
|
33
32
|
hashDetails: this.cleanUpHashDetails(task.hashDetails),
|
|
34
|
-
params:
|
|
33
|
+
params: unparse(overrides).join(' '),
|
|
35
34
|
});
|
|
36
35
|
}
|
|
37
36
|
// Used for older version for Nx. Remove in Dec 2022
|
|
@@ -80,14 +79,14 @@ class CloudEnabledLifeCycle {
|
|
|
80
79
|
let dir;
|
|
81
80
|
if (this.cacheDirectory) {
|
|
82
81
|
if (this.cacheDirectory.startsWith('./')) {
|
|
83
|
-
dir = (0, path_1.join)(
|
|
82
|
+
dir = (0, path_1.join)(appRootPath, this.cacheDirectory);
|
|
84
83
|
}
|
|
85
84
|
else {
|
|
86
85
|
dir = this.cacheDirectory;
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
else {
|
|
90
|
-
dir = (0, path_1.join)(
|
|
89
|
+
dir = (0, path_1.join)(appRootPath, 'node_modules', '.cache', 'nx');
|
|
91
90
|
}
|
|
92
91
|
try {
|
|
93
92
|
const taskOutput = this.readTerminalOutputFile(dir, hash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AffectedEvent, Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
|
|
2
1
|
import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
|
|
3
2
|
import type { Observable } from 'rxjs';
|
|
4
|
-
|
|
3
|
+
import { Task } from '../../models/run-context.model';
|
|
4
|
+
export declare function cloudEnabledTasksRunner(tasks: Task[], options: CloudTaskRunnerOptions, context: any): Observable<any>;
|
|
@@ -19,12 +19,11 @@ const file_storage_1 = require("../../file-storage/file-storage");
|
|
|
19
19
|
const e2e_encryption_1 = require("../../file-storage/e2e-encryption");
|
|
20
20
|
const environment_1 = require("../../../utilities/environment");
|
|
21
21
|
const cloud_remote_cache_1 = require("./cloud-remote-cache");
|
|
22
|
-
const tasks_runner_v2_1 = require("@nrwl/workspace/src/tasks-runner/tasks-runner-v2");
|
|
23
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
24
22
|
const cloud_run_api_1 = require("./cloud-run.api");
|
|
25
23
|
const fs_1 = require("fs");
|
|
26
24
|
const path = require("path");
|
|
27
25
|
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
26
|
+
const { tasksRunnerV2, output } = require('../../../utilities/nx-imports');
|
|
28
27
|
function createApi(errors, options, runContext) {
|
|
29
28
|
const machineInfo = (0, environment_1.getMachineInfo)(options);
|
|
30
29
|
return new cloud_run_api_1.CloudRunApi(errors, runContext, options, machineInfo);
|
|
@@ -35,7 +34,7 @@ function storeTaskHashes(taskExecutions, directory, distributedExecutionId) {
|
|
|
35
34
|
hash: t.hash,
|
|
36
35
|
})));
|
|
37
36
|
if (environment_1.VERBOSE_LOGGING) {
|
|
38
|
-
|
|
37
|
+
output.note({
|
|
39
38
|
title: `Executed tasks with hashes: ${hashes}`,
|
|
40
39
|
});
|
|
41
40
|
}
|
|
@@ -82,14 +81,14 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
82
81
|
}
|
|
83
82
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
84
83
|
if (!endRequest[0]) {
|
|
85
|
-
|
|
84
|
+
output.error({
|
|
86
85
|
title: `Agent wasn't able to store artifacts`,
|
|
87
86
|
});
|
|
88
87
|
messages.printMessages();
|
|
89
88
|
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
90
89
|
}
|
|
91
90
|
if (!endRequest[1]) {
|
|
92
|
-
|
|
91
|
+
output.error({
|
|
93
92
|
title: `Agent wasn't able to record its run`,
|
|
94
93
|
});
|
|
95
94
|
messages.printMessages();
|
|
@@ -102,7 +101,7 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
102
101
|
function createLifeCycle(runContext, options, outputObfuscator, tasks) {
|
|
103
102
|
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, options.cacheDirectory, !!options.skipNxCache, options.scan === undefined ? true : options.scan, options.cacheableOperations || [], outputObfuscator, tasks);
|
|
104
103
|
try {
|
|
105
|
-
const { CompositeLifeCycle
|
|
104
|
+
const { CompositeLifeCycle } = require('../../../utilities/nx-imports');
|
|
106
105
|
if (!CompositeLifeCycle)
|
|
107
106
|
return cloudEnabledLifeCycle;
|
|
108
107
|
return new CompositeLifeCycle([options.lifeCycle, cloudEnabledLifeCycle]);
|
|
@@ -136,7 +135,7 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
136
135
|
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage);
|
|
137
136
|
// have to reset it so we don't capture inner tasks
|
|
138
137
|
delete process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
139
|
-
const res =
|
|
138
|
+
const res = tasksRunnerV2(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
|
|
140
139
|
// observable -> legacy
|
|
141
140
|
if (res.subscribe) {
|
|
142
141
|
const wrappedRes = new Subject_1.Subject();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { RemoteCache } from '@nrwl/workspace/src/tasks-runner/tasks-runner-v2';
|
|
2
1
|
import { CloudRunApi } from './cloud-run.api';
|
|
3
2
|
import { RunContext } from '../../models/run-context.model';
|
|
4
3
|
import { FileStorage } from '../../file-storage/file-storage';
|
|
5
4
|
import { MessageReporter } from '../../terminal-output/message-reporter';
|
|
6
|
-
export declare class CloudRemoteCache
|
|
5
|
+
export declare class CloudRemoteCache {
|
|
7
6
|
private readonly messages;
|
|
8
7
|
private readonly api;
|
|
9
8
|
private readonly runContext;
|
|
@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CloudRemoteCache = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const environment_1 = require("../../../utilities/environment");
|
|
14
|
+
const { output } = require('../../../utilities/nx-imports');
|
|
15
15
|
class CloudRemoteCache {
|
|
16
16
|
constructor(messages, api, runContext, fileStorage) {
|
|
17
17
|
this.messages = messages;
|
|
@@ -28,7 +28,7 @@ class CloudRemoteCache {
|
|
|
28
28
|
const hashUrls = yield this.hashUrls(hash);
|
|
29
29
|
if (!hashUrls || !hashUrls.get) {
|
|
30
30
|
if (environment_1.VERBOSE_LOGGING) {
|
|
31
|
-
|
|
31
|
+
output.note({ title: `Nx Cloud: Cache miss ${hash}.` });
|
|
32
32
|
}
|
|
33
33
|
this.runContext.statuses[hash] = 'cache-miss';
|
|
34
34
|
return false;
|
|
@@ -42,7 +42,7 @@ class CloudRemoteCache {
|
|
|
42
42
|
const e = (_a = ee.axiosException) !== null && _a !== void 0 ? _a : ee;
|
|
43
43
|
if (e.response && e.response.status === 404) {
|
|
44
44
|
if (environment_1.VERBOSE_LOGGING) {
|
|
45
|
-
|
|
45
|
+
output.note({ title: `Nx Cloud: Cache miss ${hash}. Status 404.` });
|
|
46
46
|
}
|
|
47
47
|
// cache miss. print nothing
|
|
48
48
|
}
|
|
@@ -65,7 +65,7 @@ class CloudRemoteCache {
|
|
|
65
65
|
return false;
|
|
66
66
|
if (!hashUrls.put) {
|
|
67
67
|
if (environment_1.VERBOSE_LOGGING) {
|
|
68
|
-
|
|
68
|
+
output.note({
|
|
69
69
|
title: `Nx Cloud: Skipping storing ${hash}. Read only token is used.`,
|
|
70
70
|
});
|
|
71
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CloudRunApi = void 0;
|
|
13
|
-
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
14
13
|
const axios_1 = require("../../../utilities/axios");
|
|
15
14
|
const environment_1 = require("../../../utilities/environment");
|
|
16
15
|
const fs_1 = require("fs");
|
|
17
16
|
const zlib_1 = require("zlib");
|
|
18
17
|
const util_1 = require("util");
|
|
19
18
|
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
19
|
+
const { output } = require('../../../utilities/nx-imports');
|
|
20
20
|
class CloudRunApi {
|
|
21
21
|
constructor(messages, runContext, options, machineInfo) {
|
|
22
22
|
this.messages = messages;
|
|
@@ -39,7 +39,7 @@ class CloudRunApi {
|
|
|
39
39
|
hashes,
|
|
40
40
|
};
|
|
41
41
|
if (environment_1.VERBOSE_LOGGING) {
|
|
42
|
-
|
|
42
|
+
output.note({
|
|
43
43
|
title: 'RunStart',
|
|
44
44
|
bodyLines: ['\n' + JSON.stringify(request, null, 2)],
|
|
45
45
|
});
|
|
@@ -88,7 +88,7 @@ class CloudRunApi {
|
|
|
88
88
|
? `${tt.terminalOutput.slice(0, 20)}...`
|
|
89
89
|
: undefined });
|
|
90
90
|
});
|
|
91
|
-
|
|
91
|
+
output.note({
|
|
92
92
|
title: 'RunEnd. Completed tasks',
|
|
93
93
|
bodyLines: ['\n' + JSON.stringify(t, null, 2)],
|
|
94
94
|
});
|
|
@@ -114,14 +114,14 @@ class CloudRunApi {
|
|
|
114
114
|
this.messages.apiError = `Invalid end run response: ${JSON.stringify(resp.data)}`;
|
|
115
115
|
}
|
|
116
116
|
if (environment_1.VERBOSE_LOGGING) {
|
|
117
|
-
|
|
117
|
+
output.note({
|
|
118
118
|
title: 'Invalid end run response',
|
|
119
119
|
bodyLines: [JSON.stringify(resp.data, null, 2)],
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
else {
|
|
124
|
-
|
|
124
|
+
output.error({
|
|
125
125
|
title: 'Nx Cloud: Unknown Error Occurred',
|
|
126
126
|
bodyLines: [
|
|
127
127
|
'Run completion responded with `undefined`.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-run.api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-run.api.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cloud-run.api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-run.api.ts"],"names":[],"mappings":"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"}
|