@datadog/datadog-ci 2.37.0 → 2.38.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/dist/commands/elf-symbols/renderer.d.ts +3 -2
- package/dist/commands/elf-symbols/renderer.js +6 -3
- package/dist/commands/elf-symbols/renderer.js.map +1 -1
- package/dist/commands/elf-symbols/upload.d.ts +1 -1
- package/dist/commands/elf-symbols/upload.js +48 -31
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/measure/measure.d.ts +1 -0
- package/dist/commands/measure/measure.js +5 -2
- package/dist/commands/measure/measure.js.map +1 -1
- package/dist/commands/sbom/payload.js +2 -2
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/types.d.ts +1 -1
- package/dist/commands/stepfunctions/helpers.d.ts +9 -2
- package/dist/commands/stepfunctions/helpers.js +65 -15
- package/dist/commands/stepfunctions/helpers.js.map +1 -1
- package/dist/commands/stepfunctions/instrument.d.ts +1 -0
- package/dist/commands/stepfunctions/instrument.js +3 -2
- package/dist/commands/stepfunctions/instrument.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +1 -0
- package/dist/commands/synthetics/compatibility.js +15 -1
- package/dist/commands/synthetics/compatibility.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +5 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +9 -4
- package/dist/commands/synthetics/mobile.js +12 -9
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +1 -0
- package/dist/commands/synthetics/run-tests-command.js +77 -7
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +5 -5
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +16 -1
- package/dist/commands/synthetics/utils/internal.js +176 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { UploadStatus } from '../../helpers/upload';
|
|
2
|
+
import { MappingMetadata } from './interfaces';
|
|
2
3
|
export interface UploadInfo {
|
|
3
4
|
fileType: string;
|
|
4
5
|
location: string;
|
|
5
6
|
platform: string;
|
|
6
7
|
}
|
|
7
|
-
export declare const renderCommandInfo: (dryRun: boolean,
|
|
8
|
+
export declare const renderCommandInfo: (dryRun: boolean, symbolsLocations: string[]) => string;
|
|
8
9
|
export declare const renderCommandSummary: (statuses: UploadStatus[], duration: number, dryRun: boolean) => string;
|
|
9
10
|
export declare const renderMissingBuildId: (path: string) => string;
|
|
10
11
|
export declare const renderGitWarning: (errorMessage: string) => string;
|
|
@@ -15,4 +16,4 @@ export declare const renderMissingBinUtils: () => string;
|
|
|
15
16
|
export declare const renderGeneralizedError: (error: any) => string;
|
|
16
17
|
export declare const renderFailedUpload: (filePath: string, errorMessage: string) => string;
|
|
17
18
|
export declare const renderRetriedUpload: (filePath: string, errorMessage: string, attempt: number) => string;
|
|
18
|
-
export declare const renderUpload: (filePath: string,
|
|
19
|
+
export declare const renderUpload: (filePath: string, metadata: MappingMetadata) => string;
|
|
@@ -8,14 +8,14 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
8
8
|
const formatting_1 = require("../../helpers/formatting");
|
|
9
9
|
const upload_1 = require("../../helpers/upload");
|
|
10
10
|
const utils_1 = require("../../helpers/utils");
|
|
11
|
-
const renderCommandInfo = (dryRun,
|
|
11
|
+
const renderCommandInfo = (dryRun, symbolsLocations) => {
|
|
12
12
|
let fullString = '';
|
|
13
13
|
if (dryRun) {
|
|
14
14
|
fullString += chalk_1.default.yellow(`${formatting_1.ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD SYMBOLS\n`);
|
|
15
15
|
}
|
|
16
16
|
const startStr = chalk_1.default.green('Starting upload. \n');
|
|
17
17
|
fullString += startStr;
|
|
18
|
-
fullString += chalk_1.default.green(`Uploading symbols from location ${
|
|
18
|
+
fullString += chalk_1.default.green(`Uploading symbols from location(s): ${symbolsLocations.join(' ')}\n`);
|
|
19
19
|
fullString += chalk_1.default.green(`After upload is successful symbol files will be processed and ready to use within the next 5 minutes.\n`);
|
|
20
20
|
return fullString;
|
|
21
21
|
};
|
|
@@ -79,6 +79,9 @@ const renderRetriedUpload = (filePath, errorMessage, attempt) => {
|
|
|
79
79
|
return chalk_1.default.yellow(`[attempt ${attempt}] Retrying upload ${sourcemapPathBold}: ${errorMessage}\n`);
|
|
80
80
|
};
|
|
81
81
|
exports.renderRetriedUpload = renderRetriedUpload;
|
|
82
|
-
const renderUpload = (filePath,
|
|
82
|
+
const renderUpload = (filePath, metadata) => `Uploading debug info for ELF file ${filePath} (arch:${metadata.arch || 'none'} \
|
|
83
|
+
GNUBuildID:${metadata.gnu_build_id || 'none'} \
|
|
84
|
+
GoBuildID:${metadata.go_build_id || 'none'} \
|
|
85
|
+
FileHash:${metadata.file_hash || 'none'})\n`;
|
|
83
86
|
exports.renderUpload = renderUpload;
|
|
84
87
|
//# sourceMappingURL=renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,yDAA8C;AAC9C,iDAAiD;AACjD,+CAA6C;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
61
61
|
this.configPath = clipanion_1.Option.String('--config');
|
|
62
62
|
this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
|
|
63
63
|
this.repositoryUrl = clipanion_1.Option.String('--repository-url');
|
|
64
|
-
this.
|
|
64
|
+
this.symbolsLocations = clipanion_1.Option.Rest({ required: 1 });
|
|
65
65
|
this.cliVersion = version_1.version;
|
|
66
66
|
this.config = {
|
|
67
67
|
datadogSite: 'datadoghq.com',
|
|
@@ -73,7 +73,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
73
73
|
return 1;
|
|
74
74
|
}
|
|
75
75
|
const initialTime = Date.now();
|
|
76
|
-
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.
|
|
76
|
+
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.symbolsLocations));
|
|
77
77
|
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
78
78
|
apiKey: process.env.DATADOG_API_KEY,
|
|
79
79
|
datadogSite: process.env.DATADOG_SITE,
|
|
@@ -161,47 +161,62 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
161
161
|
}
|
|
162
162
|
getElfSymbolFiles(symbolsLocation) {
|
|
163
163
|
return __awaiter(this, void 0, void 0, function* () {
|
|
164
|
-
let
|
|
164
|
+
let paths = [];
|
|
165
165
|
let reportFailure;
|
|
166
|
-
|
|
167
|
-
|
|
166
|
+
const stat = yield fs_1.default.promises.stat(symbolsLocation);
|
|
167
|
+
if (stat.isDirectory()) {
|
|
168
|
+
// strict: false is needed to avoid throwing an error if a directory is not readable
|
|
169
|
+
paths = glob_1.default.sync((0, utils_1.buildPath)(symbolsLocation, '**'), { dot: true, strict: false, silent: true });
|
|
168
170
|
reportFailure = (message) => this.context.stdout.write((0, renderer_1.renderWarning)(message));
|
|
171
|
+
// throw an error if top-level directory is not readable
|
|
172
|
+
// eslint-disable-next-line no-bitwise
|
|
173
|
+
yield fs_1.default.promises.access(symbolsLocation, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
|
|
174
|
+
throw Error(`Directory ${symbolsLocation} is not readable`);
|
|
175
|
+
});
|
|
169
176
|
}
|
|
170
177
|
else {
|
|
171
|
-
|
|
178
|
+
paths = [symbolsLocation];
|
|
172
179
|
// in single file mode, we want to report failures as errors
|
|
173
180
|
reportFailure = (message) => {
|
|
174
181
|
throw Error(message);
|
|
175
182
|
};
|
|
176
183
|
}
|
|
177
184
|
const filesMetadata = [];
|
|
178
|
-
for (const
|
|
179
|
-
|
|
180
|
-
if (
|
|
181
|
-
|
|
185
|
+
for (const path of paths) {
|
|
186
|
+
const pathStat = yield fs_1.default.promises.lstat(path);
|
|
187
|
+
if (pathStat.isDirectory()) {
|
|
188
|
+
// check if directory is readable and if not emit a warning
|
|
189
|
+
// eslint-disable-next-line no-bitwise
|
|
190
|
+
yield fs_1.default.promises.access(path, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
|
|
191
|
+
reportFailure(`Skipped directory ${path} because it is not readable`);
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
else if (pathStat.isFile()) {
|
|
195
|
+
// check that path is a file and is an ELF file
|
|
196
|
+
const metadata = yield (0, elf_1.getElfFileMetadata)(path);
|
|
182
197
|
// handle all possible failures
|
|
183
198
|
if (!metadata.isElf) {
|
|
184
|
-
reportFailure(`Input location ${
|
|
199
|
+
reportFailure(`Input location ${path} is not an ELF file`);
|
|
185
200
|
continue;
|
|
186
201
|
}
|
|
187
202
|
if (metadata.error) {
|
|
188
|
-
reportFailure(`Error reading ELF file ${
|
|
203
|
+
reportFailure(`Error reading ELF file ${path}: ${metadata.error.message}`);
|
|
189
204
|
continue;
|
|
190
205
|
}
|
|
191
206
|
if (!(0, elf_1.isSupportedElfType)(metadata.type)) {
|
|
192
|
-
reportFailure(`Skipped ${
|
|
207
|
+
reportFailure(`Skipped ${path} because its not an executable, nor a shared library`);
|
|
193
208
|
continue;
|
|
194
209
|
}
|
|
195
210
|
if (!(0, elf_1.isSupportedArch)(metadata.arch)) {
|
|
196
|
-
reportFailure(`Skipped ${
|
|
211
|
+
reportFailure(`Skipped ${path} because it has an unsupported architecture (${metadata.arch})`);
|
|
197
212
|
continue;
|
|
198
213
|
}
|
|
199
214
|
if (!(metadata.gnuBuildId || metadata.goBuildId || metadata.fileHash)) {
|
|
200
|
-
reportFailure(`Skipped ${
|
|
215
|
+
reportFailure(`Skipped ${path} because it has no build id`);
|
|
201
216
|
continue;
|
|
202
217
|
}
|
|
203
218
|
if (!metadata.hasDebugInfo && !metadata.hasSymbols) {
|
|
204
|
-
reportFailure(`Skipped ${
|
|
219
|
+
reportFailure(`Skipped ${path} because it has no debug info, nor symbols`);
|
|
205
220
|
continue;
|
|
206
221
|
}
|
|
207
222
|
filesMetadata.push(metadata);
|
|
@@ -238,18 +253,18 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
238
253
|
return __awaiter(this, void 0, void 0, function* () {
|
|
239
254
|
const metricsLogger = this.getMetricsLogger();
|
|
240
255
|
const apiKeyValidator = this.getApiKeyValidator(metricsLogger);
|
|
241
|
-
let elfFilesMetadata = yield this.
|
|
256
|
+
let elfFilesMetadata = (yield Promise.all(this.symbolsLocations.map((location) => this.getElfSymbolFiles(location)))).flat();
|
|
242
257
|
elfFilesMetadata = this.removeBuildIdDuplicates(elfFilesMetadata);
|
|
243
258
|
const requestBuilder = (0, helpers_1.getElfRequestBuilder)(this.config.apiKey, this.cliVersion, this.config.datadogSite);
|
|
244
259
|
const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
|
|
245
260
|
try {
|
|
246
261
|
const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, elfFilesMetadata, (fileMetadata) => __awaiter(this, void 0, void 0, function* () {
|
|
247
262
|
const metadata = this.getMappingMetadata(fileMetadata.gnuBuildId, fileMetadata.goBuildId, fileMetadata.fileHash, fileMetadata.arch);
|
|
248
|
-
const outputFilename = (0, elf_1.getOutputFilenameFromBuildId)(
|
|
263
|
+
const outputFilename = (0, elf_1.getOutputFilenameFromBuildId)((0, elf_1.getBuildId)(fileMetadata));
|
|
249
264
|
const outputFilePath = (0, utils_1.buildPath)(tmpDirectory, outputFilename);
|
|
250
265
|
yield (0, elf_1.copyElfDebugInfo)(fileMetadata.filename, outputFilePath, fileMetadata, false);
|
|
251
266
|
if (this.dryRun) {
|
|
252
|
-
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(fileMetadata.filename,
|
|
267
|
+
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(fileMetadata.filename, metadata)}`);
|
|
253
268
|
return upload_1.UploadStatus.Success;
|
|
254
269
|
}
|
|
255
270
|
const payload = {
|
|
@@ -286,7 +301,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
286
301
|
metricsLogger.logger.increment('retries', 1);
|
|
287
302
|
},
|
|
288
303
|
onUpload: () => {
|
|
289
|
-
this.context.stdout.write((0, renderer_1.renderUpload)(fileMetadata.filename,
|
|
304
|
+
this.context.stdout.write((0, renderer_1.renderUpload)(fileMetadata.filename, metadata));
|
|
290
305
|
},
|
|
291
306
|
retries: 5,
|
|
292
307
|
useGzip: true,
|
|
@@ -325,22 +340,24 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
325
340
|
verifyParameters() {
|
|
326
341
|
return __awaiter(this, void 0, void 0, function* () {
|
|
327
342
|
let parametersOkay = true;
|
|
328
|
-
if (!this.
|
|
329
|
-
this.context.stderr.write((0, renderer_1.renderArgumentMissingError)('symbols
|
|
343
|
+
if (!this.symbolsLocations || this.symbolsLocations.length === 0) {
|
|
344
|
+
this.context.stderr.write((0, renderer_1.renderArgumentMissingError)('symbols locations'));
|
|
330
345
|
parametersOkay = false;
|
|
331
346
|
}
|
|
332
347
|
else {
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
348
|
+
for (const symbolsLocation of this.symbolsLocations) {
|
|
349
|
+
if (fs_1.default.existsSync(symbolsLocation)) {
|
|
350
|
+
const stats = fs_1.default.statSync(symbolsLocation);
|
|
351
|
+
if (!stats.isDirectory() && !stats.isFile()) {
|
|
352
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
|
|
353
|
+
parametersOkay = false;
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
|
|
337
358
|
parametersOkay = false;
|
|
338
359
|
}
|
|
339
360
|
}
|
|
340
|
-
else {
|
|
341
|
-
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(this.symbolsLocation));
|
|
342
|
-
parametersOkay = false;
|
|
343
|
-
}
|
|
344
361
|
}
|
|
345
362
|
if (!(yield this.checkBinUtils())) {
|
|
346
363
|
this.context.stderr.write((0, renderer_1.renderMissingBinUtils)());
|
|
@@ -358,6 +375,6 @@ UploadCommand.usage = clipanion_1.Command.Usage({
|
|
|
358
375
|
details: `
|
|
359
376
|
This command will upload debug info from all Elf files found recursively in the given location in order to symbolicate profiles
|
|
360
377
|
`,
|
|
361
|
-
examples: [['Upload debug infos for all Elf files in the current directory', 'datadog-ci elf-symbols upload']],
|
|
378
|
+
examples: [['Upload debug infos for all Elf files in the current directory', 'datadog-ci elf-symbols upload .']],
|
|
362
379
|
});
|
|
363
380
|
//# sourceMappingURL=upload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,6 @@ class MeasureCommand extends clipanion_1.Command {
|
|
|
43
43
|
}
|
|
44
44
|
execute() {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
-
console.log(this.path);
|
|
47
46
|
if (this.path[0] === 'metric') {
|
|
48
47
|
this.context.stdout.write(chalk_1.default.yellow(`[WARN] The "metric" command is deprecated. Please use the "measure" command instead.\n`));
|
|
49
48
|
}
|
|
@@ -116,12 +115,16 @@ class MeasureCommand extends clipanion_1.Command {
|
|
|
116
115
|
});
|
|
117
116
|
}
|
|
118
117
|
catch (error) {
|
|
119
|
-
this.
|
|
118
|
+
this.handleError(error);
|
|
120
119
|
return 1;
|
|
121
120
|
}
|
|
122
121
|
return 0;
|
|
123
122
|
});
|
|
124
123
|
}
|
|
124
|
+
handleError(error) {
|
|
125
|
+
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Could not send measures: ` +
|
|
126
|
+
`${error.response ? JSON.stringify(error.response.data, undefined, 2) : ''}\n`);
|
|
127
|
+
}
|
|
125
128
|
}
|
|
126
129
|
exports.MeasureCommand = MeasureCommand;
|
|
127
130
|
MeasureCommand.paths = [['measure'], ['metric']];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,7 +102,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
102
102
|
if (jsonContent) {
|
|
103
103
|
if (jsonContent['components']) {
|
|
104
104
|
for (const component of jsonContent['components']) {
|
|
105
|
-
if (!component['type'] || !component['name']
|
|
105
|
+
if (!component['type'] || !component['name']) {
|
|
106
106
|
continue;
|
|
107
107
|
}
|
|
108
108
|
if (component['type'] !== 'library') {
|
|
@@ -139,7 +139,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
139
139
|
const dependency = {
|
|
140
140
|
name: component['name'],
|
|
141
141
|
group: component['group'] || undefined,
|
|
142
|
-
version: component['version'],
|
|
142
|
+
version: component['version'] || undefined,
|
|
143
143
|
language: lang,
|
|
144
144
|
licenses: [],
|
|
145
145
|
purl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,11 @@ export declare const parseArn: (arn: string) => {
|
|
|
14
14
|
resourceName: string;
|
|
15
15
|
};
|
|
16
16
|
export declare const buildLogAccessPolicyName: (stepFunction: DescribeStateMachineCommandOutput) => string;
|
|
17
|
-
export declare const
|
|
18
|
-
export declare const
|
|
17
|
+
export declare const injectContextIntoTasks: (describeStateMachineCommandOutput: DescribeStateMachineCommandOutput, stepFunctionsClient: SFNClient, context: BaseContext, dryRun: boolean) => Promise<void>;
|
|
18
|
+
export declare const addTraceContextToLambdaParameters: ({ Parameters }: StepType) => void;
|
|
19
|
+
export declare const addTraceContextToStepFunctionParameters: ({ Parameters }: StepType) => void;
|
|
19
20
|
export declare const shouldUpdateStepForTracesMerging: (step: StepType) => boolean;
|
|
21
|
+
export declare const shouldUpdateStepForStepFunctionContextInjection: (step: StepType) => boolean;
|
|
20
22
|
export type StateMachineDefinitionType = {
|
|
21
23
|
Comment?: string;
|
|
22
24
|
StartAt?: string;
|
|
@@ -33,5 +35,10 @@ export type StepType = {
|
|
|
33
35
|
export type ParametersType = {
|
|
34
36
|
'Payload.$'?: string;
|
|
35
37
|
FunctionName?: string;
|
|
38
|
+
StateMachineArn?: string;
|
|
36
39
|
TableName?: string;
|
|
40
|
+
Input?: {
|
|
41
|
+
'CONTEXT.$'?: string;
|
|
42
|
+
};
|
|
37
43
|
};
|
|
44
|
+
export declare const injectContextForStepFunctions: (step: StepType) => boolean;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.shouldUpdateStepForTracesMerging = exports.
|
|
12
|
+
exports.injectContextForStepFunctions = exports.shouldUpdateStepForStepFunctionContextInjection = exports.shouldUpdateStepForTracesMerging = exports.addTraceContextToStepFunctionParameters = exports.addTraceContextToLambdaParameters = exports.injectContextIntoTasks = exports.buildLogAccessPolicyName = exports.parseArn = exports.getStepFunctionLogGroupArn = exports.isValidArn = exports.buildSubscriptionFilterName = exports.buildLogGroupName = exports.buildArn = exports.displayChanges = void 0;
|
|
13
13
|
const deep_object_diff_1 = require("deep-object-diff");
|
|
14
14
|
const awsCommands_1 = require("./awsCommands");
|
|
15
15
|
const constants_1 = require("./constants");
|
|
@@ -60,8 +60,7 @@ const buildLogAccessPolicyName = (stepFunction) => {
|
|
|
60
60
|
return `LogsDeliveryAccessPolicy-${stepFunction.name}`;
|
|
61
61
|
};
|
|
62
62
|
exports.buildLogAccessPolicyName = buildLogAccessPolicyName;
|
|
63
|
-
const
|
|
64
|
-
var _a;
|
|
63
|
+
const injectContextIntoTasks = (describeStateMachineCommandOutput, stepFunctionsClient, context, dryRun) => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
64
|
if (typeof describeStateMachineCommandOutput.definition !== 'string') {
|
|
66
65
|
return;
|
|
67
66
|
}
|
|
@@ -70,28 +69,30 @@ const injectContextIntoLambdaPayload = (describeStateMachineCommandOutput, stepF
|
|
|
70
69
|
for (const stepName in definitionObj.States) {
|
|
71
70
|
if (definitionObj.States.hasOwnProperty(stepName)) {
|
|
72
71
|
const step = definitionObj.States[stepName];
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
definitionHasBeenUpdated = true;
|
|
76
|
-
}
|
|
77
|
-
else if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:lambda')) {
|
|
78
|
-
context.stdout.write(`[Warn] Step ${stepName} may be using the basic legacy integration, which does not support merging lambda trace(s) with Step Functions trace.
|
|
79
|
-
To merge lambda trace(s) with Step Functions trace, please consider using the latest integration.
|
|
80
|
-
More details can be found on https://docs.aws.amazon.com/step-functions/latest/dg/connect-lambda.html \n`);
|
|
81
|
-
}
|
|
72
|
+
definitionHasBeenUpdated = injectContextForLambdaFunctions(step, context, stepName);
|
|
73
|
+
definitionHasBeenUpdated = (0, exports.injectContextForStepFunctions)(step);
|
|
82
74
|
}
|
|
83
75
|
}
|
|
84
76
|
if (definitionHasBeenUpdated) {
|
|
85
77
|
yield (0, awsCommands_1.updateStateMachineDefinition)(stepFunctionsClient, describeStateMachineCommandOutput, definitionObj, context, dryRun);
|
|
86
78
|
}
|
|
87
79
|
});
|
|
88
|
-
exports.
|
|
89
|
-
const
|
|
80
|
+
exports.injectContextIntoTasks = injectContextIntoTasks;
|
|
81
|
+
const addTraceContextToLambdaParameters = ({ Parameters }) => {
|
|
90
82
|
if (Parameters) {
|
|
91
83
|
Parameters[`Payload.$`] = 'States.JsonMerge($$, $, false)';
|
|
92
84
|
}
|
|
93
85
|
};
|
|
94
|
-
exports.
|
|
86
|
+
exports.addTraceContextToLambdaParameters = addTraceContextToLambdaParameters;
|
|
87
|
+
const addTraceContextToStepFunctionParameters = ({ Parameters }) => {
|
|
88
|
+
if (Parameters) {
|
|
89
|
+
if (!Parameters.Input) {
|
|
90
|
+
Parameters.Input = {};
|
|
91
|
+
}
|
|
92
|
+
Parameters.Input['CONTEXT.$'] = 'States.JsonMerge($$, $, false)';
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
exports.addTraceContextToStepFunctionParameters = addTraceContextToStepFunctionParameters;
|
|
95
96
|
const shouldUpdateStepForTracesMerging = (step) => {
|
|
96
97
|
// is default lambda api
|
|
97
98
|
if (step.Resource === 'arn:aws:states:::lambda:invoke') {
|
|
@@ -110,4 +111,53 @@ const shouldUpdateStepForTracesMerging = (step) => {
|
|
|
110
111
|
return false;
|
|
111
112
|
};
|
|
112
113
|
exports.shouldUpdateStepForTracesMerging = shouldUpdateStepForTracesMerging;
|
|
114
|
+
// Truth table
|
|
115
|
+
// Input | Expected
|
|
116
|
+
// -------------------------|---------
|
|
117
|
+
// Empty object | true
|
|
118
|
+
// undefined | true
|
|
119
|
+
// not object | false
|
|
120
|
+
// object without CONTEXT.$ | true
|
|
121
|
+
// object with CONTEXT.$ | false
|
|
122
|
+
const shouldUpdateStepForStepFunctionContextInjection = (step) => {
|
|
123
|
+
var _a;
|
|
124
|
+
// is default lambda api
|
|
125
|
+
if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:states:::states:startExecution')) {
|
|
126
|
+
if (!step.Parameters) {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
if (!step.Parameters.Input) {
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
if (typeof step.Parameters.Input !== 'object') {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
if (!step.Parameters.Input['CONTEXT.$']) {
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return false;
|
|
140
|
+
};
|
|
141
|
+
exports.shouldUpdateStepForStepFunctionContextInjection = shouldUpdateStepForStepFunctionContextInjection;
|
|
142
|
+
const injectContextForLambdaFunctions = (step, context, stepName) => {
|
|
143
|
+
var _a;
|
|
144
|
+
if ((0, exports.shouldUpdateStepForTracesMerging)(step)) {
|
|
145
|
+
(0, exports.addTraceContextToLambdaParameters)(step);
|
|
146
|
+
return true;
|
|
147
|
+
}
|
|
148
|
+
else if ((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:lambda')) {
|
|
149
|
+
context.stdout.write(`[Warn] Step ${stepName} may be using the basic legacy integration, which does not support merging lambda trace(s) with Step Functions trace.
|
|
150
|
+
To merge lambda trace(s) with Step Functions trace, please consider using the latest integration.
|
|
151
|
+
More details can be found on https://docs.aws.amazon.com/step-functions/latest/dg/connect-lambda.html \n`);
|
|
152
|
+
}
|
|
153
|
+
return false;
|
|
154
|
+
};
|
|
155
|
+
const injectContextForStepFunctions = (step) => {
|
|
156
|
+
if ((0, exports.shouldUpdateStepForStepFunctionContextInjection)(step)) {
|
|
157
|
+
(0, exports.addTraceContextToStepFunctionParameters)(step);
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
160
|
+
return false;
|
|
161
|
+
};
|
|
162
|
+
exports.injectContextForStepFunctions = injectContextForStepFunctions;
|
|
113
163
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
28
28
|
this.service = clipanion_1.Option.String('--service');
|
|
29
29
|
this.stepFunctionArns = clipanion_1.Option.Array('-s,--step-function');
|
|
30
30
|
this.mergeStepFunctionAndLambdaTraces = clipanion_1.Option.Boolean('-mlt,--merge-lambda-traces,--merge-step-function-and-lambda-traces', false);
|
|
31
|
+
this.propagateUpstreamTrace = clipanion_1.Option.Boolean('--propagate-upstream-trace', false);
|
|
31
32
|
}
|
|
32
33
|
execute() {
|
|
33
34
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -215,10 +216,10 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
215
216
|
}
|
|
216
217
|
hasChanges = true;
|
|
217
218
|
}
|
|
218
|
-
if (this.mergeStepFunctionAndLambdaTraces) {
|
|
219
|
+
if (this.mergeStepFunctionAndLambdaTraces || this.propagateUpstreamTrace) {
|
|
219
220
|
// Not putting the update operation into the business logic of logs subscription. This will
|
|
220
221
|
// add additional API call, but it would also allow easier testing and cleaner code.
|
|
221
|
-
yield (0, helpers_1.
|
|
222
|
+
yield (0, helpers_1.injectContextIntoTasks)(describeStateMachineCommandOutput, stepFunctionsClient, this.context, this.dryRun);
|
|
222
223
|
}
|
|
223
224
|
}
|
|
224
225
|
if (!hasChanges) {
|