slnodejs 6.1.1163 → 6.2.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/README.md +1 -1
- package/browser-agent/dist/browser-agent-all.js +16 -7
- package/browser-agent/dist/browser-agent-all.min.js +2 -2
- package/package.json +4 -2
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js +8 -2
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +9 -2
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/cli-parse/cli.js +123 -333
- package/tsOutputs/cli-parse/cli.js.map +1 -1
- package/tsOutputs/cli-parse/config/config-resolver.js +175 -0
- package/tsOutputs/cli-parse/config/config-resolver.js.map +1 -0
- package/tsOutputs/cli-parse/config/config-store.js +40 -0
- package/tsOutputs/cli-parse/config/config-store.js.map +1 -0
- package/tsOutputs/cli-parse/config/create-options-from-keys.js +161 -0
- package/tsOutputs/cli-parse/config/create-options-from-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/common-keys.js +183 -0
- package/tsOutputs/cli-parse/config/keys/common-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/component-management-commands-keys.js +21 -0
- package/tsOutputs/cli-parse/config/keys/component-management-commands-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/config-command-keys.js +16 -0
- package/tsOutputs/cli-parse/config/keys/config-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/dry-run-command-keys.js +59 -0
- package/tsOutputs/cli-parse/config/keys/dry-run-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/end-execution-command-keys.js +9 -0
- package/tsOutputs/cli-parse/config/keys/end-execution-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/instrument-command-keys.js +146 -0
- package/tsOutputs/cli-parse/config/keys/instrument-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/nyc-report-command-keys.js +11 -0
- package/tsOutputs/cli-parse/config/keys/nyc-report-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/pr-config-command-keys.js +32 -0
- package/tsOutputs/cli-parse/config/keys/pr-config-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/scan-command-keys.js +236 -0
- package/tsOutputs/cli-parse/config/keys/scan-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/scanned-command-keys.js +16 -0
- package/tsOutputs/cli-parse/config/keys/scanned-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/start-execution-command-keys.js +9 -0
- package/tsOutputs/cli-parse/config/keys/start-execution-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/test-listener-commands-keys.js +86 -0
- package/tsOutputs/cli-parse/config/keys/test-listener-commands-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/keys/upload-reports-command-keys.js +38 -0
- package/tsOutputs/cli-parse/config/keys/upload-reports-command-keys.js.map +1 -0
- package/tsOutputs/cli-parse/config/migration/agent-config-bridge.js +44 -0
- package/tsOutputs/cli-parse/config/migration/agent-config-bridge.js.map +1 -0
- package/tsOutputs/cli-parse/config/migration/legacy-adapters.js +157 -0
- package/tsOutputs/cli-parse/config/migration/legacy-adapters.js.map +1 -0
- package/tsOutputs/cli-parse/config/schema.js +63 -0
- package/tsOutputs/cli-parse/config/schema.js.map +1 -0
- package/tsOutputs/cli-parse/config/source-adapters/base-source-adapter.js +53 -0
- package/tsOutputs/cli-parse/config/source-adapters/base-source-adapter.js.map +1 -0
- package/tsOutputs/cli-parse/config/source-adapters/cli-source-adapter.js +27 -0
- package/tsOutputs/cli-parse/config/source-adapters/cli-source-adapter.js.map +1 -0
- package/tsOutputs/cli-parse/config/source-adapters/env-source-adapter.js +27 -0
- package/tsOutputs/cli-parse/config/source-adapters/env-source-adapter.js.map +1 -0
- package/tsOutputs/cli-parse/config/source-adapters/json-file-source-adapter.js +33 -0
- package/tsOutputs/cli-parse/config/source-adapters/json-file-source-adapter.js.map +1 -0
- package/tsOutputs/cli-parse/config/source-adapters/remote-source-adapter.js +27 -0
- package/tsOutputs/cli-parse/config/source-adapters/remote-source-adapter.js.map +1 -0
- package/tsOutputs/cli-parse/config/transformers.js +13 -0
- package/tsOutputs/cli-parse/config/transformers.js.map +1 -0
- package/tsOutputs/cli-parse/config/validation-error.js +40 -0
- package/tsOutputs/cli-parse/config/validation-error.js.map +1 -0
- package/tsOutputs/cli-parse/contracts.d.ts +6 -1
- package/tsOutputs/cli-parse/contracts.js +5 -0
- package/tsOutputs/cli-parse/contracts.js.map +1 -1
- package/tsOutputs/cli-parse/custom-commander.js +2 -18
- package/tsOutputs/cli-parse/custom-commander.js.map +1 -1
- package/tsOutputs/cli-parse/executors/base-executor.js +117 -117
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-end-executor.js +22 -24
- package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +73 -251
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js +21 -19
- package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js +18 -58
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/end-execution-executor.js +17 -14
- package/tsOutputs/cli-parse/executors/end-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/instrument-executor.js +24 -93
- package/tsOutputs/cli-parse/executors/instrument-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +13 -7
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-delete-components-executor.js +2 -3
- package/tsOutputs/cli-parse/executors/integration-build-delete-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js +5 -2
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +25 -6
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js +9 -12
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js +17 -6
- package/tsOutputs/cli-parse/executors/pr-config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/run-executor.js +15 -15
- package/tsOutputs/cli-parse/executors/run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/start-execution-executor.js +21 -18
- package/tsOutputs/cli-parse/executors/start-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-executions-executor.js +2 -2
- package/tsOutputs/cli-parse/executors/test-executions-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +29 -40
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/upload-report-executor.js +28 -22
- package/tsOutputs/cli-parse/executors/upload-report-executor.js.map +1 -1
- package/tsOutputs/common/config-process/index.js +3 -3
- package/tsOutputs/common/config-process/index.js.map +1 -1
- package/tsOutputs/common/constants/sl-env-vars.d.ts +2 -0
- package/tsOutputs/common/constants/sl-env-vars.js +4 -0
- package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.js +2 -2
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.d.ts +5 -2
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/ignored-files-handler.d.ts +1 -1
- package/tsOutputs/common/ignored-files-handler.js +6 -1
- package/tsOutputs/common/ignored-files-handler.js.map +1 -1
- package/tsOutputs/common/utils/test-runner-build-session-data-builder.d.ts +2 -2
- package/tsOutputs/common/utils/test-runner-build-session-data-builder.js.map +1 -1
- package/tsOutputs/messages/message-keys.generated.js +1 -1
|
@@ -22,28 +22,36 @@ const dry_run_validation_1 = require("./dry-run-validation");
|
|
|
22
22
|
const table_1 = require("table");
|
|
23
23
|
const chalk_1 = require("chalk");
|
|
24
24
|
const agent_events_contracts_1 = require("../../../common/agent-events/agent-events-contracts");
|
|
25
|
-
const flatMap = require("lodash.flatmap");
|
|
26
|
-
const build_args_dto_1 = require("../build-args-dto");
|
|
27
25
|
const build_mapping_data_1 = require("./build-mapping-data");
|
|
28
26
|
const footprints_data_1 = require("./footprints-data");
|
|
29
27
|
const helper_methods_1 = require("./helper-methods");
|
|
30
28
|
const logger_1 = require("../../../common/logger");
|
|
31
|
-
const
|
|
32
|
-
const
|
|
29
|
+
const dry_run_command_keys_1 = require("../../config/keys/dry-run-command-keys");
|
|
30
|
+
const config_store_1 = require("../../config/config-store");
|
|
31
|
+
const config_resolver_1 = require("../../config/config-resolver");
|
|
32
|
+
const legacy_adapters_1 = require("../../config/migration/legacy-adapters");
|
|
33
|
+
const flatMap = require("lodash.flatmap");
|
|
33
34
|
class DryRunExecutor extends base_executor_1.BaseExecutor {
|
|
34
35
|
constructor() {
|
|
35
36
|
super(...arguments);
|
|
36
37
|
this.commandName = 'dryRun';
|
|
38
|
+
this.configKey = config_store_1.ConfigKey.DryRun;
|
|
39
|
+
this.schema = dry_run_command_keys_1.dryRunCommandKeys;
|
|
37
40
|
this._validations = new Map();
|
|
38
41
|
}
|
|
39
|
-
execute(args
|
|
42
|
+
execute(args) {
|
|
40
43
|
var _a;
|
|
41
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
const config = yield new config_resolver_1.ConfigResolver().resolve(this.schema, {
|
|
46
|
+
commanderArgs: args,
|
|
47
|
+
env: process.env,
|
|
48
|
+
}, this.getResolveOptions());
|
|
49
|
+
config_store_1.ConfigStore.publish(this.configKey, config);
|
|
42
50
|
try {
|
|
43
|
-
this.validateArgs(
|
|
51
|
+
this.validateArgs(config);
|
|
44
52
|
const dryRunProxy = new dry_run_proxy_1.DryRunProxy();
|
|
45
53
|
this.init(dryRunProxy);
|
|
46
|
-
const buildArguments =
|
|
54
|
+
const buildArguments = (0, legacy_adapters_1.toDryRunBuildMapData)(config);
|
|
47
55
|
const buildMappingData = yield build_mapping_data_1.BuildMappingData.run(dryRunProxy, buildArguments, this.logger);
|
|
48
56
|
yield this.verifyBuildMappingData(buildMappingData);
|
|
49
57
|
const footprintsData = yield footprints_data_1.FootprintsData.run(buildArguments, this.logger, dryRunProxy);
|
|
@@ -58,7 +66,7 @@ class DryRunExecutor extends base_executor_1.BaseExecutor {
|
|
|
58
66
|
}
|
|
59
67
|
});
|
|
60
68
|
}
|
|
61
|
-
innerExecute(
|
|
69
|
+
innerExecute(_args) {
|
|
62
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
71
|
return true;
|
|
64
72
|
});
|
|
@@ -124,57 +132,9 @@ class DryRunExecutor extends base_executor_1.BaseExecutor {
|
|
|
124
132
|
get validations() {
|
|
125
133
|
return this._validations;
|
|
126
134
|
}
|
|
127
|
-
mapArgs(args) {
|
|
128
|
-
var _a, _b, _c;
|
|
129
|
-
let excludeSourceMapFiles;
|
|
130
|
-
if (args.excludeSourceMapFiles === undefined) {
|
|
131
|
-
excludeSourceMapFiles = interface_1.SourceMapsEraserModes.None;
|
|
132
|
-
}
|
|
133
|
-
else if (args.excludeSourceMapFiles === true) {
|
|
134
|
-
excludeSourceMapFiles = interface_1.SourceMapsEraserModes.SkipCopy;
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
excludeSourceMapFiles = args.excludeSourceMapFiles;
|
|
138
|
-
}
|
|
139
|
-
let splitPreambleIntoFile = false;
|
|
140
|
-
if (args.splitPreambleIntoFile === undefined) {
|
|
141
|
-
splitPreambleIntoFile = common_1.SlEnvVars.CIA.splitPreambleIntoFile();
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
splitPreambleIntoFile = args.splitPreambleIntoFile;
|
|
145
|
-
}
|
|
146
|
-
let toggleBasedBrowserInstrumentation = false;
|
|
147
|
-
if (args.toggleBasedBrowserInstrumentation === undefined) {
|
|
148
|
-
toggleBasedBrowserInstrumentation =
|
|
149
|
-
common_1.SlEnvVars.CIA.toggleBasedBrowserInstrumentation();
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
toggleBasedBrowserInstrumentation =
|
|
153
|
-
args.toggleBasedBrowserInstrumentation;
|
|
154
|
-
}
|
|
155
|
-
const preambleFileName = args.preambleFileName ||
|
|
156
|
-
common_1.SlEnvVars.CIA.preambleFileName() ||
|
|
157
|
-
Constants.PREAMBLE_DEFAULT_FILE_NAME;
|
|
158
|
-
const preambleFileUrl = args.preambleFileUrl || common_1.SlEnvVars.CIA.preambleFileUrl() || '';
|
|
159
|
-
const recognizeBabelCreateClass = args.recognizeBabelCreateClass ||
|
|
160
|
-
common_1.SlEnvVars.CIA.recognizeBabelCreateClass();
|
|
161
|
-
const preferSourceMapFromFile = args.preferSourceMapFromFile || common_1.SlEnvVars.CIA.preferSourceMapFromFile();
|
|
162
|
-
const enrichByMethodRange = args.enrichByMethodRange || common_1.SlEnvVars.CIA.enrichByMethodRange();
|
|
163
|
-
const experimentalDeduplicateEnrichedMethodsWithOriginals = args.experimentalDeduplicateEnrichedMethodsWithOriginals ||
|
|
164
|
-
common_1.SlEnvVars.CIA.experimentalDeduplicateEnrichedMethodsWithOriginals();
|
|
165
|
-
const createdArgs = build_args_dto_1.BuildArgsDTO.create(args);
|
|
166
|
-
return Object.assign(Object.assign({}, createdArgs), { appname: 'app1', build: 'build1', branch: 'branch1', customerId: 'customer1', token: 't1', server: 'http://sealights.co/api', buildSessionId: 'bs1', workspacepath: (0, utils_1.resolvePath)('workspacepath', args.workspacepath), outputpath: (0, path_1.join)(Constants.DRY_RUN_OUTPUT, args.outputpath || Constants.INSTRUMENTATION_OUTPUT), folderDepth: parseInt(args.folderDepth), hasNycReport: args.hasNycReport, report: args.report, nycProjectRoot: args.nycProjectRoot, projectRoot: args.buildScanProjectRoot, sendContributors: true, instrumentationOnly: false, excludeSourceMapFiles, experimentalSizeReduction: process.env['SL_experimentalSizeReduction'] || false, partialBuildMapping: +args.partialBuildMapping, ctxPropagationOnly: args.ctxPropagationOnly || common_1.SlEnvVars.CIA.ctxPropagationOnly(), embedCorrectUniqueId: createdArgs.embedCorrectUniqueId ||
|
|
167
|
-
common_1.SlEnvVars.CIA.embedCorrectUniqueId(), splitPreambleIntoFile,
|
|
168
|
-
preambleFileName,
|
|
169
|
-
preambleFileUrl,
|
|
170
|
-
toggleBasedBrowserInstrumentation,
|
|
171
|
-
recognizeBabelCreateClass,
|
|
172
|
-
preferSourceMapFromFile,
|
|
173
|
-
enrichByMethodRange,
|
|
174
|
-
experimentalDeduplicateEnrichedMethodsWithOriginals, allowedDomains: (_c = (_b = (_a = args.allowedDomains) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : common_1.SlEnvVars.CIA.allowedDomains()) !== null && _c !== void 0 ? _c : [] });
|
|
175
|
-
}
|
|
176
135
|
validateArgs(args) {
|
|
177
|
-
|
|
136
|
+
args.workspacePath = (0, utils_1.resolvePath)('workspacePath', args.workspacePath);
|
|
137
|
+
if (!args.workspacePath) {
|
|
178
138
|
throw "'Workspace' is mandatory, please use '--help' flag to see the usage";
|
|
179
139
|
}
|
|
180
140
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry-run-executor.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/dry-run-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAgD;AAEhD,sEAAiE;AACjE,uCAA0C;AAC1C,2BAA2C;AAE3C,uDAAuD;AACvD,oFAAgF;AAChF,mCAA4C;AAC5C,+BAA4B;AAC5B,6DAU8B;AAC9B,iCAA8B;AAC9B,iCAA0B;AAC1B,gGAI6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"dry-run-executor.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/dry-run-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,32 +12,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.EndExecutionExecutor = void 0;
|
|
13
13
|
const test_executions_executor_1 = require("./test-executions-executor");
|
|
14
14
|
const api_1 = require("../../test-listener/api");
|
|
15
|
+
const end_execution_command_keys_1 = require("../config/keys/end-execution-command-keys");
|
|
16
|
+
const config_store_1 = require("../config/config-store");
|
|
15
17
|
class EndExecutionExecutor extends test_executions_executor_1.TestExecutionsExecutor {
|
|
16
18
|
constructor() {
|
|
17
19
|
super(...arguments);
|
|
18
20
|
this.commandName = 'endExecution';
|
|
21
|
+
this.schema = end_execution_command_keys_1.endExecutionCommandKeys;
|
|
22
|
+
this.configKey = config_store_1.ConfigKey.EndExecution;
|
|
19
23
|
}
|
|
20
|
-
innerExecute(
|
|
24
|
+
innerExecute(config) {
|
|
25
|
+
var _a;
|
|
21
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
const request = {
|
|
28
|
+
isValidToken: true,
|
|
29
|
+
proxy: this.baseData.proxy,
|
|
30
|
+
server: this.baseData.server,
|
|
31
|
+
appName: this.baseData.appName,
|
|
32
|
+
branchName: this.baseData.branchName,
|
|
33
|
+
buildName: this.baseData.buildName,
|
|
34
|
+
customerId: this.baseData.customerid,
|
|
35
|
+
environment: (_a = config.labId) !== null && _a !== void 0 ? _a : this.baseData.buildSessionId,
|
|
36
|
+
};
|
|
22
37
|
return new Promise((resolve, reject) => {
|
|
23
|
-
(0, api_1.endExecution)(
|
|
38
|
+
(0, api_1.endExecution)(request, this.baseData, (err) => {
|
|
24
39
|
err ? reject(err) : resolve(true);
|
|
25
40
|
});
|
|
26
41
|
});
|
|
27
42
|
});
|
|
28
43
|
}
|
|
29
|
-
mapArgs(args) {
|
|
30
|
-
return {
|
|
31
|
-
isValidToken: true,
|
|
32
|
-
proxy: this.baseData.proxy,
|
|
33
|
-
server: this.baseData.server,
|
|
34
|
-
appName: this.baseData.appName,
|
|
35
|
-
branchName: this.baseData.branchName,
|
|
36
|
-
buildName: this.baseData.buildName,
|
|
37
|
-
customerId: this.baseData.customerid,
|
|
38
|
-
environment: args.labid || this.baseData.buildSessionId,
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
44
|
}
|
|
42
45
|
exports.EndExecutionExecutor = EndExecutionExecutor;
|
|
43
46
|
//# sourceMappingURL=end-execution-executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-execution-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/end-execution-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"end-execution-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/end-execution-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAoE;AACpE,iDAAuD;AAEvD,0FAAoF;AACpF,yDAAmD;AAGnD,MAAa,oBAAqB,SAAQ,iDAEzC;IAFD;;QAGY,gBAAW,GAAG,cAAc,CAAC;QAC7B,WAAM,GAAG,oDAAuB,CAAC;QACjC,cAAS,GAAG,wBAAS,CAAC,YAAY,CAAC;IAqB/C,CAAC;IAnBc,YAAY,CACvB,MAAiC;;;YAEjC,MAAM,OAAO,GAAwB;gBACnC,YAAY,EAAE,IAAI;gBAClB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;gBAC1B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;gBAC5B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;gBAC9B,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;gBACpC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;gBAClC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;gBACpC,WAAW,EAAE,MAAA,MAAM,CAAC,KAAK,mCAAI,IAAI,CAAC,QAAQ,CAAC,cAAc;aAC1D,CAAC;YACF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAA,kBAAY,EAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;oBAC3C,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;;KACJ;CACF;AA1BD,oDA0BC"}
|
|
@@ -13,20 +13,21 @@ exports.InstrumentExecutor = void 0;
|
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
14
|
const cia_1 = require("../../build-scanner/cia");
|
|
15
15
|
const common_1 = require("../../common");
|
|
16
|
-
const agent_instance_data_1 = require("../agent-instance-data");
|
|
17
16
|
const utils_1 = require("../utils");
|
|
18
|
-
const instrument_args_dto_1 = require("./instrument-args-dto");
|
|
19
17
|
const validation_utils_1 = require("../../common/utils/validation-utils");
|
|
20
|
-
const
|
|
18
|
+
const instrument_command_keys_1 = require("../config/keys/instrument-command-keys");
|
|
19
|
+
const config_store_1 = require("../config/config-store");
|
|
20
|
+
const legacy_adapters_1 = require("../config/migration/legacy-adapters");
|
|
21
21
|
class InstrumentExecutor extends base_executor_1.BaseExecutor {
|
|
22
22
|
constructor() {
|
|
23
23
|
super(...arguments);
|
|
24
24
|
this.commandName = 'instrument';
|
|
25
|
+
this.schema = instrument_command_keys_1.instrumentCommandKeys;
|
|
26
|
+
this.configKey = config_store_1.ConfigKey.Instrument;
|
|
25
27
|
}
|
|
26
|
-
innerExecute(
|
|
28
|
+
innerExecute(config) {
|
|
27
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
const mappedArgs = this.
|
|
29
|
-
yield this.setConfigFromRemoteWithTracking(mappedArgs);
|
|
30
|
+
const mappedArgs = (0, legacy_adapters_1.toInstrumentationData)(config, this.baseData);
|
|
30
31
|
const cia = new cia_1.CIA();
|
|
31
32
|
try {
|
|
32
33
|
yield cia.instrument(mappedArgs);
|
|
@@ -38,114 +39,44 @@ class InstrumentExecutor extends base_executor_1.BaseExecutor {
|
|
|
38
39
|
return true;
|
|
39
40
|
});
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
'excludeTokenFromBrowserConfig',
|
|
45
|
-
'overrideServer',
|
|
46
|
-
'ctxPropagationOnly',
|
|
47
|
-
'splitPreambleIntoFile',
|
|
48
|
-
'preambleFileName',
|
|
49
|
-
'preambleFileUrl',
|
|
50
|
-
'toggleBasedBrowserInstrumentation',
|
|
51
|
-
'allowedDomains',
|
|
52
|
-
];
|
|
53
|
-
}
|
|
54
|
-
applyRemoteConfig(mappedArgs) {
|
|
55
|
-
var _a, _b, _c;
|
|
56
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
-
mappedArgs.reduceInstrumentedFileSize =
|
|
58
|
-
mappedArgs.reduceInstrumentedFileSize ||
|
|
59
|
-
!!this.agentRemoteConfig.reduceInstrumentedFileSize;
|
|
60
|
-
mappedArgs.excludeTokenFromBrowserConfig =
|
|
61
|
-
mappedArgs.excludeTokenFromBrowserConfig ||
|
|
62
|
-
!!this.agentRemoteConfig.excludeTokenFromBrowserConfig;
|
|
63
|
-
mappedArgs.overrideServer =
|
|
64
|
-
this.agentRemoteConfig.overrideServer || mappedArgs.overrideServer;
|
|
65
|
-
mappedArgs.ctxPropagationOnly =
|
|
66
|
-
this.agentRemoteConfig.ctxPropagationOnly ||
|
|
67
|
-
!!mappedArgs.ctxPropagationOnly;
|
|
68
|
-
mappedArgs.splitPreambleIntoFile =
|
|
69
|
-
mappedArgs.splitPreambleIntoFile ||
|
|
70
|
-
!!this.agentRemoteConfig.splitPreambleIntoFile;
|
|
71
|
-
mappedArgs.preambleFileName =
|
|
72
|
-
mappedArgs.preambleFileName ||
|
|
73
|
-
this.agentRemoteConfig.preambleFileName ||
|
|
74
|
-
constants_1.PREAMBLE_DEFAULT_FILE_NAME;
|
|
75
|
-
mappedArgs.preambleFileUrl =
|
|
76
|
-
mappedArgs.preambleFileUrl ||
|
|
77
|
-
this.agentRemoteConfig.preambleFileUrl ||
|
|
78
|
-
'';
|
|
79
|
-
mappedArgs.toggleBasedBrowserInstrumentation =
|
|
80
|
-
mappedArgs.toggleBasedBrowserInstrumentation ||
|
|
81
|
-
!!this.agentRemoteConfig.toggleBasedBrowserInstrumentation;
|
|
82
|
-
mappedArgs.allowedDomains =
|
|
83
|
-
(_c = (_a = mappedArgs.allowedDomains) !== null && _a !== void 0 ? _a : (_b = this.agentRemoteConfig.allowedDomains) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
|
|
84
|
-
});
|
|
85
|
-
}
|
|
86
|
-
validateArgs(args) {
|
|
87
|
-
this.resolveAliases(args);
|
|
88
|
-
if (args.allowCORS && !args.enableOpenTelemetry) {
|
|
42
|
+
validateArgs(config) {
|
|
43
|
+
this.resolveAliases(config);
|
|
44
|
+
if (config.allowCORS && !config.enableOpenTelemetry) {
|
|
89
45
|
this.logger.lifecycle(`--enableOpenTelemetry must be specified when using --allowCORS option.`);
|
|
90
46
|
return false;
|
|
91
47
|
}
|
|
92
|
-
if (!
|
|
48
|
+
if (!config.workspacePath) {
|
|
93
49
|
this.logger.lifecycle("'workspacepath' argument is required but was not specified");
|
|
94
50
|
return false;
|
|
95
51
|
}
|
|
96
|
-
if (
|
|
97
|
-
!validation_utils_1.ValidationUtils.validatePath(
|
|
52
|
+
if (config.preambleFileUrl &&
|
|
53
|
+
!validation_utils_1.ValidationUtils.validatePath(config.preambleFileUrl)) {
|
|
98
54
|
this.logger.lifecycle(`'preambleFileUrl' argument must be a valid URL either full (https://example.com/a/b/c) or relative (a/b/c)`);
|
|
99
55
|
return false;
|
|
100
56
|
}
|
|
101
|
-
this.resolvePathArgs(
|
|
57
|
+
this.resolvePathArgs(config);
|
|
102
58
|
return true;
|
|
103
59
|
}
|
|
104
|
-
notifyAgentStarted(_agentInstanceData,
|
|
60
|
+
notifyAgentStarted(_agentInstanceData, config) {
|
|
105
61
|
const _super = Object.create(null, {
|
|
106
62
|
notifyAgentStarted: { get: () => super.notifyAgentStarted }
|
|
107
63
|
});
|
|
108
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
109
65
|
const buildScannerAgentInstanceData = new common_1.AgentInstanceData(common_1.AgentTypes.BUILD_SCANNER, common_1.AgentTechnologies.NODEJS);
|
|
110
|
-
return _super.notifyAgentStarted.call(this, buildScannerAgentInstanceData,
|
|
66
|
+
return _super.notifyAgentStarted.call(this, buildScannerAgentInstanceData, config);
|
|
111
67
|
});
|
|
112
68
|
}
|
|
113
|
-
resolvePathArgs(
|
|
114
|
-
if (
|
|
115
|
-
|
|
69
|
+
resolvePathArgs(config) {
|
|
70
|
+
if (config.workspacePath) {
|
|
71
|
+
config.workspacePath = (0, utils_1.resolvePath)('workspacePath', config.workspacePath);
|
|
116
72
|
}
|
|
117
73
|
}
|
|
118
|
-
resolveAliases(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
args.distributablepath;
|
|
124
|
-
}
|
|
125
|
-
/*
|
|
126
|
-
The cia Receives parameters with different name/casing so as part of mapping those need to adjust.
|
|
127
|
-
appName => appname.
|
|
128
|
-
buildName => build.
|
|
129
|
-
branchName => branch.
|
|
130
|
-
customerId => customerid
|
|
131
|
-
*/
|
|
132
|
-
mapArgs(args) {
|
|
133
|
-
var _a, _b, _c, _d, _e;
|
|
134
|
-
let splitPreambleIntoFile = false;
|
|
135
|
-
if (args.splitPreambleIntoFile === undefined) {
|
|
136
|
-
splitPreambleIntoFile = common_1.SlEnvVars.CIA.splitPreambleIntoFile();
|
|
137
|
-
}
|
|
138
|
-
else {
|
|
139
|
-
splitPreambleIntoFile = args.splitPreambleIntoFile;
|
|
74
|
+
resolveAliases(rawArgs) {
|
|
75
|
+
var _a;
|
|
76
|
+
const workspacePath = (_a = rawArgs.workspacePath) !== null && _a !== void 0 ? _a : rawArgs.distFolderPath;
|
|
77
|
+
if (workspacePath !== undefined) {
|
|
78
|
+
rawArgs.workspacePath = workspacePath;
|
|
140
79
|
}
|
|
141
|
-
const preambleFileName = args.preambleFileName || common_1.SlEnvVars.CIA.preambleFileName();
|
|
142
|
-
const preambleFileUrl = args.preambleFileUrl || common_1.SlEnvVars.CIA.preambleFileUrl();
|
|
143
|
-
return Object.assign(Object.assign(Object.assign({}, instrument_args_dto_1.InstrumentationArgsDTO.create(args)), this.baseData), { appName: this.baseData.appName, build: this.baseData.buildName, branch: this.baseData.branchName, agentId: agent_instance_data_1.AgentInstanceDataFactory.getOrCreateAgentInstanceData().agentId, customerId: this.baseData.customerid, labId: this.baseData.labid, esModules: args.es6Modules, outputPath: (_a = args.outputPath) !== null && _a !== void 0 ? _a : args.workspacePath,
|
|
144
|
-
// TODO: next logic should be refactored later
|
|
145
|
-
excludeTokenFromBrowserConfig: (_b = args.excludeTokenFromBrowserConfig) !== null && _b !== void 0 ? _b : common_1.SlEnvVars.CIA.excludeTokenFromBrowserConfig(), overrideServer: (_c = args.overrideServer) !== null && _c !== void 0 ? _c : common_1.SlEnvVars.CIA.overrideServer(), slMappingPath: common_1.SlEnvVars.CIA.getSlMappingPath(), slMappingUrl: common_1.SlEnvVars.CIA.getSlMappingUrl() || common_1.SlEnvVars.CIA.getSlMappingPath(), reduceInstrumentedFileSize: args.reduceFileSize || common_1.SlEnvVars.CIA.reduceInstrumentedFileSize(), ctxPropagationOnly: args.ctxPropagationOnly || common_1.SlEnvVars.CIA.ctxPropagationOnly(), splitPreambleIntoFile,
|
|
146
|
-
preambleFileName,
|
|
147
|
-
preambleFileUrl, toggleBasedBrowserInstrumentation: args.toggleBasedBrowserInstrumentation ||
|
|
148
|
-
common_1.SlEnvVars.CIA.toggleBasedBrowserInstrumentation(), allowedDomains: (_e = (_d = args.allowedDomains) === null || _d === void 0 ? void 0 : _d.split(',')) !== null && _e !== void 0 ? _e : common_1.SlEnvVars.CIA.allowedDomains() });
|
|
149
80
|
}
|
|
150
81
|
}
|
|
151
82
|
exports.InstrumentExecutor = InstrumentExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/instrument-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;
|
|
1
|
+
{"version":3,"file":"instrument-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/instrument-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,iDAA8C;AAC9C,yCAAgF;AAChF,oCAAuC;AACvC,0EAAsE;AACtE,oFAA+E;AAC/E,yDAAmD;AACnD,yEAA4E;AAG5E,MAAa,kBAAmB,SAAQ,4BAEvC;IAFD;;QAGY,gBAAW,GAAG,YAAY,CAAC;QAC3B,WAAM,GAAG,+CAAqB,CAAC;QAC/B,cAAS,GAAG,wBAAS,CAAC,UAAU,CAAC;IAoE7C,CAAC;IAlEc,YAAY,CAAC,MAA+B;;YACvD,MAAM,UAAU,GAAG,IAAA,uCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChE,MAAM,GAAG,GAAG,IAAI,SAAG,EAAE,CAAC;YACtB,IAAI;gBACF,MAAM,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;aAClC;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnB,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEM,YAAY,CAAC,MAA+B;QACjD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAE5B,IAAI,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACnD,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,wEAAwE,CACzE,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,4DAA4D,CAC7D,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,IACE,MAAM,CAAC,eAAe;YACtB,CAAC,kCAAe,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,CAAC,EACrD;YACA,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,4GAA4G,CAC7G,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAEe,kBAAkB,CAChC,kBAAqC,EACrC,MAA+B;;;;;YAE/B,MAAM,6BAA6B,GAAG,IAAI,0BAAiB,CACzD,mBAAU,CAAC,aAAa,EACxB,0BAAiB,CAAC,MAAM,CACzB,CAAC;YACF,OAAO,OAAM,kBAAkB,YAAC,6BAA6B,EAAE,MAAM,EAAE;QACzE,CAAC;KAAA;IAEO,eAAe,CAAC,MAA+B;QACrD,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,GAAG,IAAA,mBAAW,EAAC,eAAe,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;SAC3E;IACH,CAAC;IAEO,cAAc,CAAC,OAAgC;;QACrD,MAAM,aAAa,GAAG,MAAA,OAAO,CAAC,aAAa,mCAAI,OAAO,CAAC,cAAc,CAAC;QACtE,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;SACvC;IACH,CAAC;CACF;AAzED,gDAyEC"}
|
|
@@ -15,12 +15,17 @@ const dependency_utils_1 = require("../../common/utils/dependency-utils");
|
|
|
15
15
|
const fs_1 = require("fs");
|
|
16
16
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
17
17
|
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
18
|
+
const component_management_commands_keys_1 = require("../config/keys/component-management-commands-keys");
|
|
18
19
|
class IntegrationBuildComponentsExecutor extends base_executor_1.BaseExecutor {
|
|
19
|
-
|
|
20
|
+
constructor() {
|
|
21
|
+
super(...arguments);
|
|
22
|
+
this.schema = component_management_commands_keys_1.componentUpdateCommandKeys;
|
|
23
|
+
}
|
|
24
|
+
innerExecute(config, _extraArgs) {
|
|
20
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
26
|
const agentInstanceData = agent_instance_data_1.AgentInstanceDataFactory.getOrCreateAgentInstanceData();
|
|
22
27
|
this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agentInstanceData, this.baseData, this.logger);
|
|
23
|
-
const components = this.
|
|
28
|
+
const components = this.getIntegrationBuildDependenciesFromConfig(config);
|
|
24
29
|
if (components.length > 0) {
|
|
25
30
|
yield this.submitRequest(this.baseData.buildSessionId, components, agentInstanceData.agentId);
|
|
26
31
|
return true;
|
|
@@ -31,14 +36,15 @@ class IntegrationBuildComponentsExecutor extends base_executor_1.BaseExecutor {
|
|
|
31
36
|
}
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
|
-
|
|
39
|
+
getIntegrationBuildDependenciesFromConfig(config) {
|
|
40
|
+
var _a;
|
|
35
41
|
try {
|
|
36
42
|
let deps = [];
|
|
37
|
-
if (
|
|
38
|
-
deps = dependency_utils_1.DependencyUtils.parseDependencies(
|
|
43
|
+
if ((_a = config.componentIds) === null || _a === void 0 ? void 0 : _a.length) {
|
|
44
|
+
deps = dependency_utils_1.DependencyUtils.parseDependencies(config.componentIds, this.logger);
|
|
39
45
|
}
|
|
40
|
-
else if (
|
|
41
|
-
const depsFile = this.parseJsonFile(
|
|
46
|
+
else if (config.componentFile) {
|
|
47
|
+
const depsFile = this.parseJsonFile(config.componentFile);
|
|
42
48
|
deps = dependency_utils_1.DependencyUtils.parseDependenciesFile(depsFile, this.logger);
|
|
43
49
|
}
|
|
44
50
|
//Convert from IBuildDependency(appName, branch, build) to IBuildDependency (appName, branchName, buildName),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration-build-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;
|
|
1
|
+
{"version":3,"file":"integration-build-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-components-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.IntegrationBuildDeleteComponentsExecutor = void 0;
|
|
13
13
|
const integration_build_components_executor_1 = require("./integration-build-components-executor");
|
|
14
|
+
const config_store_1 = require("../config/config-store");
|
|
14
15
|
class IntegrationBuildDeleteComponentsExecutor extends integration_build_components_executor_1.IntegrationBuildComponentsExecutor {
|
|
15
16
|
constructor() {
|
|
16
17
|
super(...arguments);
|
|
17
18
|
this.commandName = 'componentDelete';
|
|
18
|
-
|
|
19
|
-
mapArgs(args) {
|
|
20
|
-
return args;
|
|
19
|
+
this.configKey = config_store_1.ConfigKey.ComponentDelete;
|
|
21
20
|
}
|
|
22
21
|
submitRequest(buildSessionId, components, agentId) {
|
|
23
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration-build-delete-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-delete-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"integration-build-delete-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-delete-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mGAA6F;AAE7F,yDAAmD;AAEnD,MAAa,wCAAyC,SAAQ,0EAAkC;IAAhG;;QACY,gBAAW,GAAG,iBAAiB,CAAC;QAChC,cAAS,GAAG,wBAAS,CAAC,eAAe,CAAC;IAalD,CAAC;IAXiB,aAAa,CAC3B,cAAsB,EACtB,UAAyC,EACzC,OAAe;;YAEf,OAAO,IAAI,CAAC,YAAY,CAAC,gCAAgC,CACvD,cAAc,EACd,UAAU,EACV,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;CACF;AAfD,4FAeC"}
|
|
@@ -11,9 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.IntegrationBuildUpdateComponentsExecutor = void 0;
|
|
13
13
|
const integration_build_components_executor_1 = require("./integration-build-components-executor");
|
|
14
|
+
const config_store_1 = require("../config/config-store");
|
|
14
15
|
class IntegrationBuildUpdateComponentsExecutor extends integration_build_components_executor_1.IntegrationBuildComponentsExecutor {
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
constructor() {
|
|
17
|
+
super(...arguments);
|
|
18
|
+
this.commandName = 'componentUpdate';
|
|
19
|
+
this.configKey = config_store_1.ConfigKey.ComponentUpdate;
|
|
17
20
|
}
|
|
18
21
|
submitRequest(buildSessionId, components, agentId) {
|
|
19
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration-build-update-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-update-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"integration-build-update-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-update-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mGAA6F;AAE7F,yDAAmD;AAEnD,MAAa,wCAAyC,SAAQ,0EAAkC;IAAhG;;QACY,gBAAW,GAAG,iBAAiB,CAAC;QAChC,cAAS,GAAG,wBAAS,CAAC,eAAe,CAAC;IAalD,CAAC;IAXiB,aAAa,CAC3B,cAAsB,EACtB,UAAyC,EACzC,OAAe;;YAEf,OAAO,IAAI,CAAC,YAAY,CAAC,qCAAqC,CAC5D,cAAc,EACd,UAAU,EACV,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;CACF;AAfD,4FAeC"}
|
|
@@ -15,18 +15,23 @@ const test_runner_build_session_data_builder_1 = require("../../common/utils/tes
|
|
|
15
15
|
const child_process_wrapper_1 = require("../child-process-wrapper");
|
|
16
16
|
const path_1 = require("path");
|
|
17
17
|
const agent_loader_1 = require("../../test-listener/agent-loader");
|
|
18
|
+
const test_listener_commands_keys_1 = require("../config/keys/test-listener-commands-keys");
|
|
19
|
+
const config_store_1 = require("../config/config-store");
|
|
20
|
+
const common_1 = require("../../common");
|
|
18
21
|
class MochaExecutor extends test_listener_executor_1.TestListenerExecutor {
|
|
19
22
|
constructor() {
|
|
20
23
|
super(...arguments);
|
|
21
24
|
this.mochaReporterPath = (0, path_1.resolve)(__dirname, '../../mocha-reporter/index');
|
|
22
25
|
this.commandName = 'mocha';
|
|
26
|
+
this.schema = test_listener_commands_keys_1.mochaKeys;
|
|
27
|
+
this.configKey = config_store_1.ConfigKey.Mocha;
|
|
23
28
|
}
|
|
24
|
-
innerExecute(
|
|
29
|
+
innerExecute(config, extraParams) {
|
|
25
30
|
const _super = Object.create(null, {
|
|
26
31
|
innerExecute: { get: () => super.innerExecute }
|
|
27
32
|
});
|
|
28
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
yield _super.innerExecute.call(this,
|
|
34
|
+
yield _super.innerExecute.call(this, config, extraParams);
|
|
30
35
|
const mochaPath = this.getMochaPath();
|
|
31
36
|
let mochaParams = [require.resolve(mochaPath)];
|
|
32
37
|
if (this.useIstanbul == true) {
|
|
@@ -34,17 +39,17 @@ class MochaExecutor extends test_listener_executor_1.TestListenerExecutor {
|
|
|
34
39
|
}
|
|
35
40
|
mochaParams.push('-R');
|
|
36
41
|
mochaParams.push(this.mochaReporterPath);
|
|
37
|
-
mochaParams = mochaParams.concat(extraParams);
|
|
42
|
+
mochaParams = mochaParams.concat(extraParams !== null && extraParams !== void 0 ? extraParams : []);
|
|
38
43
|
agent_loader_1.AgentLoader.run(mochaParams, this.useIstanbul, this.spawnRuntimeArgs, false, {
|
|
39
44
|
command: this.commandName,
|
|
40
|
-
loadEsmHook:
|
|
45
|
+
loadEsmHook: config.es6Modules,
|
|
41
46
|
});
|
|
42
47
|
});
|
|
43
48
|
}
|
|
44
|
-
getBuildSessionData(
|
|
49
|
+
getBuildSessionData(rawArgs) {
|
|
45
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
51
|
const buildSessionDataBuilder = new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(this.backendProxy);
|
|
47
|
-
return yield buildSessionDataBuilder.build(
|
|
52
|
+
return yield buildSessionDataBuilder.build(rawArgs);
|
|
48
53
|
});
|
|
49
54
|
}
|
|
50
55
|
runWithoutSealights() {
|
|
@@ -63,6 +68,20 @@ class MochaExecutor extends test_listener_executor_1.TestListenerExecutor {
|
|
|
63
68
|
? 'mocha/bin/_mocha'
|
|
64
69
|
: 'mocha/bin/mocha';
|
|
65
70
|
}
|
|
71
|
+
getConfigToSaveToProcessEnv(config) {
|
|
72
|
+
const _super = Object.create(null, {
|
|
73
|
+
getConfigToSaveToProcessEnv: { get: () => super.getConfigToSaveToProcessEnv }
|
|
74
|
+
});
|
|
75
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
return Object.assign(Object.assign({}, (yield _super.getConfigToSaveToProcessEnv.call(this, config))), { prID: config.prID, testProjectId: config.testProjectId });
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
getBackendProxyConfig(rawArgs) {
|
|
80
|
+
return {
|
|
81
|
+
testProjectId: rawArgs.testProjectId || common_1.SlEnvVars.testProjectId(),
|
|
82
|
+
prID: rawArgs.prID || common_1.SlEnvVars.prID(),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
66
85
|
}
|
|
67
86
|
exports.MochaExecutor = MochaExecutor;
|
|
68
87
|
//# sourceMappingURL=mocha-executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qEAAgE;AAChE,sHAA8G;AAC9G,oEAA+D;AAC/D,+BAA+B;AAC/B,mEAA+D;AAK/D,4FAGoD;AACpD,yDAAmD;AACnD,yCAAyC;AAGzC,MAAa,aAAc,SAAQ,6CAAsC;IAAzE;;QACU,sBAAiB,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC;QACnE,gBAAW,GAAG,OAAO,CAAC;QACtB,WAAM,GAAG,uCAAS,CAAC;QACnB,cAAS,GAAG,wBAAS,CAAC,KAAK,CAAC;IAuExC,CAAC;IArEc,YAAY,CACvB,MAA0B,EAC1B,WAAsB;;;;;YAEtB,MAAM,OAAM,YAAY,YAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,IAAI,WAAW,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;gBAC5B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;YAED,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACzC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC;YACpD,0BAAW,CAAC,GAAG,CACb,WAAW,EACX,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,gBAAgB,EACrB,KAAK,EACL;gBACE,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,WAAW,EAAE,MAAM,CAAC,UAAU;aAC/B,CACF,CAAC;QACJ,CAAC;KAAA;IAEe,mBAAmB,CACjC,OAA4B;;YAE5B,MAAM,uBAAuB,GAAG,IAAI,0EAAiC,CACnE,IAAI,CAAC,YAAY,CAClB,CAAC;YACF,OAAO,MAAM,uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;KAAA;IAEe,mBAAmB;;YACjC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,OAAO,2CAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;KAAA;IAEO,YAAY;QAClB,sDAAsD;QACtD,oEAAoE;QACpE,6EAA6E;QAC7E,+EAA+E;QAC/E,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YAClC,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,iBAAiB,CAAC;IACxB,CAAC;IAEe,2BAA2B,CACzC,MAA0B;;;;;YAE1B,uCACK,CAAC,MAAM,OAAM,2BAA2B,YAAC,MAAM,CAAC,CAAC,KACpD,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,aAAa,EAAE,MAAM,CAAC,aAAa,IACnC;QACJ,CAAC;KAAA;IAES,qBAAqB,CAC7B,OAA+B;QAE/B,OAAO;YACL,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,kBAAS,CAAC,aAAa,EAAE;YACjE,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,kBAAS,CAAC,IAAI,EAAE;SACvC,CAAC;IACJ,CAAC;CACF;AA3ED,sCA2EC"}
|
|
@@ -11,31 +11,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.NycReportExecutor = void 0;
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
|
-
const path_1 = require("path");
|
|
15
|
-
const utils_1 = require("../utils");
|
|
16
14
|
const api_1 = require("../../test-listener/api");
|
|
15
|
+
const nyc_report_command_keys_1 = require("../config/keys/nyc-report-command-keys");
|
|
16
|
+
const config_store_1 = require("../config/config-store");
|
|
17
|
+
const agent_config_bridge_1 = require("../config/migration/agent-config-bridge");
|
|
17
18
|
class NycReportExecutor extends base_executor_1.BaseExecutor {
|
|
18
19
|
constructor() {
|
|
19
20
|
super(...arguments);
|
|
20
21
|
this.commandName = 'nycReport';
|
|
22
|
+
this.schema = nyc_report_command_keys_1.nycReportCommandKeys;
|
|
23
|
+
this.configKey = config_store_1.ConfigKey.NycReport;
|
|
21
24
|
}
|
|
22
|
-
innerExecute(
|
|
25
|
+
innerExecute(config) {
|
|
23
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const
|
|
25
|
-
const agentConfig = (0,
|
|
26
|
-
return (0, api_1.uploadNycReport)(
|
|
27
|
+
const mergedConfig = Object.assign(Object.assign(Object.assign({}, this.baseData), { projectRoot: config.projectRoot, branch: this.baseData.branchName, build: this.baseData.buildName, labId: config.labId || this.baseData.buildSessionId }), this.agentRemoteConfig);
|
|
28
|
+
const agentConfig = (0, agent_config_bridge_1.executorConfigToAgentConfig)(mergedConfig);
|
|
29
|
+
return (0, api_1.uploadNycReport)(config.report, agentConfig);
|
|
27
30
|
});
|
|
28
31
|
}
|
|
29
|
-
mapArgs(args) {
|
|
30
|
-
return Object.assign(Object.assign({}, this.baseData), { projectRoot: args.projectRoot, branch: this.baseData.branchName, build: this.baseData.buildName, labId: args.labid || this.baseData.buildSessionId });
|
|
31
|
-
}
|
|
32
32
|
// Added for tests
|
|
33
33
|
setBaseData(baseData) {
|
|
34
34
|
this.baseData = baseData;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.NycReportExecutor = NycReportExecutor;
|
|
38
|
-
NycReportExecutor.DEFAULT_NYC_REPORT_FILE_NAME = 'coverage-final.json';
|
|
39
|
-
NycReportExecutor.COVERAGE_FOLDER = 'coverage';
|
|
40
|
-
NycReportExecutor.DEFAULT_NYC_REPORT_FILE_LOC = (0, path_1.resolve)('.', NycReportExecutor.COVERAGE_FOLDER, NycReportExecutor.DEFAULT_NYC_REPORT_FILE_NAME);
|
|
41
38
|
//# sourceMappingURL=nyc-report-executor.js.map
|