@nrwl/nx-cloud 13.3.1 → 13.5.1-beta.1
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 +10 -3
- package/bin/nx-cloud.js.map +1 -1
- package/generators.json +12 -0
- package/lib/core/api/error-reporter.api.d.ts +6 -0
- package/lib/core/api/error-reporter.api.js +36 -0
- package/lib/core/api/error-reporter.api.js.map +1 -0
- package/lib/core/api/run-group.api.d.ts +2 -2
- package/lib/core/api/run-group.api.js +73 -1
- package/lib/core/api/run-group.api.js.map +1 -1
- package/lib/core/commands/clean-up-agents.js +3 -3
- package/lib/core/commands/clean-up-agents.js.map +1 -1
- package/lib/core/commands/record-output.d.ts +0 -15
- package/lib/core/commands/record-output.js +36 -57
- package/lib/core/commands/record-output.js.map +1 -1
- package/lib/core/commands/start-ci-run.js +27 -5
- package/lib/core/commands/start-ci-run.js.map +1 -1
- package/lib/core/commands/stop-all-agents.js +6 -3
- package/lib/core/commands/stop-all-agents.js.map +1 -1
- package/lib/core/commands/upload-and-show-run-details.d.ts +1 -0
- package/lib/core/commands/upload-and-show-run-details.js +65 -0
- package/lib/core/commands/upload-and-show-run-details.js.map +1 -0
- package/lib/core/error/print-cacheable-targets-error.d.ts +1 -0
- package/lib/core/error/print-cacheable-targets-error.js +15 -0
- package/lib/core/error/print-cacheable-targets-error.js.map +1 -0
- package/lib/core/error/print-invalid-runner-error.d.ts +1 -0
- package/lib/core/error/print-invalid-runner-error.js +17 -0
- package/lib/core/error/print-invalid-runner-error.js.map +1 -0
- package/lib/core/error/print-run-group-error.d.ts +1 -0
- package/lib/core/error/print-run-group-error.js +9 -5
- package/lib/core/error/print-run-group-error.js.map +1 -1
- package/lib/core/file-storage/file-storage.d.ts +11 -1
- package/lib/core/file-storage/file-storage.js +103 -21
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/models/cloud-task-runner-options.d.ts +1 -1
- package/lib/core/models/distributed-agent/tasks-api-response.model.d.ts +6 -0
- package/lib/core/models/run-context.model.d.ts +89 -1
- package/lib/core/models/run-context.model.js +19 -0
- package/lib/core/models/run-context.model.js.map +1 -1
- package/lib/core/models/run-data.model.d.ts +1 -1
- package/lib/core/models/task-execution.model.d.ts +1 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.d.ts +1 -7
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +93 -1
- 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 +1 -2
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +320 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.d.ts +8 -2
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +133 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.d.ts +7 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +168 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/cloud-enabled/id-generator.d.ts +1 -0
- package/lib/core/runners/cloud-enabled/id-generator.js +16 -0
- package/lib/core/runners/cloud-enabled/id-generator.js.map +1 -0
- package/lib/core/runners/distributed-agent/distributed-agent.api.d.ts +6 -3
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +93 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +157 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-agent/execute-tasks.d.ts +10 -0
- package/lib/core/runners/distributed-agent/execute-tasks.js +114 -0
- package/lib/core/runners/distributed-agent/execute-tasks.js.map +1 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.d.ts +9 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +58 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js.map +1 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.d.ts +9 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js +97 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js.map +1 -0
- package/lib/core/runners/distributed-execution/distributed-execution.api.d.ts +2 -2
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +152 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.d.ts +0 -11
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +118 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/runners/distributed-execution/process-task.d.ts +7 -0
- package/lib/core/runners/distributed-execution/process-task.js +45 -0
- package/lib/core/runners/distributed-execution/process-task.js.map +1 -0
- package/lib/core/runners/distributed-execution/process-tasks.d.ts +7 -0
- package/lib/core/runners/distributed-execution/process-tasks.js +67 -0
- package/lib/core/runners/distributed-execution/process-tasks.js.map +1 -0
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.d.ts +2 -0
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js +37 -0
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js.map +1 -0
- package/lib/core/runners/distributed-execution/task-graph-creator.d.ts +17 -0
- package/lib/core/runners/distributed-execution/task-graph-creator.js +100 -0
- package/lib/core/runners/distributed-execution/task-graph-creator.js.map +1 -0
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -1
- package/lib/core/terminal-output/end-of-run-message.js +18 -10
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/lib/core/terminal-output/read-task-terminal-output.d.ts +2 -0
- package/lib/core/terminal-output/read-task-terminal-output.js +60 -0
- package/lib/core/terminal-output/read-task-terminal-output.js.map +1 -0
- package/lib/daemon/process-run-end.d.ts +3 -0
- package/lib/daemon/process-run-end.js +66 -0
- package/lib/daemon/process-run-end.js.map +1 -0
- package/lib/generators/init/init.d.ts +1 -2
- package/lib/generators/init/init.js +33 -56
- package/lib/generators/init/init.js.map +1 -1
- package/lib/generators/init/schema.json +5 -0
- package/lib/nx-cloud-tasks-runner.js +83 -25
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/axios.d.ts +2 -1
- package/lib/utilities/axios.js +26 -12
- package/lib/utilities/axios.js.map +1 -1
- package/lib/utilities/create-unchanged-value-timeout.d.ts +4 -0
- package/lib/utilities/{create-no-new-messages-timeout.js → create-unchanged-value-timeout.js} +6 -7
- package/lib/utilities/create-unchanged-value-timeout.js.map +1 -0
- package/lib/utilities/distributed-task-execution-detection.d.ts +2 -0
- package/lib/utilities/distributed-task-execution-detection.js +36 -0
- package/lib/utilities/distributed-task-execution-detection.js.map +1 -0
- package/lib/utilities/dte-artifact-storage.d.ts +7 -0
- package/lib/utilities/dte-artifact-storage.js +43 -0
- package/lib/utilities/dte-artifact-storage.js.map +1 -0
- package/lib/utilities/environment.d.ts +11 -7
- package/lib/utilities/environment.js +97 -33
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/is-ci.d.ts +1 -0
- package/lib/utilities/is-ci.js +21 -0
- package/lib/utilities/is-ci.js.map +1 -0
- package/lib/utilities/metric-logger.js +2 -2
- package/lib/utilities/metric-logger.js.map +1 -1
- package/lib/utilities/nx-imports.js +54 -33
- package/lib/utilities/nx-imports.js.map +1 -1
- package/lib/utilities/print-message.js +40 -11
- package/lib/utilities/print-message.js.map +1 -1
- package/lib/utilities/serializer-overrides.d.ts +3 -0
- package/lib/utilities/serializer-overrides.js +44 -0
- package/lib/utilities/serializer-overrides.js.map +1 -0
- package/package.json +7 -6
- package/project.json +37 -0
- package/tsconfig.lib.json +1 -1
- package/tsconfig.spec.json +2 -1
- package/collection.json +0 -22
- package/lib/utilities/create-no-new-messages-timeout.d.ts +0 -1
- package/lib/utilities/create-no-new-messages-timeout.js.map +0 -1
|
@@ -1 +1,93 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CloudEnabledLifeCycle = void 0;
|
|
4
|
+
const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
|
|
5
|
+
const read_task_terminal_output_1 = require("../../terminal-output/read-task-terminal-output");
|
|
6
|
+
class CloudEnabledLifeCycle {
|
|
7
|
+
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
8
|
+
this.runContext = runContext;
|
|
9
|
+
this.cacheDirectory = cacheDirectory;
|
|
10
|
+
this.collectTerminalOutput = collectTerminalOutput;
|
|
11
|
+
this.cacheableOperations = cacheableOperations;
|
|
12
|
+
this.outputObfuscator = outputObfuscator;
|
|
13
|
+
this.tasks = tasks;
|
|
14
|
+
}
|
|
15
|
+
scheduleTask(task) {
|
|
16
|
+
this.runContext.scheduledTasks.push(task);
|
|
17
|
+
}
|
|
18
|
+
// this gets called for every tasks that starts.
|
|
19
|
+
startTask(task) {
|
|
20
|
+
this.tasks.push({
|
|
21
|
+
taskId: task.id,
|
|
22
|
+
startTime: new Date().toISOString(),
|
|
23
|
+
target: task.target.target,
|
|
24
|
+
projectName: task.target.project,
|
|
25
|
+
hash: task.hash,
|
|
26
|
+
hashDetails: this.cleanUpHashDetails(task.hashDetails),
|
|
27
|
+
params: (0, serializer_overrides_1.serializeOverrides)(task),
|
|
28
|
+
uploadedToStorage: false,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
endTasks(tasks) {
|
|
32
|
+
// this can be called multiple times changing this time.
|
|
33
|
+
for (let t of tasks) {
|
|
34
|
+
let cacheStatus;
|
|
35
|
+
const taskIsRemoteCacheHit = t.status === 'remote-cache';
|
|
36
|
+
const taskIsLocalCacheHitPreNx135 = t.status === 'cache';
|
|
37
|
+
const taskIsLocalCacheHit = t.status === 'local-cache' ||
|
|
38
|
+
t.status === 'local-cache-kept-existing' ||
|
|
39
|
+
taskIsLocalCacheHitPreNx135;
|
|
40
|
+
if (this.runContext.statuses[t.task.hash]) {
|
|
41
|
+
cacheStatus = this.runContext.statuses[t.task.hash];
|
|
42
|
+
}
|
|
43
|
+
else if (taskIsRemoteCacheHit) {
|
|
44
|
+
cacheStatus = 'remote-cache-hit';
|
|
45
|
+
}
|
|
46
|
+
else if (taskIsLocalCacheHit) {
|
|
47
|
+
cacheStatus = 'local-cache-hit';
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
cacheStatus = 'cache-miss';
|
|
51
|
+
}
|
|
52
|
+
this.updateStartedTask(t, cacheStatus);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
endCommand() { }
|
|
56
|
+
updateStartedTask(result, cacheStatus) {
|
|
57
|
+
const startedTask = this.tasks.find((t) => t.taskId === result.task.id);
|
|
58
|
+
if (!startedTask) {
|
|
59
|
+
throw new Error(`Cannot find task ${result.task.id}`);
|
|
60
|
+
}
|
|
61
|
+
if ((result === null || result === void 0 ? void 0 : result.startTime) && (result === null || result === void 0 ? void 0 : result.endTime)) {
|
|
62
|
+
startedTask.startTime = new Date(result.startTime).toISOString();
|
|
63
|
+
startedTask.endTime = new Date(result.endTime).toISOString();
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
startedTask.endTime = new Date().toISOString();
|
|
67
|
+
}
|
|
68
|
+
startedTask.status = result.code;
|
|
69
|
+
startedTask.params = this.outputObfuscator.obfuscate(startedTask.params);
|
|
70
|
+
startedTask.cacheStatus = cacheStatus;
|
|
71
|
+
if (this.collectTerminalOutput) {
|
|
72
|
+
startedTask.terminalOutput = this.getTerminalOutput(result.task.hash, startedTask.cacheStatus, result.code);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
getTerminalOutput(hash, cacheStatus, code) {
|
|
76
|
+
return (0, read_task_terminal_output_1.readTaskTerminalOutput)(this.cacheDirectory, this.outputObfuscator, hash, cacheStatus, code);
|
|
77
|
+
}
|
|
78
|
+
cleanUpHashDetails(hashDetails) {
|
|
79
|
+
const nodes = {};
|
|
80
|
+
Object.keys(hashDetails.nodes)
|
|
81
|
+
.filter((k) => !k.startsWith('npm:'))
|
|
82
|
+
.forEach((k) => {
|
|
83
|
+
nodes[k] = hashDetails.nodes[k];
|
|
84
|
+
});
|
|
85
|
+
return {
|
|
86
|
+
nodes,
|
|
87
|
+
runtime: hashDetails.runtime,
|
|
88
|
+
implicitDeps: hashDetails.implicitDeps,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
exports.CloudEnabledLifeCycle = CloudEnabledLifeCycle;
|
|
93
|
+
//# sourceMappingURL=cloud-enabled-life-cycle.js.map
|
|
@@ -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,3 @@
|
|
|
1
1
|
import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
|
|
2
|
-
import type { Observable } from 'rxjs';
|
|
3
2
|
import { Task } from '../../models/run-context.model';
|
|
4
|
-
export declare function cloudEnabledTasksRunner(tasks: Task[], options: CloudTaskRunnerOptions, context: any):
|
|
3
|
+
export declare function cloudEnabledTasksRunner(tasks: Task[], options: CloudTaskRunnerOptions, context: any, inner?: boolean): any;
|
|
@@ -1 +1,320 @@
|
|
|
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.cloudEnabledTasksRunner = void 0;
|
|
13
|
+
const message_reporter_1 = require("../../terminal-output/message-reporter");
|
|
14
|
+
const end_of_run_message_1 = require("../../terminal-output/end-of-run-message");
|
|
15
|
+
const output_obfuscator_1 = require("../../terminal-output/output-obfuscator");
|
|
16
|
+
const cloud_enabled_life_cycle_1 = require("./cloud-enabled-life-cycle");
|
|
17
|
+
const file_storage_1 = require("../../file-storage/file-storage");
|
|
18
|
+
const e2e_encryption_1 = require("../../file-storage/e2e-encryption");
|
|
19
|
+
const environment_1 = require("../../../utilities/environment");
|
|
20
|
+
const cloud_remote_cache_1 = require("./cloud-remote-cache");
|
|
21
|
+
const cloud_run_api_1 = require("./cloud-run.api");
|
|
22
|
+
const fs_1 = require("fs");
|
|
23
|
+
const path = require("path");
|
|
24
|
+
const path_1 = require("path");
|
|
25
|
+
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
26
|
+
const error_reporter_api_1 = require("../../api/error-reporter.api");
|
|
27
|
+
const fs_extra_1 = require("fs-extra");
|
|
28
|
+
const id_generator_1 = require("./id-generator");
|
|
29
|
+
const { tasksRunner, output } = require('../../../utilities/nx-imports');
|
|
30
|
+
function createApi(errors, options, runContext) {
|
|
31
|
+
const machineInfo = (0, environment_1.getMachineInfo)(options);
|
|
32
|
+
return new cloud_run_api_1.CloudRunApi(errors, runContext, options, machineInfo);
|
|
33
|
+
}
|
|
34
|
+
function storeTaskHashes(taskExecutions, directory, distributedExecutionId) {
|
|
35
|
+
const hashes = JSON.stringify(taskExecutions.map((t) => ({
|
|
36
|
+
taskId: t.taskId,
|
|
37
|
+
hash: t.hash,
|
|
38
|
+
})));
|
|
39
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
40
|
+
output.note({
|
|
41
|
+
title: `Executed tasks with hashes: ${hashes}`,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
(0, fs_1.writeFileSync)(path.join(directory, `tasks-hashes-${distributedExecutionId}`), hashes);
|
|
45
|
+
}
|
|
46
|
+
/*
|
|
47
|
+
* It can happen that a task is executed multiple times on an agent, say for DTE1 and DTE2.
|
|
48
|
+
* When it runs for DTE2, it will be a local cache hit, so it will be marked as completed.
|
|
49
|
+
* However, Nx won't upload an artifact to S3 in this case. Usually this isn't a problem,
|
|
50
|
+
* cause the first DTE would have uploaded it. But if you are using a DTE, with a read-only token,
|
|
51
|
+
* the uploaded artifact will have a different scoped hash.
|
|
52
|
+
*
|
|
53
|
+
* To address this: we are finding all local cache hits, and upload everything that has a put url.
|
|
54
|
+
*/
|
|
55
|
+
function storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory) {
|
|
56
|
+
const hashes = taskExecutions
|
|
57
|
+
.filter((t) => t.cacheStatus === 'local-cache-hit')
|
|
58
|
+
.map((t) => t.hash);
|
|
59
|
+
hashes.forEach((hash) => remoteCache.store(hash, nxCacheDirectory));
|
|
60
|
+
}
|
|
61
|
+
function onComplete({ daemon, options, fileStorage, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions, versionOfNxBefore133, inner, encryptionKey, storeInCurrentProcess, distributedExecutionId, runContext, }) {
|
|
62
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
const runEndTime = new Date().toISOString();
|
|
64
|
+
const branch = (0, environment_1.getBranch)();
|
|
65
|
+
const runData = {
|
|
66
|
+
command: outputObfuscator.obfuscate((0, environment_1.parseCommand)()),
|
|
67
|
+
startTime: runStartTime,
|
|
68
|
+
endTime: runEndTime,
|
|
69
|
+
distributedExecutionId,
|
|
70
|
+
branch: branch,
|
|
71
|
+
runGroup: (0, environment_1.getRunGroup)(),
|
|
72
|
+
// only set sha if branch is set because we invoke a separate process,
|
|
73
|
+
// which adds a few millis
|
|
74
|
+
sha: branch ? (0, environment_1.extractGitSha)() : undefined,
|
|
75
|
+
inner: inner,
|
|
76
|
+
};
|
|
77
|
+
const ciExecutionContext = {
|
|
78
|
+
branch: branch,
|
|
79
|
+
runGroup: (0, environment_1.getRunGroup)(),
|
|
80
|
+
ciExecutionId: (0, environment_1.getCIExecutionId)(),
|
|
81
|
+
ciExecutionEnv: (0, environment_1.getCIExecutionEnv)(),
|
|
82
|
+
};
|
|
83
|
+
if (storeInCurrentProcess) {
|
|
84
|
+
if ((0, environment_1.agentRunningInDistributedExecution)(distributedExecutionId)) {
|
|
85
|
+
const nxCacheDirectory = (0, environment_1.getNxCacheDirectory)(options);
|
|
86
|
+
storeTaskHashes(taskExecutions, nxCacheDirectory, distributedExecutionId);
|
|
87
|
+
storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory);
|
|
88
|
+
}
|
|
89
|
+
try {
|
|
90
|
+
yield remoteCache.waitForStoreRequestsToComplete();
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
output.error({
|
|
94
|
+
title: `Nx Cloud wasn't able to store artifacts.`,
|
|
95
|
+
});
|
|
96
|
+
messages.printMessages();
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
for (const hash of fileStorage.storedHashes) {
|
|
100
|
+
const matchingTask = taskExecutions.find((t) => t.hash === hash);
|
|
101
|
+
if (!matchingTask) {
|
|
102
|
+
throw new Error(`Task with hash ${hash} isn't recorded`);
|
|
103
|
+
}
|
|
104
|
+
matchingTask.uploadedToStorage = true;
|
|
105
|
+
}
|
|
106
|
+
try {
|
|
107
|
+
yield api.endRun(runData, taskExecutions, ciExecutionContext);
|
|
108
|
+
}
|
|
109
|
+
catch (e) {
|
|
110
|
+
output.error({
|
|
111
|
+
title: `Nx Cloud wasn't able to record its run.`,
|
|
112
|
+
});
|
|
113
|
+
messages.printMessages();
|
|
114
|
+
return false;
|
|
115
|
+
}
|
|
116
|
+
yield (0, metric_logger_1.submitRunMetrics)(options);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
try {
|
|
120
|
+
const accessToken = environment_1.ACCESS_TOKEN ? environment_1.ACCESS_TOKEN : options.accessToken;
|
|
121
|
+
const linkId = (0, id_generator_1.generateUniqueLinkId)();
|
|
122
|
+
yield daemon.processInBackground('@nrwl/nx-cloud/lib/daemon/process-run-end', {
|
|
123
|
+
encryptionKey,
|
|
124
|
+
runnerOptions: Object.assign(Object.assign({}, options), { accessToken }),
|
|
125
|
+
delayedStoreRequests: remoteCache.delayedStoreRequests,
|
|
126
|
+
ciExecutionContext,
|
|
127
|
+
runEnd: {
|
|
128
|
+
runData,
|
|
129
|
+
taskExecutions,
|
|
130
|
+
linkId,
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
runContext.runUrl = `${options.url || 'https://nx.app'}/runs/${linkId}`;
|
|
134
|
+
}
|
|
135
|
+
catch (e) {
|
|
136
|
+
output.warn({
|
|
137
|
+
title: `Nx Cloud Problems`,
|
|
138
|
+
bodyLines: [e.message || e.toString()],
|
|
139
|
+
});
|
|
140
|
+
return false;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
// this workaround is required because prior to Nx 13.3 we printed
|
|
144
|
+
// the end message after the runner completes, so we need to wait for the
|
|
145
|
+
// message to appear in the right place
|
|
146
|
+
if (versionOfNxBefore133) {
|
|
147
|
+
setTimeout(() => {
|
|
148
|
+
messages.printMessages();
|
|
149
|
+
if (!messages.anyErrors && !inner) {
|
|
150
|
+
endOfRunMessage.printCacheHitsMessage();
|
|
151
|
+
}
|
|
152
|
+
}, 0);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
messages.printMessages();
|
|
156
|
+
if (!messages.anyErrors && !inner) {
|
|
157
|
+
endOfRunMessage.printCacheHitsMessage();
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return true;
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
function createLifeCycle(runContext, options, outputObfuscator, tasks) {
|
|
164
|
+
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, (0, environment_1.getNxCacheDirectory)(options), true, options.cacheableOperations || [], outputObfuscator, tasks);
|
|
165
|
+
try {
|
|
166
|
+
const { CompositeLifeCycle } = require('../../../utilities/nx-imports');
|
|
167
|
+
if (!CompositeLifeCycle)
|
|
168
|
+
return cloudEnabledLifeCycle;
|
|
169
|
+
return new CompositeLifeCycle([options.lifeCycle, cloudEnabledLifeCycle]);
|
|
170
|
+
}
|
|
171
|
+
catch (e) {
|
|
172
|
+
return cloudEnabledLifeCycle;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId) {
|
|
176
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
177
|
+
if (options.skipNxCache)
|
|
178
|
+
return;
|
|
179
|
+
let hashes = tasks.map((t) => t.hash).filter((h) => !!h);
|
|
180
|
+
const cachePath = (0, environment_1.getNxCacheDirectory)(options);
|
|
181
|
+
// filter out the urls that don't have artifact stored locally
|
|
182
|
+
const exists = yield Promise.all(hashes.map((hash) => {
|
|
183
|
+
const tdCommit = (0, path_1.join)(cachePath, `${hash}.commit`);
|
|
184
|
+
return (0, fs_extra_1.pathExists)(tdCommit);
|
|
185
|
+
}));
|
|
186
|
+
const missingHashes = [];
|
|
187
|
+
for (let i = 0; i < exists.length; ++i) {
|
|
188
|
+
if (!exists[i]) {
|
|
189
|
+
missingHashes.push(hashes[i]);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
if (missingHashes.length > 0) {
|
|
193
|
+
const startRunRequest = api.startRun(distributedExecutionId, missingHashes);
|
|
194
|
+
for (const hash of missingHashes) {
|
|
195
|
+
runContext.requests[hash] = startRunRequest;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
201
|
+
var _a;
|
|
202
|
+
const distributedExecutionId = process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
203
|
+
const runContext = {
|
|
204
|
+
statuses: {},
|
|
205
|
+
scheduledTasks: [],
|
|
206
|
+
requests: {},
|
|
207
|
+
allTasks: tasks,
|
|
208
|
+
};
|
|
209
|
+
const versionOfNxBefore133 = options.lifeCycle === undefined;
|
|
210
|
+
const taskExecutions = [];
|
|
211
|
+
const messages = new message_reporter_1.MessageReporter(options);
|
|
212
|
+
const api = createApi(messages, options, runContext);
|
|
213
|
+
const endOfRunMessage = new end_of_run_message_1.EndOfRunMessage(runContext, taskExecutions, distributedExecutionId);
|
|
214
|
+
const outputObfuscator = new output_obfuscator_1.OutputObfuscator(options.maskedProperties);
|
|
215
|
+
const runStartTime = new Date().toISOString();
|
|
216
|
+
const lifeCycle = createLifeCycle(runContext, options, outputObfuscator, taskExecutions);
|
|
217
|
+
const encryptionKey = environment_1.ENCRYPTION_KEY || options.encryptionKey;
|
|
218
|
+
const encryption = new e2e_encryption_1.E2EEncryption(encryptionKey);
|
|
219
|
+
const errorApi = new error_reporter_api_1.ErrorReporterApi(options);
|
|
220
|
+
const storeInCurrentProcess = (0, environment_1.agentRunningInDistributedExecution)(distributedExecutionId) ||
|
|
221
|
+
!((_a = context.daemon) === null || _a === void 0 ? void 0 : _a.enabled());
|
|
222
|
+
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi, options, 'cloud-enabled-runner');
|
|
223
|
+
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage, distributedExecutionId, storeInCurrentProcess);
|
|
224
|
+
// we don't await for it cause this step is optional
|
|
225
|
+
fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId);
|
|
226
|
+
// have to reset it so we don't capture inner tasks
|
|
227
|
+
delete process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
228
|
+
const res = tasksRunner(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
|
|
229
|
+
// observable -> legacy
|
|
230
|
+
if (res.subscribe) {
|
|
231
|
+
const { Subject } = require('rxjs/internal/Subject');
|
|
232
|
+
const wrappedRes = new Subject();
|
|
233
|
+
res.subscribe({
|
|
234
|
+
next: (value) => wrappedRes.next(value),
|
|
235
|
+
error: (err) => wrappedRes.error(err),
|
|
236
|
+
complete: () => __awaiter(this, void 0, void 0, function* () {
|
|
237
|
+
const success = yield onComplete({
|
|
238
|
+
daemon: context.daemon,
|
|
239
|
+
options,
|
|
240
|
+
fileStorage,
|
|
241
|
+
remoteCache,
|
|
242
|
+
api,
|
|
243
|
+
outputObfuscator,
|
|
244
|
+
runStartTime,
|
|
245
|
+
messages,
|
|
246
|
+
endOfRunMessage,
|
|
247
|
+
taskExecutions,
|
|
248
|
+
versionOfNxBefore133,
|
|
249
|
+
inner,
|
|
250
|
+
encryptionKey,
|
|
251
|
+
storeInCurrentProcess,
|
|
252
|
+
runContext,
|
|
253
|
+
distributedExecutionId,
|
|
254
|
+
});
|
|
255
|
+
if (!success &&
|
|
256
|
+
(0, environment_1.agentRunningInDistributedExecution)(distributedExecutionId)) {
|
|
257
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
258
|
+
}
|
|
259
|
+
wrappedRes.complete();
|
|
260
|
+
}),
|
|
261
|
+
});
|
|
262
|
+
return wrappedRes;
|
|
263
|
+
// promise
|
|
264
|
+
}
|
|
265
|
+
else {
|
|
266
|
+
return res
|
|
267
|
+
.then((r) => __awaiter(this, void 0, void 0, function* () {
|
|
268
|
+
const success = yield onComplete({
|
|
269
|
+
daemon: context.daemon,
|
|
270
|
+
options,
|
|
271
|
+
fileStorage,
|
|
272
|
+
remoteCache,
|
|
273
|
+
api,
|
|
274
|
+
outputObfuscator,
|
|
275
|
+
runStartTime,
|
|
276
|
+
messages,
|
|
277
|
+
endOfRunMessage,
|
|
278
|
+
taskExecutions,
|
|
279
|
+
versionOfNxBefore133,
|
|
280
|
+
inner,
|
|
281
|
+
encryptionKey,
|
|
282
|
+
storeInCurrentProcess,
|
|
283
|
+
runContext,
|
|
284
|
+
distributedExecutionId,
|
|
285
|
+
});
|
|
286
|
+
if (!success &&
|
|
287
|
+
(0, environment_1.agentRunningInDistributedExecution)(distributedExecutionId)) {
|
|
288
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
289
|
+
}
|
|
290
|
+
return r;
|
|
291
|
+
}))
|
|
292
|
+
.catch((e) => __awaiter(this, void 0, void 0, function* () {
|
|
293
|
+
const success = yield onComplete({
|
|
294
|
+
daemon: context.daemon,
|
|
295
|
+
options,
|
|
296
|
+
fileStorage,
|
|
297
|
+
remoteCache,
|
|
298
|
+
api,
|
|
299
|
+
outputObfuscator,
|
|
300
|
+
runStartTime,
|
|
301
|
+
messages,
|
|
302
|
+
endOfRunMessage,
|
|
303
|
+
taskExecutions,
|
|
304
|
+
versionOfNxBefore133,
|
|
305
|
+
inner,
|
|
306
|
+
encryptionKey,
|
|
307
|
+
storeInCurrentProcess,
|
|
308
|
+
runContext,
|
|
309
|
+
distributedExecutionId,
|
|
310
|
+
});
|
|
311
|
+
if (!success &&
|
|
312
|
+
(0, environment_1.agentRunningInDistributedExecution)(distributedExecutionId)) {
|
|
313
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
314
|
+
}
|
|
315
|
+
throw e;
|
|
316
|
+
}));
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
exports.cloudEnabledTasksRunner = cloudEnabledTasksRunner;
|
|
320
|
+
//# sourceMappingURL=cloud-enabled.runner.js.map
|
|
@@ -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":";;;;;;;;;;;;AAEA,
|
|
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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"}
|
|
@@ -7,10 +7,16 @@ export declare class CloudRemoteCache {
|
|
|
7
7
|
private readonly api;
|
|
8
8
|
private readonly runContext;
|
|
9
9
|
private readonly fileStorage;
|
|
10
|
+
private readonly distributedExecutionId;
|
|
11
|
+
private readonly storeInCurrentProcess;
|
|
10
12
|
private readonly storeRequests;
|
|
11
|
-
|
|
13
|
+
delayedStoreRequests: {
|
|
14
|
+
hash: string;
|
|
15
|
+
url: string;
|
|
16
|
+
}[];
|
|
17
|
+
constructor(messages: MessageReporter, api: CloudRunApi, runContext: RunContext, fileStorage: FileStorage, distributedExecutionId: string | undefined, storeInCurrentProcess: boolean);
|
|
12
18
|
retrieve(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
13
19
|
store(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
14
20
|
private hashUrls;
|
|
15
|
-
waitForStoreRequestsToComplete(): Promise<
|
|
21
|
+
waitForStoreRequestsToComplete(): Promise<void>;
|
|
16
22
|
}
|