slnodejs 6.1.940 → 6.1.943
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/package.json +1 -2
- package/tsOutputs/api.d.ts +2 -2
- package/tsOutputs/api.js +2 -2
- package/tsOutputs/build-scanner/cia.js +3 -2
- package/tsOutputs/build-scanner/cia.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +2 -2
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/cli-parse/agent-time-synchronizer.js +3 -11
- package/tsOutputs/cli-parse/agent-time-synchronizer.js.map +1 -1
- package/tsOutputs/cli-parse/executors/base-executor.js +11 -10
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-end-executor.js +3 -3
- package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js +4 -4
- package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +2 -2
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +2 -2
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-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/common/agent-events/agent-events-contracts.d.ts +0 -2
- package/tsOutputs/common/agent-events/agent-events-contracts.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-controller.d.ts +3 -4
- package/tsOutputs/common/agent-events/agent-events-controller.js +3 -17
- package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/cockpit-notifier.d.ts +2 -4
- package/tsOutputs/common/agent-events/cockpit-notifier.js +2 -4
- package/tsOutputs/common/agent-events/cockpit-notifier.js.map +1 -1
- package/tsOutputs/common/config-process/config.d.ts +1 -0
- package/tsOutputs/common/config-process/config.js +1 -0
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/config-process/index.d.ts +2 -2
- package/tsOutputs/common/config-process/index.js.map +1 -1
- package/tsOutputs/common/contracts.d.ts +0 -2
- package/tsOutputs/common/contracts.js.map +1 -1
- package/tsOutputs/common/environment-data-service.d.ts +37 -5
- package/tsOutputs/common/environment-data-service.js +5 -2
- package/tsOutputs/common/environment-data-service.js.map +1 -1
- package/tsOutputs/common/events-process/index.d.ts +3 -3
- package/tsOutputs/common/events-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js +2 -1
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js.map +1 -1
- package/tsOutputs/common/footprints-process/production-footprints-handler.js +2 -1
- package/tsOutputs/common/footprints-process/production-footprints-handler.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.d.ts +2 -2
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/index.d.ts +4 -4
- package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy-interface.d.ts +12 -5
- package/tsOutputs/common/http/backend-proxy-with-default-client.d.ts +7 -0
- package/tsOutputs/common/http/backend-proxy-with-default-client.js +25 -0
- package/tsOutputs/common/http/backend-proxy-with-default-client.js.map +1 -0
- package/tsOutputs/common/http/backend-proxy.d.ts +5 -4
- package/tsOutputs/common/http/backend-proxy.js +22 -21
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.d.ts +17 -3
- package/tsOutputs/common/http/contracts.js +4 -5
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/http/dry-run-proxy.js +17 -1
- package/tsOutputs/common/http/dry-run-proxy.js.map +1 -1
- package/tsOutputs/common/http/http-client.d.ts +9 -6
- package/tsOutputs/common/http/http-client.js +11 -6
- package/tsOutputs/common/http/http-client.js.map +1 -1
- package/tsOutputs/common/http/sl-routes.d.ts +2 -0
- package/tsOutputs/common/http/sl-routes.js +5 -0
- package/tsOutputs/common/http/sl-routes.js.map +1 -1
- package/tsOutputs/common/index.d.ts +16 -0
- package/tsOutputs/common/index.js +2 -0
- package/tsOutputs/common/index.js.map +1 -1
- package/tsOutputs/common/metrics-process/contracts.d.ts +24 -0
- package/tsOutputs/common/metrics-process/contracts.js +3 -0
- package/tsOutputs/common/metrics-process/contracts.js.map +1 -0
- package/tsOutputs/common/metrics-process/index.d.ts +23 -0
- package/tsOutputs/common/metrics-process/index.js +83 -0
- package/tsOutputs/common/metrics-process/index.js.map +1 -0
- package/tsOutputs/common/metrics-process/metrics-store-factory.d.ts +6 -0
- package/tsOutputs/common/metrics-process/metrics-store-factory.js +14 -0
- package/tsOutputs/common/metrics-process/metrics-store-factory.js.map +1 -0
- package/tsOutputs/common/metrics-process/metrics-store.d.ts +15 -0
- package/tsOutputs/common/metrics-process/metrics-store.js +84 -0
- package/tsOutputs/common/metrics-process/metrics-store.js.map +1 -0
- package/tsOutputs/common/no-op-state-tracker.d.ts +2 -2
- package/tsOutputs/common/no-op-state-tracker.js.map +1 -1
- package/tsOutputs/common/state-tracker.d.ts +3 -3
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/utils/build-session-data-builder.d.ts +3 -3
- package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/watchdog.d.ts +3 -0
- package/tsOutputs/common/watchdog.js +5 -2
- package/tsOutputs/common/watchdog.js.map +1 -1
- package/tsOutputs/test-listener/agent.d.ts +5 -1
- package/tsOutputs/test-listener/agent.js +8 -2
- package/tsOutputs/test-listener/agent.js.map +1 -1
- package/tsOutputs/test-listener/api.js +5 -5
- package/tsOutputs/test-listener/api.js.map +1 -1
- package/tsOutputs/test-listener/factory.d.ts +5 -3
- package/tsOutputs/test-listener/factory.js +18 -5
- package/tsOutputs/test-listener/factory.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor.js.map +1 -1
- package/tsOutputs/test-listener/remote-agent.d.ts +6 -8
- package/tsOutputs/test-listener/remote-agent.js +5 -2
- package/tsOutputs/test-listener/remote-agent.js.map +1 -1
- package/tsOutputs/test-listener/test-recommendation-handler.d.ts +2 -2
- package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
- package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
- package/tsOutputs/common/sl-mapper-tokenizer.d.ts +0 -22
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slnodejs",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.943",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"workspaces": [
|
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
"ut:common": "mocha \"tsOutputs/test/common/unitTest/**/*-spec.js\"",
|
|
16
16
|
"ut:build-scanner": "mocha tsOutputs/test/build-scanner/unitTest/**/*-spec.js",
|
|
17
17
|
"ut:test-listener": "mocha \"tsOutputs/test/test-listener/unitTest/**/*-spec.js\"",
|
|
18
|
-
"ut:slnodejs": "mocha \"tsOutputs/test/slnodejs/unitTest/**/*-spec.js\"",
|
|
19
18
|
"ut:cli-parse": "mocha \"tsOutputs/test/cli-parse/unitTest/**/*-spec.js\"",
|
|
20
19
|
"ut:mocha-reporter": "mocha tsOutputs/test/mocha-reporter/reporter-spec.js",
|
|
21
20
|
"ut:browser-agent": "cd browser-agent && npm test",
|
package/tsOutputs/api.d.ts
CHANGED
|
@@ -10,6 +10,6 @@ export declare const slWindowObject: string;
|
|
|
10
10
|
export { LoggerFactory };
|
|
11
11
|
export { CockpitNotifier } from './common/agent-events/cockpit-notifier';
|
|
12
12
|
export declare function createRemoteAgent(cliArgs: ITestRunnerArgs, useRelativeCoverage?: boolean, disableStateTracker?: boolean, checkBsidResolvedFromLabId?: boolean): Promise<RemoteAgent>;
|
|
13
|
-
export declare function cliArgsToAgentConfig(cliArgs: ITestRunnerArgs): Promise<import("./common
|
|
13
|
+
export declare function cliArgsToAgentConfig(cliArgs: ITestRunnerArgs): Promise<import("./common").AgentConfig>;
|
|
14
14
|
export declare function bsidResolvedFromLabid(cliArgs: ITestRunnerArgs): boolean;
|
|
15
|
-
export declare function createAgentConfig(configJson: object): import("./common
|
|
15
|
+
export declare function createAgentConfig(configJson: object): import("./common").AgentConfig;
|
package/tsOutputs/api.js
CHANGED
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.createAgentConfig = exports.bsidResolvedFromLabid = exports.cliArgsToAgentConfig = exports.createRemoteAgent = exports.CockpitNotifier = exports.LoggerFactory = exports.slWindowObject = exports.skipBrowserAgentKey = exports.RemoteAgent = exports.getSystemDateValueOf = void 0;
|
|
13
13
|
const token_data_builder_1 = require("./common/utils/token-data-builder");
|
|
14
|
-
const backend_proxy_1 = require("./common/http/backend-proxy");
|
|
15
14
|
const agent_instance_data_1 = require("./cli-parse/agent-instance-data");
|
|
16
15
|
const config_loader_1 = require("./common/config-process/config-loader");
|
|
17
16
|
const logger_1 = require("./common/logger");
|
|
@@ -19,6 +18,7 @@ Object.defineProperty(exports, "LoggerFactory", { enumerable: true, get: functio
|
|
|
19
18
|
const factory_1 = require("./test-listener/factory");
|
|
20
19
|
const constants_1 = require("./common/constants/constants");
|
|
21
20
|
const test_runner_build_session_data_builder_1 = require("./common/utils/test-runner-build-session-data-builder");
|
|
21
|
+
const backend_proxy_with_default_client_1 = require("./common/http/backend-proxy-with-default-client");
|
|
22
22
|
var system_date_1 = require("./common/system-date");
|
|
23
23
|
Object.defineProperty(exports, "getSystemDateValueOf", { enumerable: true, get: function () { return system_date_1.getSystemDateValueOf; } });
|
|
24
24
|
var remote_agent_1 = require("./test-listener/remote-agent");
|
|
@@ -52,7 +52,7 @@ function cliArgsToAgentConfig(cliArgs) {
|
|
|
52
52
|
throw new Error('Token is not valid');
|
|
53
53
|
}
|
|
54
54
|
const httpConfig = Object.assign(Object.assign({}, tokenData), { proxy: cliArgs.proxy });
|
|
55
|
-
const backendProxy =
|
|
55
|
+
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, httpConfig, logger);
|
|
56
56
|
const buildSessionData = yield new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(backendProxy).build(cliArgs);
|
|
57
57
|
if (!buildSessionData) {
|
|
58
58
|
throw new Error('could not resolve build session data');
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
var BuildDiffProcess = require("./build-diff-process.js").BuildDiffProcess, LoggerFactory = require("../common/logger").LoggerFactory, expandCommaSeparatedValues = require('./utils').expandCommaSeparatedValues,
|
|
1
|
+
var BuildDiffProcess = require("./build-diff-process.js").BuildDiffProcess, LoggerFactory = require("../common/logger").LoggerFactory, expandCommaSeparatedValues = require('./utils').expandCommaSeparatedValues, ScmFactory = require("../common/scm/scm-factory").ScmFactory, DependencyUtils = require("../common/utils/dependency-utils").DependencyUtils, DefaultValuesResolver = require('./default-values-resolver'), agentInstanceData = require('./current-agent-instance'), utils = require('./utils.js'), BuildScanDiagnosis = require('./diagnostic').BuildScanDiagnosis, DryRunDiagnosis = require('./diagnostic').DryRunDiagnosis, // should be changed
|
|
2
2
|
NoneDiagnosis = require('./diagnostic').NoneDiagnosis;
|
|
3
|
+
BackendProxyFactory = require("../common/http/backend-proxy-with-default-client").BackendProxyFactory;
|
|
3
4
|
function CIA() {
|
|
4
5
|
}
|
|
5
6
|
CIA.prototype.run = function run(buildArguments, callback) {
|
|
@@ -11,7 +12,7 @@ CIA.prototype.run = function run(buildArguments, callback) {
|
|
|
11
12
|
printConfiguration(buildArguments, logger);
|
|
12
13
|
try {
|
|
13
14
|
var parsedDependencies = context._tryParseDependenciesForIntegrationBuild(buildArguments, logger);
|
|
14
|
-
var buildMappingProxy =
|
|
15
|
+
var buildMappingProxy = BackendProxyFactory.initWithDefaultClient(agentInstanceData, buildArguments, logger);
|
|
15
16
|
context.runBuildDiffProcess(buildMappingProxy, parsedDependencies, buildArguments, logger, callback);
|
|
16
17
|
}
|
|
17
18
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cia.js","sourceRoot":"","sources":["../../build-scanner/cia.js"],"names":[],"mappings":"AAAA,IAAI,gBAAgB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EACtE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,aAAa,EACzD,0BAA0B,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,0BAA0B,EAC1E,
|
|
1
|
+
{"version":3,"file":"cia.js","sourceRoot":"","sources":["../../build-scanner/cia.js"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ exports.FileEnricherByLineMatch = exports.FileEnricher = exports.FileEnricherFac
|
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const FileSignature = require("../js_diff/file-signature");
|
|
7
|
-
const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
|
|
8
7
|
class FileEnricherFactory {
|
|
9
8
|
static initByConfig(logger, diagnosticCollector, opts, scmRootDir, scmFilesContainer, config) {
|
|
10
9
|
if (config.enrichByLinesMatch) {
|
|
@@ -116,7 +115,8 @@ class FileEnricher {
|
|
|
116
115
|
const anotherPossiblePosition = `${row},${Number(column) - 1}`;
|
|
117
116
|
const anotherSourceIdx = sourceFilePositionMap[anotherPossiblePosition];
|
|
118
117
|
if (anotherSourceIdx > -1) {
|
|
119
|
-
|
|
118
|
+
//CockpitNotifier.sendWarning(`Position '${position}' not matched at initial map, matched at alternate index '${anotherSourceIdx}' with position data '${anotherPossiblePosition}'`);
|
|
119
|
+
this.logger.debug(`Position '${position}' not matched at initial map, matched at alternate index '${anotherSourceIdx}' with position data '${anotherPossiblePosition}'`);
|
|
120
120
|
return anotherSourceIdx;
|
|
121
121
|
}
|
|
122
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +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.AgentTimeSynchronizer = void 0;
|
|
13
|
-
const http_client_1 = require("../common/http/http-client");
|
|
14
|
-
const backend_proxy_1 = require("../common/http/backend-proxy");
|
|
15
13
|
const system_date_1 = require("../common/system-date");
|
|
16
14
|
const agent_time_1 = require("../common/agent-time");
|
|
15
|
+
const backend_proxy_with_default_client_1 = require("../common/http/backend-proxy-with-default-client");
|
|
17
16
|
class AgentTimeSynchronizer extends agent_time_1.AgentTime {
|
|
18
17
|
constructor(syncIntervalSec, logger, agentBaseData, agentInstanceData) {
|
|
19
18
|
super(syncIntervalSec, logger);
|
|
@@ -27,15 +26,8 @@ class AgentTimeSynchronizer extends agent_time_1.AgentTime {
|
|
|
27
26
|
getSynchronizationTime() {
|
|
28
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
28
|
const timeSyncResult = { offset: 0 };
|
|
30
|
-
const config = Object.assign(Object.assign({}, this.agentBaseData), { server: this.agentBaseData.origin, defaultTimeout: agent_time_1.AgentTime.DEFAULT_TIMEOUT });
|
|
31
|
-
const
|
|
32
|
-
agentId: this.agentInstanceData.agentId,
|
|
33
|
-
buildSessionId: this.agentBaseData.buildSessionId,
|
|
34
|
-
agentType: this.agentInstanceData.agentType,
|
|
35
|
-
agentTechnology: this.agentInstanceData.technology,
|
|
36
|
-
};
|
|
37
|
-
const httpClient = new http_client_1.HttpClient(config, httpClientMetadata, this.logger);
|
|
38
|
-
const backendProxy = new backend_proxy_1.BackendProxy(this.agentInstanceData, config, this.logger, httpClient);
|
|
29
|
+
const config = Object.assign(Object.assign({}, this.agentBaseData), { server: this.agentBaseData.origin, defaultTimeout: agent_time_1.AgentTime.DEFAULT_TIMEOUT, buildSessionId: this.agentBaseData.buildSessionId });
|
|
30
|
+
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(this.agentInstanceData, config, this.logger);
|
|
39
31
|
try {
|
|
40
32
|
const time = yield backendProxy.getSyncedTime((0, system_date_1.getSystemDateValueOfLocal)());
|
|
41
33
|
if (time === null || time === void 0 ? void 0 : time.offset) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-time-synchronizer.js","sourceRoot":"","sources":["../../cli-parse/agent-time-synchronizer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"agent-time-synchronizer.js","sourceRoot":"","sources":["../../cli-parse/agent-time-synchronizer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,uDAAkE;AAClE,qDAAiD;AAGjD,wGAAuF;AAEvF,MAAa,qBAAsB,SAAQ,sBAAS;IAClD,YACE,eAAuB,EACvB,MAAc,EACG,aAAwB,EACxB,iBAAoC;QAErD,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAHd,kBAAa,GAAb,aAAa,CAAW;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAGvD,CAAC;IAED,MAAM,CAAC,8BAA8B,CACnC,eAAuB,EACvB,MAAc,EACd,aAAwB,EACxB,iBAAoC;QAEpC,OAAO,CACL,IAAI,CAAC,SAAS;YACd,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CACxB,eAAe,EACf,MAAM,EACN,aAAa,EACb,iBAAiB,CAClB,CAAC,CACH,CAAC;IACJ,CAAC;IAEK,sBAAsB;;YAC1B,MAAM,cAAc,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YACrC,MAAM,MAAM,mCACP,IAAI,CAAC,aAAa,KACrB,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EACjC,cAAc,EAAE,sBAAS,CAAC,eAAe,EACzC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,GAClD,CAAC;YAEF,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAC5D,IAAI,CAAC,iBAAiB,EACtB,MAAM,EACN,IAAI,CAAC,MAAgB,CACtB,CAAC;YAEF,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,IAAA,uCAAyB,GAAE,CAAC,CAAC;gBAC3E,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE;oBAChB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC7C;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC1B;YAED,OAAO,cAAc,CAAC;QACxB,CAAC;KAAA;CACF;AArDD,sDAqDC"}
|
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.BaseExecutor = void 0;
|
|
13
13
|
const contracts_1 = require("../contracts");
|
|
14
14
|
const token_data_builder_1 = require("../../common/utils/token-data-builder");
|
|
15
|
-
const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
16
15
|
const build_session_data_builder_1 = require("../../common/utils/build-session-data-builder");
|
|
17
16
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
18
17
|
const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
|
|
@@ -25,6 +24,8 @@ const system_date_1 = require("../../common/system-date");
|
|
|
25
24
|
const http_client_1 = require("../../common/http/http-client");
|
|
26
25
|
const preloader_1 = require("../preloader");
|
|
27
26
|
const sl_env_vars_1 = require("../../common/constants/sl-env-vars");
|
|
27
|
+
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
28
|
+
const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
28
29
|
const fs_1 = require("fs");
|
|
29
30
|
/**
|
|
30
31
|
* Base class for executing all CLI commands.
|
|
@@ -118,12 +119,12 @@ class BaseExecutor {
|
|
|
118
119
|
throw new Error('Invalid token. Skipping sealights integration. See log for more details');
|
|
119
120
|
}
|
|
120
121
|
const httpConfig = Object.assign(Object.assign({}, tokenData), { proxy: args.proxy });
|
|
121
|
-
|
|
122
|
-
const buildSessionData = yield this.getBuildSessionData(
|
|
122
|
+
this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, httpConfig, this.logger);
|
|
123
|
+
const buildSessionData = yield this.getBuildSessionData(args);
|
|
123
124
|
if (!buildSessionData) {
|
|
124
125
|
throw new Error('Invalid build session data. Skipping sealights integration. See log for more details');
|
|
125
126
|
}
|
|
126
|
-
backendProxy.updateMetadata({
|
|
127
|
+
this.backendProxy.updateMetadata({
|
|
127
128
|
buildSessionId: buildSessionData.buildSessionId
|
|
128
129
|
});
|
|
129
130
|
this._baseData = Object.assign(Object.assign(Object.assign({}, tokenData), buildSessionData), { proxy: args.proxy, labid: args.labid });
|
|
@@ -152,9 +153,9 @@ class BaseExecutor {
|
|
|
152
153
|
get baseData() {
|
|
153
154
|
return this._baseData;
|
|
154
155
|
}
|
|
155
|
-
getBuildSessionData(
|
|
156
|
+
getBuildSessionData(cmd) {
|
|
156
157
|
return __awaiter(this, void 0, void 0, function* () {
|
|
157
|
-
const buildSessionDataBuilder = new build_session_data_builder_1.BuildSessionDataBuilder(backendProxy);
|
|
158
|
+
const buildSessionDataBuilder = new build_session_data_builder_1.BuildSessionDataBuilder(this.backendProxy);
|
|
158
159
|
return yield buildSessionDataBuilder.build(cmd);
|
|
159
160
|
});
|
|
160
161
|
}
|
|
@@ -169,7 +170,7 @@ class BaseExecutor {
|
|
|
169
170
|
agentInstanceData.AgentAllocatedMemoryInMb = yield v8_utils_1.V8Utils.heapSizeLimitMB();
|
|
170
171
|
const agentConfig = this.createAgentConfig(cmdArgs);
|
|
171
172
|
try {
|
|
172
|
-
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger, system_date_1.getSystemOffset);
|
|
173
|
+
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger, system_date_1.getSystemOffset, this.backendProxy);
|
|
173
174
|
}
|
|
174
175
|
catch (e) {
|
|
175
176
|
this.logger.error(`Failed to submit agent start event, Error: '${e}'`);
|
|
@@ -191,8 +192,8 @@ class BaseExecutor {
|
|
|
191
192
|
}
|
|
192
193
|
});
|
|
193
194
|
}
|
|
194
|
-
//
|
|
195
|
-
//
|
|
195
|
+
// TODO: BackendProxy shouldn't be used here directly
|
|
196
|
+
// instead we need to pass config provider into BackendProxy and take value from it
|
|
196
197
|
if (agentConfig.httpAttemptInterval.hasValue) {
|
|
197
198
|
backend_proxy_1.BackendProxy.DEFAULT_HTTP_ATTEMPT_INTERVAL = agentConfig.httpAttemptInterval.value;
|
|
198
199
|
}
|
|
@@ -217,7 +218,7 @@ class BaseExecutor {
|
|
|
217
218
|
getRemoteConfigFromServer(agentBaseData) {
|
|
218
219
|
return __awaiter(this, void 0, void 0, function* () {
|
|
219
220
|
try {
|
|
220
|
-
const backendProxy =
|
|
221
|
+
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, agentBaseData, this.logger);
|
|
221
222
|
const remoteConfig = yield backendProxy.getRemoteConfigPromise(agentBaseData);
|
|
222
223
|
this.agentRemoteConfig = remoteConfig || {};
|
|
223
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAqD;AACrD,8EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.BuildEndExecutor = void 0;
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
14
|
const contracts_1 = require("../contracts");
|
|
15
|
-
const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
16
15
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
17
16
|
const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
|
|
18
17
|
const utils_1 = require("../utils");
|
|
19
18
|
const system_date_1 = require("../../common/system-date");
|
|
19
|
+
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
20
20
|
class BuildEndExecutor extends base_executor_1.BaseExecutor {
|
|
21
21
|
constructor() {
|
|
22
22
|
super(...arguments);
|
|
@@ -25,8 +25,8 @@ class BuildEndExecutor extends base_executor_1.BaseExecutor {
|
|
|
25
25
|
innerExecute(args) {
|
|
26
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
27
|
const agentConfig = (0, utils_1.createAgentConfig)(this.baseData);
|
|
28
|
-
const backendProxy =
|
|
29
|
-
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agent_instance_data_1.agentInstanceData, this.logger, system_date_1.getSystemOffset, {}
|
|
28
|
+
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
|
|
29
|
+
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agent_instance_data_1.agentInstanceData, this.logger, system_date_1.getSystemOffset, backendProxy, {});
|
|
30
30
|
try {
|
|
31
31
|
yield backendProxy.buildEnd(this.mapArgs(args));
|
|
32
32
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,4CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,4CAAqD;AACrD,gEAAyD;AACzD,iFAA2E;AAC3E,oCAA2C;AAE3C,0DAAyD;AACzD,2GAAwF;AAExF,MAAa,gBAAiB,SAAQ,4BAA0C;IAAhF;;QACc,gBAAW,GAAG,UAAU,CAAC;IAkDvC,CAAC;IAjDgB,YAAY,CAAC,IAAmB;;YACzC,MAAM,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9G,MAAM,kCAAe,CAAC,WAAW,CAAC,WAAW,EAAE,uCAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,6BAAe,EAAE,YAAY,EAAE,EAAE,CAAC,CAAA;YACjH,IAAI;gBACA,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;aACf;oBAAU;gBACP,MAAM,kCAAe,CAAC,cAAc,EAAE,CAAC;aAC1C;QACL,CAAC;KAAA;IAEM,OAAO,CAAC,IAAmB;QAC9B,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAC9B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;YAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAC9B,MAAM,EAAG;gBACL,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;aACnC;SACJ,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,KAAe;QAClC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,mBAAmB,CAAC,IAAmB;;QAC3C,MAAM,WAAW,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAG,CAAC,CAAC,CAAC;QAEpC,IAAG,WAAW,KAAK,oBAAQ,CAAC,SAAS,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,mFAAmF,CAAC,CAAC;SAC9G;IACL,CAAC;IAED,YAAY,CAAC,IAAmB;QAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,2CAA2C,CAAC,CAAC;YACnE,OAAO,KAAK,CAAC;SAChB;QAED,IAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,0DAA0D,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnDD,4CAmDC"}
|
|
@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ConfigExecutor = void 0;
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
|
-
const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
15
14
|
const build_session_data_builder_1 = require("../../common/utils/build-session-data-builder");
|
|
16
15
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
17
16
|
const fs_1 = require("fs");
|
|
17
|
+
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
18
18
|
class ConfigExecutor extends base_executor_1.BaseExecutor {
|
|
19
19
|
constructor() {
|
|
20
20
|
super(...arguments);
|
|
@@ -23,7 +23,7 @@ class ConfigExecutor extends base_executor_1.BaseExecutor {
|
|
|
23
23
|
innerExecute(args) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
const data = this.mapArgs(args);
|
|
26
|
-
const backendProxy =
|
|
26
|
+
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
|
|
27
27
|
try {
|
|
28
28
|
const buildSessionId = yield backendProxy.createBuildSessionIdPromise(data);
|
|
29
29
|
const buildSessionIdFile = this.getPath(args);
|
|
@@ -40,9 +40,9 @@ class ConfigExecutor extends base_executor_1.BaseExecutor {
|
|
|
40
40
|
getPath(args) {
|
|
41
41
|
return args.buildsessionidfile || 'buildSessionId';
|
|
42
42
|
}
|
|
43
|
-
getBuildSessionData(
|
|
43
|
+
getBuildSessionData(cmd) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
return new build_session_data_builder_1.BuildSessionDataBuilder(backendProxy).parseFromCli(cmd);
|
|
45
|
+
return new build_session_data_builder_1.BuildSessionDataBuilder(this.backendProxy).parseFromCli(cmd);
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
mapArgs(args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,8FAAsF;AACtF,gEAAyD;AACzD,2BAAiC;AAGjC,2GAA0F;AAE1F,MAAa,cAAe,SAAQ,4BAA2C;IAA/E;;QAEc,gBAAW,GAAG,QAAQ,CAAC;IAkCrC,CAAC;IAhCgB,YAAY,CAAC,IAAiB;;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9G,IAAI;gBACA,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;gBAC5E,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC9C,IAAA,kBAAa,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,cAAc,qBAAqB,kBAAkB,EAAE,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;aACf;YAAA,OAAO,CAAC,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,EAAE,CAAC,CAAC;gBAChF,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAEO,OAAO,CAAC,IAAiB;QAC7B,OAAO,IAAI,CAAC,kBAAkB,IAAI,gBAAgB,CAAC;IACvD,CAAC;IAEe,mBAAmB,CAAC,GAAgB;;YAChD,OAAO,IAAI,oDAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;KAAA;IAEM,OAAO,CAAC,IAAiB;QAC5B,MAAM,IAAI,GAAqB;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,SAAS,EAAE,IAAI,CAAC,KAAK;YACrB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAA;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AApCD,wCAoCC"}
|
|
@@ -13,12 +13,12 @@ exports.IntegrationBuildComponentsExecutor = void 0;
|
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
14
|
const dependency_utils_1 = require("../../common/utils/dependency-utils");
|
|
15
15
|
const fs_1 = require("fs");
|
|
16
|
-
const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
17
16
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
17
|
+
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
18
18
|
class IntegrationBuildComponentsExecutor extends base_executor_1.BaseExecutor {
|
|
19
19
|
innerExecute(args, extraArgs) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
this.backendProxy =
|
|
21
|
+
this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
|
|
22
22
|
const components = this.getIntegrationBuildDependenciesFromArgs(args);
|
|
23
23
|
if (components.length > 0) {
|
|
24
24
|
yield this.submitRequest(this.baseData.buildSessionId, components, agent_instance_data_1.agentInstanceData.agentId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration-build-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAG7C,0EAAoE;AACpE,2BAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"integration-build-components-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/integration-build-components-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAG7C,0EAAoE;AACpE,2BAAgC;AAChC,gEAAyD;AACzD,2GAA0F;AAG1F,MAAsB,kCAAmC,SAAQ,4BAA8C;IAG9F,YAAY,CAAC,IAAiC,EAAE,SAAoB;;YAC7E,IAAI,CAAC,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7G,MAAM,UAAU,GAAG,IAAI,CAAC,uCAAuC,CAAC,IAAI,CAAC,CAAC;YACtE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,EAAE,uCAAiB,CAAC,OAAO,CAAC,CAAC;gBAC9F,OAAO,IAAI,CAAC;aACf;iBACI;gBACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;gBACnD,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAIS,uCAAuC,CAAC,0BAAuD;QACrG,IAAI;YACA,IAAI,IAAI,GAAuB,EAAE,CAAC;YAClC,IAAI,0BAA0B,CAAC,YAAY,EAAE;gBACzC,IAAI,GAAG,kCAAe,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aAClG;iBAAM,IAAI,0BAA0B,CAAC,aAAa,EAAE;gBACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;gBAC9E,IAAI,GAAG,kCAAe,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACvE;YAED,6GAA6G;YAC7G,qGAAqG;YACrG,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAClB,MAAM,gBAAgB,GAAgC,EAAE,CAAC;gBACzD,IAAI,GAAG,CAAC,OAAO;oBAAE,gBAAgB,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;gBACxD,IAAI,GAAG,CAAC,MAAM;oBAAE,gBAAgB,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;gBACzD,IAAI,GAAG,CAAC,KAAK;oBAAE,gBAAgB,CAAC,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;gBACtD,IAAI,GAAG,CAAC,cAAc;oBAAE,gBAAgB,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;gBAC7E,OAAO,gBAAgB,CAAC;YAC5B,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;YAC5D,OAAO,EAAE,CAAC;SACb;IACL,CAAC;IAES,aAAa,CAAC,QAAQ;QAC5B,IAAI,OAAO,CAAC;QACZ,IAAI;YACA,OAAO,GAAG,IAAA,iBAAY,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;SAC/C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,+BAA+B,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACpE,MAAM,GAAG,CAAC;SACb;QACD,IAAI;YACA,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,4CAA4C,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACnF,MAAM,GAAG,CAAC;SACb;IACL,CAAC;CACJ;AA3DD,gFA2DC"}
|
|
@@ -40,9 +40,9 @@ class MochaExecutor extends test_listener_executor_1.TestListenerExecutor {
|
|
|
40
40
|
});
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
|
-
getBuildSessionData(
|
|
43
|
+
getBuildSessionData(cmd) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
const buildSessionDataBuilder = new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(backendProxy);
|
|
45
|
+
const buildSessionDataBuilder = new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(this.backendProxy);
|
|
46
46
|
return yield buildSessionDataBuilder.build(cmd);
|
|
47
47
|
});
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAA8D;
|
|
1
|
+
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAA8D;AAC9D,sHAA4G;AAC5G,oEAA6D;AAC7D,+BAA6B;AAC7B,mEAA6D;AAG7D,MAAa,aAAc,SAAQ,6CAAoB;IAAvD;;QACY,sBAAiB,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,4BAA4B,CAAC,CAAA;QAClE,gBAAW,GAAG,OAAO,CAAC;IAgCpC,CAAC;IA9BgB,YAAY,CAAC,IAAgB,EAAE,WAAqB;;;;;YAC7D,MAAM,OAAM,YAAY,YAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5C,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;gBAC1B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;YAED,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACtB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACzC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC9C,0BAAW,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE;gBACzE,OAAO,EAAE,IAAI,CAAC,WAAW;aAC5B,CAAC,CAAC;QACP,CAAC;KAAA;IAEe,mBAAmB,CAAC,GAAe;;YAC/C,MAAM,uBAAuB,GAAG,IAAI,0EAAiC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzF,OAAO,MAAM,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpD,CAAC;KAAA;IAEe,mBAAmB;;YAC/B,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;QAC9D,CAAC;KAAA;IAEO,YAAY;QAChB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC9E,CAAC;CACJ;AAlCD,sCAkCC"}
|
|
@@ -16,7 +16,7 @@ class PRConfigExecutor extends config_executor_1.ConfigExecutor {
|
|
|
16
16
|
super(...arguments);
|
|
17
17
|
this.commandName = 'prConfig';
|
|
18
18
|
}
|
|
19
|
-
getBuildSessionData(
|
|
19
|
+
getBuildSessionData(cmd) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
const data = {};
|
|
22
22
|
data.appName = cmd.appname;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pr-config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/pr-config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"pr-config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/pr-config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uDAAiD;AAIjD,MAAa,gBAAiB,SAAQ,gCAAc;IAApD;;QACc,gBAAW,GAAG,UAAU,CAAC;IAkBvC,CAAC;IAhBmB,mBAAmB,CAAC,GAA+B;;YAC/D,MAAM,IAAI,GAAqB,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC3B,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAED,gCAAgC;IACzB,OAAO,CAAC,IAAS;QACpB,MAAM,iBAAiB,GAAuB;YAC1C,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,aAAa,EAAE,IAAI,CAAC,aAAa;SACpC,CAAC;QACF,OAAO,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAC,CAAC;IACzE,CAAC;CACJ;AAnBD,4CAmBC"}
|
|
@@ -13,9 +13,9 @@ exports.TestExecutionsExecutor = void 0;
|
|
|
13
13
|
const base_executor_1 = require("./base-executor");
|
|
14
14
|
const test_runner_build_session_data_builder_1 = require("../../common/utils/test-runner-build-session-data-builder");
|
|
15
15
|
class TestExecutionsExecutor extends base_executor_1.BaseExecutor {
|
|
16
|
-
getBuildSessionData(
|
|
16
|
+
getBuildSessionData(cmd) {
|
|
17
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
const buildSessionDataBuilder = new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(backendProxy);
|
|
18
|
+
const buildSessionDataBuilder = new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(this.backendProxy);
|
|
19
19
|
return yield buildSessionDataBuilder.build(cmd);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-executions-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/test-executions-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;
|
|
1
|
+
{"version":3,"file":"test-executions-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/test-executions-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAE7C,sHAA4G;AAG5G,MAAsB,sBAAwD,SAAQ,4BAAkB;IAEpF,mBAAmB,CAAC,GAAM;;YACtC,MAAM,uBAAuB,GAAG,IAAI,0EAAiC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzF,OAAO,MAAM,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpD,CAAC;KAAA;CACJ;AAND,wDAMC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { BackendProxy } from '../http/backend-proxy';
|
|
2
1
|
export interface IAgentInstanceInfo {
|
|
3
2
|
agentId: string;
|
|
4
3
|
technology: string;
|
|
@@ -137,7 +136,6 @@ export declare enum AgentTechnologies {
|
|
|
137
136
|
}
|
|
138
137
|
export interface IAgentStartArgs {
|
|
139
138
|
packageJsonFile?: Record<string, unknown>;
|
|
140
|
-
backendProxy?: BackendProxy;
|
|
141
139
|
tool?: IToolInfo;
|
|
142
140
|
tags?: ITagInfo[];
|
|
143
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-events-contracts.js","sourceRoot":"","sources":["../../../common/agent-events/agent-events-contracts.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"agent-events-contracts.js","sourceRoot":"","sources":["../../../common/agent-events/agent-events-contracts.ts"],"names":[],"mappings":";;;AA4EA,IAAY,UAMX;AAND,WAAY,UAAU;IAClB,4CAA8B,CAAA;IAC9B,4CAA8B,CAAA;IAC9B,2EAA6D,CAAA;IAC7D,4CAA8B,CAAA;IAC9B,mCAAqB,CAAA;AACzB,CAAC,EANW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAMrB;AAgBD,IAAY,cA6CX;AA7CD,WAAY,cAAc;IACtB,SAAS;IACT,oFAA0B,CAAA;IAC1B,wEAAoB,CAAA;IACpB,0EAAqB,CAAA;IACrB,kEAAiB,CAAA;IACjB,sFAA2B,CAAA;IAC3B,8HAA+C,CAAA;IAC/C,8FAA+B,CAAA;IAC/B,4FAA8B,CAAA;IAC9B,oEAAkB,CAAA;IAClB,wEAAoB,CAAA;IACpB,4FAA8B,CAAA;IAC9B,wGAAoC,CAAA;IAEpC,OAAO;IACP,4EAAsB,CAAA;IACtB,gGAAgC,CAAA;IAChC,WAAW;IACX,sDAAW,CAAA;IACX,0FAA6B,CAAA;IAC7B,gGAAgC,CAAA;IAChC,4FAA8B,CAAA;IAE9B,SAAS;IACT,wEAAoB,CAAA;IACpB,8EAAuB,CAAA;IACvB,sGAAmC,CAAA;IACnC,wGAAoC,CAAA;IACpC,gGAAgC,CAAA;IAChC,kGAAiC,CAAA;IACjC,oGAAkC,CAAA;IAClC,sGAAmC,CAAA;IACnC,8HAA+C,CAAA;IAC/C,0EAAqB,CAAA;IACrB,oFAA0B,CAAA;IAC1B,sGAAmC,CAAA;IACnC,gGAAgC,CAAA;IAChC,kEAAiB,CAAA;IACjB,sGAAmC,CAAA;IACnC,4EAAsB,CAAA;IAEtB,OAAO;IACP,gFAAwB,CAAA;IACxB,8EAAuB,CAAA;AAC3B,CAAC,EA7CW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA6CzB;AAiBD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;AACvB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { AgentConfig } from '../config-process/config';
|
|
2
2
|
import { AgentEventCode, IAgentEvent, IAgentStartInfo, IPingData, ITagInfo, IToolInfo } from './agent-events-contracts';
|
|
3
|
-
import { BackendProxy } from '../http/backend-proxy';
|
|
4
3
|
import { Watchdog } from '../watchdog';
|
|
5
4
|
import { AgentInstanceData } from '../agent-instance-data';
|
|
6
5
|
import { IColorContextManager, Logger } from '../contracts';
|
|
6
|
+
import { IBackendProxy } from '../http/backend-proxy-interface';
|
|
7
7
|
export declare class AgentEventsController {
|
|
8
8
|
private readonly getSystemOffset;
|
|
9
9
|
private readonly colorContextManager?;
|
|
@@ -11,7 +11,7 @@ export declare class AgentEventsController {
|
|
|
11
11
|
private static readonly MAX_SHUTDOWN_RETRIES;
|
|
12
12
|
private _agentConfig;
|
|
13
13
|
private _agentInstanceData;
|
|
14
|
-
private
|
|
14
|
+
private _backendProxy;
|
|
15
15
|
private _logger;
|
|
16
16
|
private _pingWatchdog;
|
|
17
17
|
private _tags;
|
|
@@ -20,7 +20,7 @@ export declare class AgentEventsController {
|
|
|
20
20
|
private shutDownRetries;
|
|
21
21
|
private active;
|
|
22
22
|
private submittedEventsMap;
|
|
23
|
-
constructor(agentConfig: AgentConfig, agentInstanceData: AgentInstanceData, logger: Logger, getSystemOffset: () => number, backendProxy
|
|
23
|
+
constructor(agentConfig: AgentConfig, agentInstanceData: AgentInstanceData, logger: Logger, getSystemOffset: () => number, backendProxy: IBackendProxy, tool?: IToolInfo, tags?: ITagInfo[], colorContextManager?: IColorContextManager);
|
|
24
24
|
submitAgentStartedEvent(packageJsonFile?: any): Promise<void>;
|
|
25
25
|
private addColorToEvent;
|
|
26
26
|
protected submitAgentEventRequest<T>(event: IAgentEvent<T> | IAgentEvent<T>[]): Promise<boolean>;
|
|
@@ -43,7 +43,6 @@ export declare class AgentEventsController {
|
|
|
43
43
|
resolveTags(): ITagInfo[];
|
|
44
44
|
addTags(tags: ITagInfo[]): void;
|
|
45
45
|
addTool(tollInfo: IToolInfo): void;
|
|
46
|
-
private createBackendProxy;
|
|
47
46
|
private initWatchdog;
|
|
48
47
|
private getTimers;
|
|
49
48
|
private buildEvent;
|
|
@@ -16,7 +16,6 @@ const machine_info_builder_1 = require("./machine-info-builder");
|
|
|
16
16
|
const nodejs_env_info_builder_1 = require("./nodejs-env-info-builder");
|
|
17
17
|
const agent_start_info_builder_1 = require("./agent-start-info-builder");
|
|
18
18
|
const ci_info_builder_1 = require("./ci-info-builder");
|
|
19
|
-
const backend_proxy_1 = require("../http/backend-proxy");
|
|
20
19
|
const validation_utils_1 = require("../utils/validation-utils");
|
|
21
20
|
const watchdog_1 = require("../watchdog");
|
|
22
21
|
const system_date_1 = require("../system-date");
|
|
@@ -31,11 +30,12 @@ class AgentEventsController {
|
|
|
31
30
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(agentInstanceData, 'agentInstanceData');
|
|
32
31
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(logger, 'logger');
|
|
33
32
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(getSystemOffset, 'getSystemOffset');
|
|
33
|
+
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(backendProxy, 'backendProxy');
|
|
34
34
|
this._agentConfig = agentConfig;
|
|
35
35
|
this._logger = logger;
|
|
36
36
|
this._agentInstanceData = agentInstanceData;
|
|
37
37
|
this.shutDownRetries = 0;
|
|
38
|
-
this.
|
|
38
|
+
this._backendProxy = backendProxy;
|
|
39
39
|
this.addTags(tags);
|
|
40
40
|
this.addTool(tool);
|
|
41
41
|
this.initWatchdog();
|
|
@@ -74,7 +74,7 @@ class AgentEventsController {
|
|
|
74
74
|
buildSessionId: this._agentConfig.buildSessionId.value
|
|
75
75
|
};
|
|
76
76
|
try {
|
|
77
|
-
yield this.
|
|
77
|
+
yield this._backendProxy.submitAgentEvent(request);
|
|
78
78
|
this._logger.info(`Submitted '${request.events.length}' events successfully`);
|
|
79
79
|
return true;
|
|
80
80
|
}
|
|
@@ -187,20 +187,6 @@ class AgentEventsController {
|
|
|
187
187
|
this._tools = this._tools || [];
|
|
188
188
|
this._tools.push(tollInfo);
|
|
189
189
|
}
|
|
190
|
-
createBackendProxy() {
|
|
191
|
-
const httpConfig = {
|
|
192
|
-
token: this._agentConfig.token.value,
|
|
193
|
-
proxy: this._agentConfig.proxy.value,
|
|
194
|
-
server: this._agentConfig.server.value,
|
|
195
|
-
compressRequests: this._agentConfig.gzip.value,
|
|
196
|
-
buildSessionId: this._agentConfig.buildSessionId.value,
|
|
197
|
-
labId: this._agentConfig.labId.value,
|
|
198
|
-
appName: this._agentConfig.appName.value,
|
|
199
|
-
buildName: this._agentConfig.build.value,
|
|
200
|
-
branchName: this._agentConfig.branch.value
|
|
201
|
-
};
|
|
202
|
-
return new backend_proxy_1.BackendProxy(this._agentInstanceData, httpConfig, this._logger);
|
|
203
|
-
}
|
|
204
190
|
initWatchdog() {
|
|
205
191
|
const watchdogOptions = { interval: AgentEventsController.PING_INTERVAL, name: 'AgentEventsWatchdog', autoReset: true, unref: true };
|
|
206
192
|
const timers = this.getTimers();
|