slnodejs 6.1.1162 → 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 +5 -3
- 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
|
@@ -30,27 +30,74 @@ const backend_proxy_1 = require("../../common/http/backend-proxy");
|
|
|
30
30
|
const fs_1 = require("fs");
|
|
31
31
|
const console_message_service_1 = require("../../common/console-message-service");
|
|
32
32
|
const message_keys_generated_1 = require("../../messages/message-keys.generated");
|
|
33
|
+
const config_resolver_1 = require("../config/config-resolver");
|
|
34
|
+
const config_store_1 = require("../config/config-store");
|
|
35
|
+
const validation_error_1 = require("../config/validation-error");
|
|
33
36
|
/**
|
|
34
37
|
* Base class for executing all CLI commands.
|
|
35
|
-
*
|
|
36
|
-
* Also download the node agent if needed.
|
|
38
|
+
* Uses schema-driven config resolution (ConfigResolver); executors define schema and configKey.
|
|
39
|
+
* Verify that buildSessionId and token params are correct. Also download the node agent if needed.
|
|
37
40
|
*/
|
|
38
41
|
class BaseExecutor {
|
|
39
42
|
constructor() {
|
|
40
43
|
this.logger = logger_1.LoggerFactory.getCreateApplicationLogger();
|
|
44
|
+
this.agentRemoteConfig = {};
|
|
41
45
|
this.cms = console_message_service_1.ConsoleMessageService.getInstance();
|
|
42
46
|
}
|
|
43
|
-
|
|
47
|
+
/**
|
|
48
|
+
* For schema keys with multiple CLI names (aliases), ensures the canonical
|
|
49
|
+
* Commander property has the user-provided value regardless of which alias
|
|
50
|
+
* was used on the command line. Needed because some legacy code reads
|
|
51
|
+
* rawArgs properties directly before config resolution.
|
|
52
|
+
*
|
|
53
|
+
* For each key with aliases: finds the first Commander property whose value
|
|
54
|
+
* differs from the schema default (i.e. user-provided), and copies it to
|
|
55
|
+
* all other alias properties including the canonical one.
|
|
56
|
+
*/
|
|
57
|
+
normalizeAliases(rawArgs) {
|
|
58
|
+
var _a;
|
|
59
|
+
const r = Object.assign({}, rawArgs);
|
|
60
|
+
for (const [key, keyDef] of Object.entries(this.schema)) {
|
|
61
|
+
const cli = (_a = keyDef.sources) === null || _a === void 0 ? void 0 : _a.cli;
|
|
62
|
+
if (!(cli === null || cli === void 0 ? void 0 : cli.names) || cli.names.length <= 1)
|
|
63
|
+
continue;
|
|
64
|
+
const toProperty = (n) => cli.commanderLowercaseKey ? n.toLowerCase() : n;
|
|
65
|
+
const canonical = toProperty(key);
|
|
66
|
+
const props = cli.names
|
|
67
|
+
.filter((n) => n.length > 1)
|
|
68
|
+
.map(toProperty);
|
|
69
|
+
const schemaDefault = keyDef.default;
|
|
70
|
+
const userProp = props.find((p) => r[p] !== undefined && r[p] !== schemaDefault);
|
|
71
|
+
if (userProp === undefined)
|
|
72
|
+
continue;
|
|
73
|
+
const userValue = r[userProp];
|
|
74
|
+
for (const p of props) {
|
|
75
|
+
r[p] = userValue;
|
|
76
|
+
}
|
|
77
|
+
r[canonical] = userValue;
|
|
78
|
+
}
|
|
79
|
+
return r;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Resolve options for full config (e.g. defaultSourcePriority: 'remoteFirst' for test-listener).
|
|
83
|
+
*/
|
|
84
|
+
getResolveOptions() {
|
|
85
|
+
return {
|
|
86
|
+
acceptAllRemoteParams: sl_env_vars_1.SlEnvVars.acceptAllRemoteParams(),
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
execute(rawInput, extraArgs, dontExit = false) {
|
|
44
90
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
|
|
46
|
-
|
|
91
|
+
const rawArgs = this.normalizeAliases(rawInput);
|
|
92
|
+
if (rawArgs.beControlledVersions || sl_env_vars_1.SlEnvVars.isBeControlledVersions()) {
|
|
93
|
+
const tokenData = new token_data_builder_1.TokenDataBuilder().build(rawArgs);
|
|
47
94
|
const preloader = new preloader_1.Preloader();
|
|
48
95
|
yield preloader.runWithControlledVersion(tokenData);
|
|
49
96
|
return;
|
|
50
97
|
}
|
|
51
98
|
this.shouldDumpEnvironment();
|
|
52
99
|
this.shouldInstrumentGlobalObject();
|
|
53
|
-
this.extraArgs = extraArgs;
|
|
100
|
+
this.extraArgs = extraArgs !== null && extraArgs !== void 0 ? extraArgs : [];
|
|
54
101
|
const agentInstanceData = agent_instance_data_1.AgentInstanceDataFactory.getOrCreateAgentInstanceData();
|
|
55
102
|
let result = true;
|
|
56
103
|
try {
|
|
@@ -64,17 +111,29 @@ class BaseExecutor {
|
|
|
64
111
|
this.cms.print(message_keys_generated_1.GeneralMessages.COMMAND_LINE_EXECUTED, {
|
|
65
112
|
cliArgs: process.argv.slice(2).join(' '),
|
|
66
113
|
});
|
|
67
|
-
|
|
114
|
+
yield this.resolveBaseData(rawArgs);
|
|
115
|
+
yield this.getRemoteConfigFromServer(this._baseData, rawArgs);
|
|
116
|
+
const { timeClock } = this.agentRemoteConfig;
|
|
117
|
+
if (timeClock === null || timeClock === void 0 ? void 0 : timeClock.enabled) {
|
|
118
|
+
yield agent_time_synchronizer_1.AgentTimeSynchronizer.getCreateAgentTimeSynchronizer(timeClock === null || timeClock === void 0 ? void 0 : timeClock.syncIntervalSec, this.logger, this._baseData, agentInstanceData).initiateClockSync();
|
|
119
|
+
}
|
|
120
|
+
const configResolver = new config_resolver_1.ConfigResolver();
|
|
121
|
+
const config = yield configResolver.resolve(this.schema, {
|
|
122
|
+
commanderArgs: rawArgs,
|
|
123
|
+
env: process.env,
|
|
124
|
+
remoteConfig: this.agentRemoteConfig,
|
|
125
|
+
}, this.getResolveOptions());
|
|
126
|
+
yield this.notifyAgentStarted(agentInstanceData, config);
|
|
127
|
+
config_store_1.ConfigStore.publish(this.configKey, config);
|
|
128
|
+
result = this.validateArgs(config);
|
|
68
129
|
if (result) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (timeClock === null || timeClock === void 0 ? void 0 : timeClock.enabled) {
|
|
73
|
-
yield agent_time_synchronizer_1.AgentTimeSynchronizer.getCreateAgentTimeSynchronizer(timeClock === null || timeClock === void 0 ? void 0 : timeClock.syncIntervalSec, this.logger, this._baseData, agentInstanceData).initiateClockSync();
|
|
130
|
+
const remoteConfigNotification = configResolver.getRemoteConfigOverridesCockpitMessage();
|
|
131
|
+
if (remoteConfigNotification) {
|
|
132
|
+
cockpit_notifier_1.CockpitNotifier.sendGenericMessage(remoteConfigNotification);
|
|
74
133
|
}
|
|
75
|
-
|
|
76
|
-
this.
|
|
77
|
-
result =
|
|
134
|
+
this.notifyConfigurationChanged(config);
|
|
135
|
+
const innerResult = yield this.innerExecute(config, extraArgs);
|
|
136
|
+
result = innerResult === undefined ? true : Boolean(innerResult);
|
|
78
137
|
yield this.notifyAgentShutdown();
|
|
79
138
|
}
|
|
80
139
|
}
|
|
@@ -82,10 +141,13 @@ class BaseExecutor {
|
|
|
82
141
|
this.logger.error(e.message);
|
|
83
142
|
this.cms.printString(e.message);
|
|
84
143
|
result = false;
|
|
144
|
+
if (e instanceof validation_error_1.CommandValidationError) {
|
|
145
|
+
this.logger.error(e.toLogMessage());
|
|
146
|
+
}
|
|
85
147
|
}
|
|
86
148
|
finally {
|
|
87
149
|
if (!dontExit) {
|
|
88
|
-
this.exitProcess(result,
|
|
150
|
+
this.exitProcess(result, rawArgs.failbuild);
|
|
89
151
|
}
|
|
90
152
|
}
|
|
91
153
|
});
|
|
@@ -124,35 +186,35 @@ class BaseExecutor {
|
|
|
124
186
|
Promise.resolve().then(() => require('../../test-listener/instrument-global'));
|
|
125
187
|
}
|
|
126
188
|
}
|
|
127
|
-
resolveBaseData(
|
|
189
|
+
resolveBaseData(rawArgs) {
|
|
190
|
+
var _a, _b;
|
|
128
191
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
|
-
const tokenData = new token_data_builder_1.TokenDataBuilder().build(
|
|
192
|
+
const tokenData = new token_data_builder_1.TokenDataBuilder().build(rawArgs);
|
|
130
193
|
if (!tokenData.isValid) {
|
|
131
194
|
throw new Error('Invalid token. Skipping sealights integration. See log for more details');
|
|
132
195
|
}
|
|
133
|
-
const httpConfig = Object.assign(Object.assign(Object.assign({}, this.getBackendProxyConfig(
|
|
196
|
+
const httpConfig = Object.assign(Object.assign(Object.assign({}, this.getBackendProxyConfig(rawArgs)), tokenData), { proxy: (_a = rawArgs.proxy) !== null && _a !== void 0 ? _a : '' });
|
|
134
197
|
this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.AgentInstanceDataFactory.getOrCreateAgentInstanceData(), httpConfig, this.logger);
|
|
135
|
-
const buildSessionData = yield this.getBuildSessionData(
|
|
198
|
+
const buildSessionData = yield this.getBuildSessionData(rawArgs);
|
|
136
199
|
if (!buildSessionData) {
|
|
137
200
|
throw new Error('Invalid build session data. Skipping sealights integration. See log for more details');
|
|
138
201
|
}
|
|
139
202
|
this.backendProxy.updateMetadata({
|
|
140
203
|
buildSessionId: buildSessionData.buildSessionId,
|
|
141
|
-
labId:
|
|
204
|
+
labId: rawArgs.labid,
|
|
142
205
|
appName: buildSessionData.appName,
|
|
143
206
|
branchName: buildSessionData.branchName,
|
|
144
207
|
buildName: buildSessionData.buildName,
|
|
145
208
|
});
|
|
146
|
-
this._baseData = Object.assign(Object.assign(Object.assign({}, tokenData), buildSessionData), { proxy:
|
|
209
|
+
this._baseData = Object.assign(Object.assign(Object.assign({}, tokenData), buildSessionData), { proxy: ((_b = rawArgs.proxy) !== null && _b !== void 0 ? _b : ''), labid: rawArgs.labid });
|
|
147
210
|
});
|
|
148
211
|
}
|
|
149
212
|
/**
|
|
150
213
|
* Use to pass additional configuration of BackendProxy.
|
|
151
214
|
* Data from token and proxy from CLI arguments take precedence over data returned by this method.
|
|
152
|
-
* @param _args
|
|
153
215
|
* @protected
|
|
154
216
|
*/
|
|
155
|
-
getBackendProxyConfig(
|
|
217
|
+
getBackendProxyConfig(_rawArgs) {
|
|
156
218
|
return {};
|
|
157
219
|
}
|
|
158
220
|
exitProcess(result, failbuild) {
|
|
@@ -176,9 +238,9 @@ class BaseExecutor {
|
|
|
176
238
|
/**
|
|
177
239
|
* If some command needs to do some validation before downloading the agent, this method can be overridden.
|
|
178
240
|
* @default true
|
|
179
|
-
* @param
|
|
241
|
+
* @param config resolved config
|
|
180
242
|
*/
|
|
181
|
-
validateArgs(
|
|
243
|
+
validateArgs(config) {
|
|
182
244
|
return true;
|
|
183
245
|
}
|
|
184
246
|
set baseData(value) {
|
|
@@ -187,10 +249,10 @@ class BaseExecutor {
|
|
|
187
249
|
get baseData() {
|
|
188
250
|
return this._baseData;
|
|
189
251
|
}
|
|
190
|
-
getBuildSessionData(
|
|
252
|
+
getBuildSessionData(legacyArgs) {
|
|
191
253
|
return __awaiter(this, void 0, void 0, function* () {
|
|
192
254
|
const buildSessionDataBuilder = new build_session_data_builder_1.BuildSessionDataBuilder(this.backendProxy);
|
|
193
|
-
return yield buildSessionDataBuilder.build(
|
|
255
|
+
return yield buildSessionDataBuilder.build(legacyArgs);
|
|
194
256
|
});
|
|
195
257
|
}
|
|
196
258
|
getInstrumentationMethodology() {
|
|
@@ -223,12 +285,12 @@ class BaseExecutor {
|
|
|
223
285
|
this.logger.error(`Failed to send cockpit error event, Error: '${e}'`);
|
|
224
286
|
}
|
|
225
287
|
}
|
|
226
|
-
notifyAgentStarted(agentInstanceData,
|
|
288
|
+
notifyAgentStarted(agentInstanceData, config) {
|
|
227
289
|
return __awaiter(this, void 0, void 0, function* () {
|
|
228
290
|
agentInstanceData.AgentAllocatedMemoryInMb =
|
|
229
291
|
yield v8_utils_1.V8Utils.heapSizeLimitMB();
|
|
230
292
|
// labId should not be passed to notifyStart as it tricks the backend into thinking there is a live agent
|
|
231
|
-
const agentConfig = this.createAgentConfig(
|
|
293
|
+
const agentConfig = this.createAgentConfig(config, true);
|
|
232
294
|
try {
|
|
233
295
|
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger, system_date_1.getSystemOffset, this.backendProxy);
|
|
234
296
|
}
|
|
@@ -237,19 +299,15 @@ class BaseExecutor {
|
|
|
237
299
|
}
|
|
238
300
|
});
|
|
239
301
|
}
|
|
240
|
-
createAgentConfig(
|
|
302
|
+
createAgentConfig(config, omitLabId = false) {
|
|
241
303
|
// We named build, branch and labId differently in base data vs config, this should be properly redesigned with bellow fix
|
|
242
|
-
const cmd = Object.assign(Object.assign({}, this.baseData), { branch: this.baseData.branchName, build: this.baseData.buildName, labId:
|
|
243
|
-
if (
|
|
244
|
-
cmd[contracts_1.COMMAND_ARGS.USE_OTEL] =
|
|
304
|
+
const cmd = Object.assign(Object.assign(Object.assign({}, this.baseData), { branch: this.baseData.branchName, build: this.baseData.buildName, labId: this.baseData.labid }), config);
|
|
305
|
+
if (config[contracts_1.COMMAND_ARGS.INSTRUMENT_FOR_BROWSERS]) {
|
|
306
|
+
cmd[contracts_1.COMMAND_ARGS.USE_OTEL] = config[contracts_1.COMMAND_ARGS.ENABLE_OPEN_TELEMETRY];
|
|
245
307
|
}
|
|
246
308
|
const agentConfig = new config_loader_1.ConfigLoader().loadAgentConfiguration(cmd);
|
|
247
|
-
if (
|
|
248
|
-
|
|
249
|
-
if (agentConfig[key] !== undefined) {
|
|
250
|
-
agentConfig[key].value = this.agentRemoteConfig[key];
|
|
251
|
-
}
|
|
252
|
-
});
|
|
309
|
+
if (omitLabId) {
|
|
310
|
+
agentConfig.labId.value = undefined;
|
|
253
311
|
}
|
|
254
312
|
// TODO: BackendProxy shouldn't be used here directly
|
|
255
313
|
// instead we need to pass config provider into BackendProxy and take value from it
|
|
@@ -276,11 +334,18 @@ class BaseExecutor {
|
|
|
276
334
|
}
|
|
277
335
|
});
|
|
278
336
|
}
|
|
279
|
-
getRemoteConfigFromServer(agentBaseData) {
|
|
337
|
+
getRemoteConfigFromServer(agentBaseData, rawArgs) {
|
|
280
338
|
return __awaiter(this, void 0, void 0, function* () {
|
|
281
339
|
try {
|
|
282
|
-
const remoteConfig = yield this.backendProxy.getRemoteConfigPromise(
|
|
283
|
-
|
|
340
|
+
const remoteConfig = yield this.backendProxy.getRemoteConfigPromise({
|
|
341
|
+
appName: agentBaseData.appName,
|
|
342
|
+
branchName: agentBaseData.branchName,
|
|
343
|
+
buildName: agentBaseData.buildName,
|
|
344
|
+
testStage: rawArgs.teststage,
|
|
345
|
+
labId: agentBaseData.labid,
|
|
346
|
+
});
|
|
347
|
+
this.agentRemoteConfig = (remoteConfig || {});
|
|
348
|
+
this.reportRemoteConfigReceivedFromServer();
|
|
284
349
|
}
|
|
285
350
|
catch (e) {
|
|
286
351
|
this.logger.warn(`Failed to receive remote config, error: '${e}'. Using init config from cmd args and env vars`);
|
|
@@ -288,59 +353,7 @@ class BaseExecutor {
|
|
|
288
353
|
}
|
|
289
354
|
});
|
|
290
355
|
}
|
|
291
|
-
|
|
292
|
-
if (Object.keys(this.agentRemoteConfig).length > 0) {
|
|
293
|
-
const agentConfig = new config_loader_1.ConfigLoader().loadAgentConfiguration(cmdArgs);
|
|
294
|
-
const eventData = {
|
|
295
|
-
agentConfig: Object.assign(Object.assign({}, agentConfig.toJsonObject()), this.agentRemoteConfig),
|
|
296
|
-
};
|
|
297
|
-
cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_contracts_1.AgentEventCode.AGENT_CONFIG_CHANGED, eventData);
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
/**
|
|
301
|
-
* Generic method to apply remote config with tracking and reporting.
|
|
302
|
-
* Child classes should override the abstract methods to customize behavior.
|
|
303
|
-
*/
|
|
304
|
-
setConfigFromRemoteWithTracking(mappedArgs) {
|
|
305
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
306
|
-
const localValues = this.extractTrackedFields(mappedArgs);
|
|
307
|
-
yield this.applyRemoteConfig(mappedArgs);
|
|
308
|
-
this.reportRemoteConfigChanges(localValues, mappedArgs, this.getFieldsToCompare());
|
|
309
|
-
});
|
|
310
|
-
}
|
|
311
|
-
/**
|
|
312
|
-
* Helper method to extract tracked fields from mappedArgs.
|
|
313
|
-
* Uses getFieldsToCompare() to determine which fields to extract.
|
|
314
|
-
*/
|
|
315
|
-
extractTrackedFields(mappedArgs) {
|
|
316
|
-
const result = {};
|
|
317
|
-
this.getFieldsToCompare().forEach((field) => {
|
|
318
|
-
result[field] = mappedArgs[field];
|
|
319
|
-
});
|
|
320
|
-
return result;
|
|
321
|
-
}
|
|
322
|
-
/**
|
|
323
|
-
* Child classes can override this to apply remote configuration to mappedArgs.
|
|
324
|
-
* Default implementation does nothing.
|
|
325
|
-
*/
|
|
326
|
-
applyRemoteConfig(mappedArgs) {
|
|
327
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
328
|
-
// Default: no remote config application
|
|
329
|
-
});
|
|
330
|
-
}
|
|
331
|
-
/**
|
|
332
|
-
* Child classes can override this to define which fields to compare for change tracking.
|
|
333
|
-
* Default implementation returns empty array (no tracking).
|
|
334
|
-
*/
|
|
335
|
-
getFieldsToCompare() {
|
|
336
|
-
return [];
|
|
337
|
-
}
|
|
338
|
-
/**
|
|
339
|
-
* Helper method to track and report remote configuration changes.
|
|
340
|
-
* Child classes should call this after applying remote config.
|
|
341
|
-
*/
|
|
342
|
-
reportRemoteConfigChanges(localValues, remoteValues, fieldsToCompare) {
|
|
343
|
-
const changes = [];
|
|
356
|
+
reportRemoteConfigReceivedFromServer() {
|
|
344
357
|
const remoteConfigReceived = [];
|
|
345
358
|
// Log all remote config values received from server
|
|
346
359
|
if (Object.keys(this.agentRemoteConfig).length > 0) {
|
|
@@ -350,27 +363,14 @@ class BaseExecutor {
|
|
|
350
363
|
});
|
|
351
364
|
this.logger.info(remoteConfigReceived.join('\n'));
|
|
352
365
|
}
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
const
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
const logMessage = `Remote config override: ${String(field)} changed from ${localValueStr} to ${remoteValueStr}`;
|
|
362
|
-
const compactMessage = `${String(field)}: ${localValueStr} → ${remoteValueStr}`;
|
|
363
|
-
changes.push(compactMessage);
|
|
364
|
-
this.logger.info(logMessage);
|
|
365
|
-
}
|
|
366
|
-
});
|
|
367
|
-
// Send summary to Cockpit
|
|
368
|
-
if (changes.length > 0) {
|
|
369
|
-
const summaryMessage = `Remote config applied ${changes.length} override(s): ${changes.join(', ')}`;
|
|
370
|
-
cockpit_notifier_1.CockpitNotifier.sendGenericMessage(summaryMessage);
|
|
371
|
-
}
|
|
372
|
-
else if (Object.keys(this.agentRemoteConfig).length > 0) {
|
|
373
|
-
cockpit_notifier_1.CockpitNotifier.sendGenericMessage('Remote configuration received but no values were overridden');
|
|
366
|
+
}
|
|
367
|
+
notifyConfigurationChanged(config) {
|
|
368
|
+
if (Object.keys(this.agentRemoteConfig).length > 0) {
|
|
369
|
+
const agentConfig = new config_loader_1.ConfigLoader().loadAgentConfiguration(config);
|
|
370
|
+
const eventData = {
|
|
371
|
+
agentConfig: Object.assign(Object.assign({}, agentConfig.toJsonObject()), this.agentRemoteConfig),
|
|
372
|
+
};
|
|
373
|
+
cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_contracts_1.AgentEventCode.AGENT_CONFIG_CHANGED, eventData);
|
|
374
374
|
}
|
|
375
375
|
}
|
|
376
376
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAuD;AACvD,8EAAyE;AACzE,8FAAwF;AACxF,2DAKqC;AACrC,gEAAkE;AAClE,iFAA6E;AAE7E,6FAAkF;AAElF,gDAAoD;AACpD,6EAAyE;AACzE,oDAAgD;AAChD,wEAAmE;AACnE,0DAA0E;AAC1E,+DAA2D;AAC3D,4CAAyC;AACzC,oEAA+D;AAC/D,2GAA0F;AAE1F,mEAA+D;AAC/D,2BAAmC;AACnC,kFAA6E;AAC7E,kFAAwE;AAOxE,+DAA2E;AAC3E,yDAA8E;AAC9E,iEAAoE;AAEpE;;;;GAIG;AACH,MAAsB,YAAY;IAAlC;QAMY,WAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;QAEpD,sBAAiB,GAA4B,EAAE,CAAC;QAChD,QAAG,GAAG,+CAAqB,CAAC,WAAW,EAAE,CAAC;IAmbtD,CAAC;IA5aC;;;;;;;;;OASG;IACK,gBAAgB,CAAC,OAAmB;;QAC1C,MAAM,CAAC,qBAAiC,OAAO,CAAE,CAAC;QAClD,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACvD,MAAM,GAAG,GAAG,MAAA,MAAM,CAAC,OAAO,0CAAE,GAAG,CAAC;YAChC,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC;gBAAE,SAAS;YAEnD,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,EAAE,CAC/B,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK;iBACpB,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;iBACnC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEnB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;YACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,CAC5D,CAAC;YACF,IAAI,QAAQ,KAAK,SAAS;gBAAE,SAAS;YAErC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;aAClB;YACD,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;SAC1B;QACD,OAAO,CAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACO,iBAAiB;QACzB,OAAO;YACL,qBAAqB,EAAE,uBAAS,CAAC,qBAAqB,EAAE;SACzD,CAAC;IACJ,CAAC;IAEY,OAAO,CAClB,QAAoB,EACpB,SAAoB,EACpB,QAAQ,GAAG,KAAK;;YAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAEhD,IAAI,OAAO,CAAC,oBAAoB,IAAI,uBAAS,CAAC,sBAAsB,EAAE,EAAE;gBACtE,MAAM,SAAS,GAAe,IAAI,qCAAgB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACpE,MAAM,SAAS,GAAc,IAAI,qBAAS,EAAE,CAAC;gBAC7C,MAAM,SAAS,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBACpD,OAAO;aACR;YAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAEpC,IAAI,CAAC,SAAS,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACjC,MAAM,iBAAiB,GACrB,8CAAwB,CAAC,4BAA4B,EAAE,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,IAAI;gBACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAe,CAAC,aAAa,EAAE;oBAC5C,OAAO,EAAE,iBAAiB,CAAC,YAAY;oBACvC,OAAO,EAAE,IAAI,CAAC,WAAW;oBACzB,OAAO,EAAE,iBAAiB,CAAC,OAAO;oBAClC,UAAU,EAAE,SAAS;oBACrB,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACnC,CAAC,CAAC;gBAEH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAe,CAAC,qBAAqB,EAAE;oBACpD,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;iBACzC,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBACpC,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC9D,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,iBAE1B,CAAC;gBACF,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAE;oBACtB,MAAM,+CAAqB,CAAC,8BAA8B,CACxD,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,eAAe,EAC1B,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,EACd,iBAAiB,CAClB,CAAC,iBAAiB,EAAE,CAAC;iBACvB;gBACD,MAAM,cAAc,GAAG,IAAI,gCAAc,EAAE,CAAC;gBAC5C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CACzC,IAAI,CAAC,MAAM,EACX;oBACE,aAAa,EAAE,OAAO;oBACtB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACrC,EACD,IAAI,CAAC,iBAAiB,EAAE,CACzB,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;gBACzD,0BAAW,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAiC,CAAC,CAAC;gBACvE,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBACnC,IAAI,MAAM,EAAE;oBACV,MAAM,wBAAwB,GAC5B,cAAc,CAAC,sCAAsC,EAAE,CAAC;oBAC1D,IAAI,wBAAwB,EAAE;wBAC5B,kCAAe,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,CAAC;qBAC9D;oBACD,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;oBACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;oBAC/D,MAAM,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;oBACjE,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;iBAClC;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,KAAK,CAAC;gBACf,IAAI,CAAC,YAAY,yCAAsB,EAAE;oBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;iBACrC;aACF;oBAAS;gBACR,IAAI,CAAC,QAAQ,EAAE;oBACb,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,SAAoB,CAAC,CAAC;iBACxD;aACF;QACH,CAAC;KAAA;IAES,qBAAqB;QAC7B,IAAI,CAAC,uBAAS,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE;YACpC,OAAO;SACR;QAED,MAAM,+BAA+B,GAAG,GAAG,EAAE;YAC3C,OAAO,CACL,OAAO,CAAC,GAAG,EAAE;gBACb,gBAAgB,IAAA,2BAAa,GAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAC5F,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,IAAI;gBACF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;gBAC5B,IAAA,kBAAa,EACX,+BAA+B,EAAE,EACjC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CACjC,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wEAAwE,CAAC,EAAE,CAC5E,CAAC;aACH;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,MAAM;aACR,IAAI,CAAC;qGACyF,CAAC,CAAC;QAEnG,eAAe,EAAE,CAAC;QAClB,WAAW,CAAC,GAAG,EAAE;YACf,eAAe,EAAE,CAAC;QACpB,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAChB,CAAC;IAES,4BAA4B;QACpC,IAAI,uBAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM;iBACR,IAAI,CAAC;wGAC0F,CAAC,CAAC;YACpG,yEAAyE;YACzE,qCAAO,uCAAuC,GAAE;SACjD;IACH,CAAC;IAEY,eAAe,CAAC,OAAmB;;;YAC9C,MAAM,SAAS,GAAe,IAAI,qCAAgB,EAAE,CAAC,KAAK,CACxD,OAIC,CACF,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACtB,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAC;aACH;YAED,MAAM,UAAU,iDACX,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,GACnC,SAAS,KACZ,KAAK,EAAE,MAAC,OAAO,CAAC,KAAgB,mCAAI,EAAE,GACvC,CAAC;YAEF,IAAI,CAAC,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAC3D,8CAAwB,CAAC,4BAA4B,EAAE,EACvD,UAAU,EACV,IAAI,CAAC,MAAM,CACZ,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;aACH;YACD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;gBAC/B,cAAc,EAAE,gBAAgB,CAAC,cAAc;gBAC/C,KAAK,EAAE,OAAO,CAAC,KAAe;gBAC9B,OAAO,EAAE,gBAAgB,CAAC,OAAO;gBACjC,UAAU,EAAE,gBAAgB,CAAC,UAAU;gBACvC,SAAS,EAAE,gBAAgB,CAAC,SAAS;aACtC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,iDACT,SAAS,GACT,gBAAgB,KACnB,KAAK,EAAE,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,EAAE,CAAW,EACtC,KAAK,EAAE,OAAO,CAAC,KAAe,GAC/B,CAAC;;KACH;IAED;;;;OAIG;IACO,qBAAqB,CAC7B,QAAoB;QAEpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,WAAW,CAAC,MAAe,EAAE,SAAkB;QACpD,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAe,CAAC,iBAAiB,EAAE;gBAChD,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CACX,4FAA4F,CAC7F,CAAC;SACH;QAED,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC;QACxC,IAAI,UAAU,EAAE;YACd,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,MAAsB;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,KAAgB;QAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEe,mBAAmB,CACjC,UAAsB;;YAEtB,MAAM,uBAAuB,GAAG,IAAI,oDAAuB,CACzD,IAAI,CAAC,YAAY,CAClB,CAAC;YACF,OAAO,MAAM,uBAAuB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACzD,CAAC;KAAA;IAEe,6BAA6B;;YAC3C,IAAI;gBACF,MAAM,EAAE,WAAW,EAAE,GACnB,MAAM,IAAI,CAAC,YAAY,CAAC,6BAA6B,CACnD,IAAI,CAAC,SAAS,CAAC,cAAc,CAC9B,CAAC;gBACJ,OAAO,WAAW,CAAC;aACpB;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,QAAQ,GAAG,yGAAyG,CAAC,GAAG,CAAC;gBAC/H,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC5B,kCAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpC,OAAO,sCAA0B,CAAC,OAAO,CAAC;aAC3C;QACH,CAAC;KAAA;IAES,UAAU;QAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAe,CAAC,qBAAqB,EAAE;YACpD,OAAO,EAAE,IAAI,CAAC,WAAW;YACzB,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACnC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,GAAI;QACrB,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC;QAClE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI;YACF,kCAAe,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,GAAG,CAAC,CAAC;SACxE;IACH,CAAC;IAEe,kBAAkB,CAChC,iBAAoC,EACpC,MAAsB;;YAEtB,iBAAiB,CAAC,wBAAwB;gBACxC,MAAM,kBAAO,CAAC,eAAe,EAAE,CAAC;YAClC,yGAAyG;YACzG,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACzD,IAAI;gBACF,MAAM,kCAAe,CAAC,WAAW,CAC/B,WAAW,EACX,iBAAiB,EACjB,IAAI,CAAC,MAAM,EACX,6BAAe,EACf,IAAI,CAAC,YAAY,CAClB,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,GAAG,CAAC,CAAC;aACxE;QACH,CAAC;KAAA;IAES,iBAAiB,CACzB,MAAsB,EACtB,YAAqB,KAAK;QAE1B,0HAA0H;QAC1H,MAAM,GAAG,iDACJ,IAAI,CAAC,QAAQ,KAChB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAC9B,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,KACvB,MAAM,CACV,CAAC;QACF,IAAI,MAAM,CAAC,wBAAY,CAAC,uBAAuB,CAAC,EAAE;YAChD,GAAG,CAAC,wBAAY,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,wBAAY,CAAC,qBAAqB,CAAC,CAAC;SACzE;QACD,MAAM,WAAW,GAAG,IAAI,4BAAY,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACnE,IAAI,SAAS,EAAE;YACb,WAAW,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;SACrC;QAED,qDAAqD;QACrD,mFAAmF;QACnF,IAAI,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE;YAC5C,4BAAY,CAAC,6BAA6B;gBACxC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC;SACzC;QACD,IAAI,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE;YACxC,4BAAY,CAAC,yBAAyB;gBACpC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC;SACrC;QACD,IAAI,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE;YACpC,wBAAU,CAAC,oBAAoB,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC;SACjE;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEe,mBAAmB;;YACjC,IAAI;gBACF,MAAM,kCAAe,CAAC,cAAc,EAAE,CAAC;aACxC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,GAAG,CAAC,CAAC;aAC3E;QACH,CAAC;KAAA;IAEa,yBAAyB,CACrC,aAAwB,EACxB,OAAmB;;YAEnB,IAAI;gBACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC;oBAClE,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,UAAU,EAAE,aAAa,CAAC,UAAU;oBACpC,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,SAAS,EAAG,OAAmC,CAAC,SAAS;oBACzD,KAAK,EAAE,aAAa,CAAC,KAAK;iBAC3B,CAAC,CAAC;gBACH,IAAI,CAAC,iBAAiB,GAAG,CAAC,YAAY,IAAI,EAAE,CAA4B,CAAC;gBACzE,IAAI,CAAC,oCAAoC,EAAE,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,4CAA4C,CAAC,iDAAiD,CAC/F,CAAC;gBACF,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;aAC7B;QACH,CAAC;KAAA;IAEO,oCAAoC;QAC1C,MAAM,oBAAoB,GAAa,EAAE,CAAC;QAE1C,oDAAoD;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,oBAAoB,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClD,oBAAoB,CAAC,IAAI,CACvB,KAAK,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAC3D,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACnD;IACH,CAAC;IAES,0BAA0B,CAAC,MAAsB;QACzD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,MAAM,WAAW,GAAG,IAAI,4BAAY,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YACtE,MAAM,SAAS,GAAG;gBAChB,WAAW,kCACN,WAAW,CAAC,YAAY,EAAE,GAC1B,IAAI,CAAC,iBAAiB,CAC1B;aACF,CAAC;YACF,kCAAe,CAAC,SAAS,CAAC,uCAAc,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;SAC3E;IACH,CAAC;CACF;AA5bD,oCA4bC"}
|
|
@@ -14,23 +14,36 @@ const base_executor_1 = require("./base-executor");
|
|
|
14
14
|
const contracts_1 = require("../contracts");
|
|
15
15
|
const agent_instance_data_1 = require("../agent-instance-data");
|
|
16
16
|
const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
|
|
17
|
-
const utils_1 = require("../utils");
|
|
18
17
|
const system_date_1 = require("../../common/system-date");
|
|
19
18
|
const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
|
|
19
|
+
const scanned_command_keys_1 = require("../config/keys/scanned-command-keys");
|
|
20
|
+
const config_store_1 = require("../config/config-store");
|
|
21
|
+
const agent_config_bridge_1 = require("../config/migration/agent-config-bridge");
|
|
20
22
|
class BuildEndExecutor extends base_executor_1.BaseExecutor {
|
|
21
23
|
constructor() {
|
|
22
24
|
super(...arguments);
|
|
23
25
|
this.commandName = 'buildEnd';
|
|
26
|
+
this.schema = scanned_command_keys_1.scannedCommandKeys;
|
|
27
|
+
this.configKey = config_store_1.ConfigKey.Scanned;
|
|
24
28
|
}
|
|
25
|
-
innerExecute(
|
|
29
|
+
innerExecute(config) {
|
|
26
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
31
|
const agentInstanceData = agent_instance_data_1.AgentInstanceDataFactory.getOrCreateAgentInstanceData();
|
|
28
32
|
const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agentInstanceData, this.baseData, this.logger);
|
|
29
33
|
// labId should not be passed to notifyStart as it tricks the backend into thinking there is a live agent
|
|
30
|
-
const agentConfig = (0,
|
|
34
|
+
const agentConfig = (0, agent_config_bridge_1.executorConfigToAgentConfig)(Object.assign({}, this.baseData), true);
|
|
35
|
+
// todo it's called in base executor, why do we call it again
|
|
31
36
|
yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger, system_date_1.getSystemOffset, backendProxy, {});
|
|
32
37
|
try {
|
|
33
|
-
|
|
38
|
+
const data = {
|
|
39
|
+
appName: this.baseData.appName,
|
|
40
|
+
branch: this.baseData.branchName,
|
|
41
|
+
build: this.baseData.buildName,
|
|
42
|
+
status: {
|
|
43
|
+
success: config.ok || !config.failed,
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
yield backendProxy.buildEnd(data);
|
|
34
47
|
return true;
|
|
35
48
|
}
|
|
36
49
|
finally {
|
|
@@ -38,34 +51,19 @@ class BuildEndExecutor extends base_executor_1.BaseExecutor {
|
|
|
38
51
|
}
|
|
39
52
|
});
|
|
40
53
|
}
|
|
41
|
-
mapArgs(args) {
|
|
42
|
-
return {
|
|
43
|
-
appName: this.baseData.appName,
|
|
44
|
-
branch: this.baseData.branchName,
|
|
45
|
-
build: this.baseData.buildName,
|
|
46
|
-
status: {
|
|
47
|
-
success: args.ok || !args.failed,
|
|
48
|
-
},
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
54
|
setAliasCommand(alias) {
|
|
52
55
|
this.commandName = alias;
|
|
53
|
-
|
|
54
|
-
}
|
|
55
|
-
handleLegacyCommand(args) {
|
|
56
|
-
var _a;
|
|
57
|
-
const mainCommand = (_a = args === null || args === void 0 ? void 0 : args.args) === null || _a === void 0 ? void 0 : _a[0];
|
|
58
|
-
if (mainCommand === contracts_1.COMMANDS.BUILD_END) {
|
|
56
|
+
if (this.commandName === contracts_1.COMMANDS.BUILD_END) {
|
|
59
57
|
this.logger.lifecycle(`'buildend' command is deprecated and should be replaced by the 'scanned' command `);
|
|
60
58
|
}
|
|
59
|
+
return this;
|
|
61
60
|
}
|
|
62
|
-
validateArgs(
|
|
63
|
-
|
|
64
|
-
if (!args.ok && !args.failed) {
|
|
61
|
+
validateArgs(config) {
|
|
62
|
+
if (!config.ok && !config.failed) {
|
|
65
63
|
this.logger.lifecycle("'--ok' or '--failed' must be provided");
|
|
66
64
|
return false;
|
|
67
65
|
}
|
|
68
|
-
if (
|
|
66
|
+
if (config.ok && config.failed) {
|
|
69
67
|
this.logger.lifecycle("'--ok' or '--failed' need to be be provided not both");
|
|
70
68
|
return false;
|
|
71
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,4CAAwC;AACxC,gEAAkE;AAClE,iFAA6E;AAE7E,0DAA2D;AAC3D,2GAA0F;AAE1F,8EAAyE;AACzE,yDAAmD;AACnD,iFAAsF;AAEtF,MAAa,gBAAiB,SAAQ,4BAAuC;IAA7E;;QACY,gBAAW,GAAG,UAAU,CAAC;QACzB,WAAM,GAAG,yCAAkB,CAAC;QAC5B,cAAS,GAAG,wBAAS,CAAC,OAAO,CAAC;IA6D1C,CAAC;IA3Dc,YAAY,CAAC,MAA4B;;YACpD,MAAM,iBAAiB,GACrB,8CAAwB,CAAC,4BAA4B,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAC5D,iBAAiB,EACjB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,MAAM,CACZ,CAAC;YACF,yGAAyG;YACzG,MAAM,WAAW,GAAG,IAAA,iDAA2B,oBAAM,IAAI,CAAC,QAAQ,GAAI,IAAI,CAAC,CAAC;YAC5E,6DAA6D;YAC7D,MAAM,kCAAe,CAAC,WAAW,CAC/B,WAAW,EACX,iBAAiB,EACjB,IAAI,CAAC,MAAM,EACX,6BAAe,EACf,YAAY,EACZ,EAAE,CACH,CAAC;YACF,IAAI;gBACF,MAAM,IAAI,GAAkB;oBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;oBAC9B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;oBAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;oBAC9B,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;qBACrC;iBACF,CAAC;gBACF,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClC,OAAO,IAAI,CAAC;aACb;oBAAS;gBACR,MAAM,kCAAe,CAAC,cAAc,EAAE,CAAC;aACxC;QACH,CAAC;KAAA;IAEM,eAAe,CAAC,KAAe;QACpC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,IAAI,CAAC,WAAW,KAAK,oBAAQ,CAAC,SAAS,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,mFAAmF,CACpF,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAA4B;QACvC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;SACd;QAED,IAAI,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,MAAM,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CACnB,sDAAsD,CACvD,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAhED,4CAgEC"}
|