@datadog/datadog-ci 3.1.0 → 3.3.0
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 +3 -0
- package/dist/__tests__/cli.test.js +1 -0
- package/dist/__tests__/cli.test.js.map +1 -1
- package/dist/commands/coverage/__tests__/upload.test.js +48 -80
- package/dist/commands/coverage/__tests__/upload.test.js.map +1 -1
- package/dist/commands/coverage/__tests__/utils.test.js +4 -14
- package/dist/commands/coverage/__tests__/utils.test.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +0 -2
- package/dist/commands/coverage/renderer.js +1 -9
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.d.ts +2 -3
- package/dist/commands/coverage/upload.js +29 -88
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +0 -1
- package/dist/commands/coverage/utils.js +11 -35
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/elf-symbols/__tests__/elf.test.js +12 -9
- package/dist/commands/elf-symbols/__tests__/elf.test.js.map +1 -1
- package/dist/commands/elf-symbols/__tests__/upload.test.js +9 -5
- package/dist/commands/elf-symbols/__tests__/upload.test.js.map +1 -1
- package/dist/commands/elf-symbols/elf.d.ts +2 -11
- package/dist/commands/elf-symbols/elf.js +52 -68
- package/dist/commands/elf-symbols/elf.js.map +1 -1
- package/dist/commands/elf-symbols/upload.js +3 -3
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/junit/__tests__/upload.test.js +114 -65
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/renderer.d.ts +2 -2
- package/dist/commands/junit/renderer.js +3 -1
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +2 -0
- package/dist/commands/junit/upload.js +41 -37
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +0 -1
- package/dist/commands/junit/utils.js +1 -11
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/pe-symbols/__tests__/pe.test.d.ts +1 -0
- package/dist/commands/pe-symbols/__tests__/pe.test.js +81 -0
- package/dist/commands/pe-symbols/__tests__/pe.test.js.map +1 -0
- package/dist/commands/pe-symbols/cli.d.ts +1 -0
- package/dist/commands/pe-symbols/cli.js +5 -0
- package/dist/commands/pe-symbols/cli.js.map +1 -0
- package/dist/commands/pe-symbols/helpers.d.ts +4 -0
- package/dist/commands/pe-symbols/helpers.js +30 -0
- package/dist/commands/pe-symbols/helpers.js.map +1 -0
- package/dist/commands/pe-symbols/interfaces.d.ts +17 -0
- package/dist/commands/pe-symbols/interfaces.js +7 -0
- package/dist/commands/pe-symbols/interfaces.js.map +1 -0
- package/dist/commands/pe-symbols/pe-constants.d.ts +51 -0
- package/dist/commands/pe-symbols/pe-constants.js +160 -0
- package/dist/commands/pe-symbols/pe-constants.js.map +1 -0
- package/dist/commands/pe-symbols/pe.d.ts +35 -0
- package/dist/commands/pe-symbols/pe.js +248 -0
- package/dist/commands/pe-symbols/pe.js.map +1 -0
- package/dist/commands/pe-symbols/renderer.d.ts +19 -0
- package/dist/commands/pe-symbols/renderer.js +87 -0
- package/dist/commands/pe-symbols/renderer.js.map +1 -0
- package/dist/commands/pe-symbols/upload.d.ts +32 -0
- package/dist/commands/pe-symbols/upload.js +412 -0
- package/dist/commands/pe-symbols/upload.js.map +1 -0
- package/dist/commands/sarif/__tests__/upload.test.js +79 -6
- package/dist/commands/sarif/__tests__/upload.test.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -0
- package/dist/commands/sarif/renderer.js +4 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +1 -0
- package/dist/commands/sarif/upload.js +3 -2
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/__tests__/payload.test.js +157 -26
- package/dist/commands/sbom/__tests__/payload.test.js.map +1 -1
- package/dist/commands/sbom/constants.d.ts +2 -0
- package/dist/commands/sbom/constants.js +4 -1
- package/dist/commands/sbom/constants.js.map +1 -1
- package/dist/commands/sbom/payload.js +44 -0
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/types.d.ts +4 -0
- package/dist/commands/sbom/upload.d.ts +1 -0
- package/dist/commands/sbom/upload.js +3 -2
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/__tests__/api.test.js +2 -2
- package/dist/commands/synthetics/__tests__/api.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/batch.test.js +38 -37
- package/dist/commands/synthetics/__tests__/batch.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/build-and-test.test.d.ts +1 -0
- package/dist/commands/synthetics/__tests__/build-and-test.test.js +133 -0
- package/dist/commands/synthetics/__tests__/build-and-test.test.js.map +1 -0
- package/dist/commands/synthetics/__tests__/cli.test.js +83 -47
- package/dist/commands/synthetics/__tests__/cli.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js +2 -2
- package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/import-tests-lib.test.js +4 -4
- package/dist/commands/synthetics/__tests__/import-tests-lib.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/multilocator.test.js +13 -3
- package/dist/commands/synthetics/__tests__/multilocator.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/test.test.js +6 -7
- package/dist/commands/synthetics/__tests__/test.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js +1 -1
- package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/utils/public.test.js +10 -9
- package/dist/commands/synthetics/__tests__/utils/public.test.js.map +1 -1
- package/dist/commands/synthetics/api.js +2 -2
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/base-command.d.ts +29 -0
- package/dist/commands/synthetics/base-command.js +125 -0
- package/dist/commands/synthetics/base-command.js.map +1 -0
- package/dist/commands/synthetics/batch.d.ts +1 -0
- package/dist/commands/synthetics/batch.js +3 -3
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/build-and-test.d.ts +8 -0
- package/dist/commands/synthetics/build-and-test.js +102 -0
- package/dist/commands/synthetics/build-and-test.js.map +1 -0
- package/dist/commands/synthetics/deploy-tests-command.d.ts +8 -16
- package/dist/commands/synthetics/deploy-tests-command.js +19 -91
- package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
- package/dist/commands/synthetics/import-tests-command.d.ts +6 -14
- package/dist/commands/synthetics/import-tests-command.js +15 -83
- package/dist/commands/synthetics/import-tests-command.js.map +1 -1
- package/dist/commands/synthetics/index.d.ts +1 -1
- package/dist/commands/synthetics/index.js +6 -6
- package/dist/commands/synthetics/index.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +5 -2
- package/dist/commands/synthetics/multilocator.d.ts +0 -1
- package/dist/commands/synthetics/multilocator.js +7 -17
- package/dist/commands/synthetics/multilocator.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +12 -17
- package/dist/commands/synthetics/run-tests-command.js +133 -190
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.d.ts +1 -0
- package/dist/commands/synthetics/run-tests-lib.js +8 -4
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +2 -0
- package/dist/commands/synthetics/test.js +9 -8
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.d.ts +6 -13
- package/dist/commands/synthetics/upload-application-command.js +22 -87
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +2 -0
- package/dist/commands/synthetics/utils/internal.js +15 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.js +1 -1
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/helpers/__tests__/ci.test.js +49 -0
- package/dist/helpers/__tests__/ci.test.js.map +1 -1
- package/dist/helpers/__tests__/tags.test.js +59 -0
- package/dist/helpers/__tests__/tags.test.js.map +1 -1
- package/dist/helpers/ci.d.ts +13 -0
- package/dist/helpers/ci.js +23 -1
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/file-finder.d.ts +17 -0
- package/dist/helpers/file-finder.js +138 -0
- package/dist/helpers/file-finder.js.map +1 -0
- package/dist/helpers/filereader.d.ts +21 -0
- package/dist/helpers/filereader.js +59 -0
- package/dist/helpers/filereader.js.map +1 -0
- package/dist/helpers/git/format-git-span-data.d.ts +1 -1
- package/dist/helpers/git/format-git-span-data.js +2 -2
- package/dist/helpers/git/format-git-span-data.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +2 -1
- package/dist/helpers/prompt.d.ts +5 -3
- package/dist/helpers/prompt.js +14 -13
- package/dist/helpers/prompt.js.map +1 -1
- package/dist/helpers/tags.d.ts +1 -1
- package/dist/helpers/tags.js +4 -4
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/utils.d.ts +3 -0
- package/dist/helpers/utils.js +34 -1
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1,412 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.UploadCommand = void 0;
|
|
39
|
+
const fs_1 = __importDefault(require("fs"));
|
|
40
|
+
const clipanion_1 = require("clipanion");
|
|
41
|
+
const glob_1 = __importDefault(require("glob"));
|
|
42
|
+
const upath_1 = __importDefault(require("upath"));
|
|
43
|
+
const constants_1 = require("../../constants");
|
|
44
|
+
const apikey_1 = require("../../helpers/apikey");
|
|
45
|
+
const concurrency_1 = require("../../helpers/concurrency");
|
|
46
|
+
const env_1 = require("../../helpers/env");
|
|
47
|
+
const fips_1 = require("../../helpers/fips");
|
|
48
|
+
const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
|
|
49
|
+
const metrics_1 = require("../../helpers/metrics");
|
|
50
|
+
const upload_1 = require("../../helpers/upload");
|
|
51
|
+
// import {buildPath, DEFAULT_CONFIG_PATHS, execute, resolveConfigFromFileAndEnvironment} from '../../helpers/utils'
|
|
52
|
+
const utils_1 = require("../../helpers/utils");
|
|
53
|
+
const validation = __importStar(require("../../helpers/validation"));
|
|
54
|
+
const validation_1 = require("../../helpers/validation");
|
|
55
|
+
const version_1 = require("../../helpers/version");
|
|
56
|
+
const helpers_1 = require("./helpers");
|
|
57
|
+
const interfaces_1 = require("./interfaces");
|
|
58
|
+
const pe_1 = require("./pe");
|
|
59
|
+
const pe_constants_1 = require("./pe-constants");
|
|
60
|
+
const renderer_1 = require("./renderer");
|
|
61
|
+
class UploadCommand extends clipanion_1.Command {
|
|
62
|
+
constructor() {
|
|
63
|
+
var _a, _b;
|
|
64
|
+
super(...arguments);
|
|
65
|
+
this.disableGit = clipanion_1.Option.Boolean('--disable-git', false);
|
|
66
|
+
this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
|
|
67
|
+
this.configPath = clipanion_1.Option.String('--config');
|
|
68
|
+
this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
|
|
69
|
+
this.repositoryUrl = clipanion_1.Option.String('--repository-url');
|
|
70
|
+
this.replaceExisting = clipanion_1.Option.Boolean('--replace-existing', false);
|
|
71
|
+
this.symbolsLocations = clipanion_1.Option.Rest({ required: 1 });
|
|
72
|
+
this.cliVersion = version_1.version;
|
|
73
|
+
this.config = {
|
|
74
|
+
datadogSite: 'datadoghq.com',
|
|
75
|
+
};
|
|
76
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
77
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
78
|
+
this.fipsConfig = {
|
|
79
|
+
fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
80
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
execute() {
|
|
84
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
85
|
+
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
86
|
+
if (!(yield this.verifyParameters())) {
|
|
87
|
+
return 1;
|
|
88
|
+
}
|
|
89
|
+
const initialTime = Date.now();
|
|
90
|
+
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.symbolsLocations));
|
|
91
|
+
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
92
|
+
apiKey: process.env.DATADOG_API_KEY,
|
|
93
|
+
datadogSite: process.env.DATADOG_SITE,
|
|
94
|
+
}, {
|
|
95
|
+
configPath: this.configPath,
|
|
96
|
+
defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
|
|
97
|
+
configFromFileCallback: (configFromFile) => {
|
|
98
|
+
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
if (!this.disableGit) {
|
|
102
|
+
this.gitData = yield this.getGitMetadata();
|
|
103
|
+
}
|
|
104
|
+
const callResults = [];
|
|
105
|
+
try {
|
|
106
|
+
callResults.push(...(yield this.performPESymbolsUpload()));
|
|
107
|
+
const totalTime = (Date.now() - initialTime) / 1000;
|
|
108
|
+
this.context.stdout.write((0, renderer_1.renderCommandSummary)(callResults, totalTime, this.dryRun));
|
|
109
|
+
}
|
|
110
|
+
catch (e) {
|
|
111
|
+
this.context.stderr.write((0, renderer_1.renderGeneralizedError)(e));
|
|
112
|
+
return 1;
|
|
113
|
+
}
|
|
114
|
+
return 0;
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
getApiKeyValidator(metricsLogger) {
|
|
118
|
+
return (0, apikey_1.newApiKeyValidator)({
|
|
119
|
+
apiKey: this.config.apiKey,
|
|
120
|
+
datadogSite: this.config.datadogSite,
|
|
121
|
+
metricsLogger: metricsLogger.logger,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
getGitDataPayload(gitData) {
|
|
125
|
+
const files = gitData.trackedFilesMatcher.rawTrackedFilesList();
|
|
126
|
+
const repoPayload = {
|
|
127
|
+
data: [
|
|
128
|
+
{
|
|
129
|
+
files,
|
|
130
|
+
hash: gitData.hash,
|
|
131
|
+
repository_url: gitData.remote,
|
|
132
|
+
},
|
|
133
|
+
],
|
|
134
|
+
version: 1,
|
|
135
|
+
};
|
|
136
|
+
return {
|
|
137
|
+
type: 'string',
|
|
138
|
+
options: { filename: 'repository', contentType: 'application/json' },
|
|
139
|
+
value: JSON.stringify(repoPayload),
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
getGitMetadata() {
|
|
143
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
+
try {
|
|
145
|
+
return yield (0, format_git_sourcemaps_data_1.getRepositoryData)(yield (0, format_git_sourcemaps_data_1.newSimpleGit)(), this.repositoryUrl);
|
|
146
|
+
}
|
|
147
|
+
catch (e) {
|
|
148
|
+
this.context.stdout.write((0, renderer_1.renderGitWarning)(e));
|
|
149
|
+
}
|
|
150
|
+
return undefined;
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
getPESymbolSource(peFileMetadata) {
|
|
154
|
+
if (peFileMetadata.hasPdbInfo) {
|
|
155
|
+
return 'debug_info';
|
|
156
|
+
}
|
|
157
|
+
return 'none';
|
|
158
|
+
}
|
|
159
|
+
getArchitecture(architecture) {
|
|
160
|
+
if (architecture === pe_constants_1.MachineArchitecture.x86) {
|
|
161
|
+
return 'x86';
|
|
162
|
+
}
|
|
163
|
+
else if (architecture === pe_constants_1.MachineArchitecture.x64) {
|
|
164
|
+
return 'x64';
|
|
165
|
+
}
|
|
166
|
+
else if (architecture === pe_constants_1.MachineArchitecture.Arm32) {
|
|
167
|
+
return 'arm32';
|
|
168
|
+
}
|
|
169
|
+
else if (architecture === pe_constants_1.MachineArchitecture.Arm64) {
|
|
170
|
+
return 'arm64';
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
return 'unknown';
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
getMappingMetadata(peFileMetadata) {
|
|
177
|
+
var _a, _b;
|
|
178
|
+
return {
|
|
179
|
+
cli_version: this.cliVersion,
|
|
180
|
+
origin_version: this.cliVersion,
|
|
181
|
+
origin: 'datadog-ci',
|
|
182
|
+
arch: this.getArchitecture(peFileMetadata.arch),
|
|
183
|
+
pdb_age: peFileMetadata.pdbAge,
|
|
184
|
+
pdb_sig: peFileMetadata === null || peFileMetadata === void 0 ? void 0 : peFileMetadata.pdbSig,
|
|
185
|
+
git_commit_sha: (_a = this.gitData) === null || _a === void 0 ? void 0 : _a.hash,
|
|
186
|
+
git_repository_url: (_b = this.gitData) === null || _b === void 0 ? void 0 : _b.remote,
|
|
187
|
+
symbol_source: this.getPESymbolSource(peFileMetadata),
|
|
188
|
+
filename: upath_1.default.basename(peFileMetadata.pdbFilename),
|
|
189
|
+
overwrite: this.replaceExisting,
|
|
190
|
+
type: interfaces_1.TYPE_PE_DEBUG_INFOS,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
getMetricsLogger() {
|
|
194
|
+
const metricsLogger = (0, metrics_1.getMetricsLogger)({
|
|
195
|
+
apiKey: this.config.apiKey,
|
|
196
|
+
datadogSite: this.config.datadogSite,
|
|
197
|
+
defaultTags: [`cli_version:${this.cliVersion}`, 'platform:pe'],
|
|
198
|
+
prefix: 'datadog.ci.pe_symbols.',
|
|
199
|
+
});
|
|
200
|
+
return metricsLogger;
|
|
201
|
+
}
|
|
202
|
+
getPESymbolFiles(symbolsLocation) {
|
|
203
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
204
|
+
let paths = [];
|
|
205
|
+
let reportFailure;
|
|
206
|
+
const stat = yield fs_1.default.promises.stat(symbolsLocation);
|
|
207
|
+
if (stat.isDirectory()) {
|
|
208
|
+
// strict: false is needed to avoid throwing an error if a directory is not readable
|
|
209
|
+
paths = glob_1.default.sync((0, utils_1.buildPath)(symbolsLocation, '**'), { dot: true, dotRelative: true });
|
|
210
|
+
reportFailure = (message) => this.context.stdout.write((0, renderer_1.renderWarning)(message));
|
|
211
|
+
// throw an error if top-level directory is not readable
|
|
212
|
+
// eslint-disable-next-line no-bitwise
|
|
213
|
+
yield fs_1.default.promises.access(symbolsLocation, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
|
|
214
|
+
throw Error(`Directory ${symbolsLocation} is not readable`);
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
paths = [symbolsLocation];
|
|
219
|
+
// in single file mode, we want to report failures as errors
|
|
220
|
+
reportFailure = (message) => {
|
|
221
|
+
throw Error(message);
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
const filesMetadata = [];
|
|
225
|
+
for (const p of paths) {
|
|
226
|
+
const pathStat = yield fs_1.default.promises.lstat(p);
|
|
227
|
+
if (pathStat.isDirectory()) {
|
|
228
|
+
// check if directory is readable and if not emit a warning
|
|
229
|
+
// eslint-disable-next-line no-bitwise
|
|
230
|
+
yield fs_1.default.promises.access(p, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
|
|
231
|
+
reportFailure(`Skipped directory ${p} because it is not readable`);
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
else if (pathStat.isFile()) {
|
|
235
|
+
// check that path is a file and is a PE file
|
|
236
|
+
const metadata = yield (0, pe_1.getPEFileMetadata)(p);
|
|
237
|
+
// handle all possible failures
|
|
238
|
+
if (!metadata.isPE) {
|
|
239
|
+
reportFailure(`Input location ${p} is not a PE file`);
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
if (metadata.error) {
|
|
243
|
+
reportFailure(`Error reading PE file ${p}: ${metadata.error.message}`);
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
if (!metadata.hasPdbInfo) {
|
|
247
|
+
reportFailure(`Skipped ${p} because it has no debug info, nor symbols`);
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
filesMetadata.push(metadata);
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
// sort files to make output deterministic
|
|
254
|
+
filesMetadata.sort((a, b) => a.filename.localeCompare(b.filename));
|
|
255
|
+
return filesMetadata;
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
removeBuildIdDuplicates(filesMetadata) {
|
|
259
|
+
const buildIds = new Map();
|
|
260
|
+
for (const metadata of filesMetadata) {
|
|
261
|
+
const buildId = (0, pe_1.getBuildId)(metadata);
|
|
262
|
+
const existing = buildIds.get(buildId);
|
|
263
|
+
if (existing) {
|
|
264
|
+
// if both files have debug info and symbols, we keep the first one
|
|
265
|
+
this.context.stderr.write((0, renderer_1.renderWarning)(`Duplicate build_id found: ${buildId} in ${metadata.filename} and ${existing.filename} - skipping ${metadata.filename}`));
|
|
266
|
+
}
|
|
267
|
+
else {
|
|
268
|
+
buildIds.set(buildId, metadata);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return Array.from(buildIds.values()).sort((a, b) => a.filename.localeCompare(b.filename));
|
|
272
|
+
}
|
|
273
|
+
getFileInSameFolder(pathname, newFilename) {
|
|
274
|
+
const dirname = upath_1.default.dirname(pathname);
|
|
275
|
+
const newPathname = upath_1.default.join(dirname, upath_1.default.basename(newFilename));
|
|
276
|
+
return newPathname;
|
|
277
|
+
}
|
|
278
|
+
getAssociatedPdbFilename(pathname) {
|
|
279
|
+
const basename = upath_1.default.basename(pathname, upath_1.default.extname(pathname));
|
|
280
|
+
const dirname = upath_1.default.dirname(pathname);
|
|
281
|
+
const newPathname = upath_1.default.join(dirname, `${basename}.pdb`);
|
|
282
|
+
return newPathname;
|
|
283
|
+
}
|
|
284
|
+
performPESymbolsUpload() {
|
|
285
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
286
|
+
const metricsLogger = this.getMetricsLogger();
|
|
287
|
+
const apiKeyValidator = this.getApiKeyValidator(metricsLogger);
|
|
288
|
+
let peFilesMetadata = (yield Promise.all(this.symbolsLocations.map((location) => this.getPESymbolFiles(location)))).flat();
|
|
289
|
+
peFilesMetadata = this.removeBuildIdDuplicates(peFilesMetadata);
|
|
290
|
+
const requestBuilder = (0, helpers_1.getPERequestBuilder)(this.config.apiKey, this.cliVersion, this.config.datadogSite);
|
|
291
|
+
try {
|
|
292
|
+
const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, peFilesMetadata, (fileMetadata) => __awaiter(this, void 0, void 0, function* () {
|
|
293
|
+
const metadata = this.getMappingMetadata(fileMetadata);
|
|
294
|
+
if (this.dryRun) {
|
|
295
|
+
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(fileMetadata.filename, metadata)}`);
|
|
296
|
+
// TODO: uncomment the following when dryRun won't be TRUE by default
|
|
297
|
+
// return UploadStatus.Success
|
|
298
|
+
}
|
|
299
|
+
// get the .pdb filename based on the .dll filename and copy it into a temp folder
|
|
300
|
+
// --> not sure the ELF-based code makes any sense for PE files...
|
|
301
|
+
// instead, we should not need to copy anything:
|
|
302
|
+
// 1. get the .pdb filename from the .dll file (ex: foo64.dll --> foo.pdb)
|
|
303
|
+
// 2. look for it in the same folder as the .dll file
|
|
304
|
+
// 3. if it is not there, look in the same folder for a file with the same name as .dll but with a .pdb extension
|
|
305
|
+
// 4. if it is there, upload it; if not generate a skip warning
|
|
306
|
+
//
|
|
307
|
+
let pdbFilename = this.getFileInSameFolder(fileMetadata.filename, fileMetadata.pdbFilename);
|
|
308
|
+
// TODO: remove this log after debugging
|
|
309
|
+
this.context.stdout.write(`[LOG] Look for pdb file = ${pdbFilename}\n`);
|
|
310
|
+
if (!fs_1.default.existsSync(pdbFilename)) {
|
|
311
|
+
pdbFilename = this.getAssociatedPdbFilename(fileMetadata.filename);
|
|
312
|
+
if (!fs_1.default.existsSync(pdbFilename)) {
|
|
313
|
+
this.context.stdout.write((0, renderer_1.renderMissingPdbFile)(fileMetadata.pdbFilename, fileMetadata.filename));
|
|
314
|
+
return upload_1.UploadStatus.Skipped;
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
// TODO: remove this log after debugging
|
|
318
|
+
this.context.stdout.write(`[LOG] Use pdb file = ${pdbFilename}\n`);
|
|
319
|
+
const eventValue = JSON.stringify(metadata);
|
|
320
|
+
this.context.stdout.write((0, renderer_1.renderEventPayload)(eventValue));
|
|
321
|
+
const payload = {
|
|
322
|
+
content: new Map([
|
|
323
|
+
[
|
|
324
|
+
'event',
|
|
325
|
+
{
|
|
326
|
+
type: 'string',
|
|
327
|
+
value: eventValue,
|
|
328
|
+
options: { filename: 'event', contentType: 'application/json' },
|
|
329
|
+
},
|
|
330
|
+
],
|
|
331
|
+
[
|
|
332
|
+
interfaces_1.VALUE_NAME_PE_DEBUG_INFOS,
|
|
333
|
+
{
|
|
334
|
+
type: 'file',
|
|
335
|
+
path: pdbFilename,
|
|
336
|
+
options: { filename: interfaces_1.PE_DEBUG_INFOS_FILENAME },
|
|
337
|
+
},
|
|
338
|
+
],
|
|
339
|
+
]),
|
|
340
|
+
};
|
|
341
|
+
if (this.gitData !== undefined) {
|
|
342
|
+
payload.content.set('repository', this.getGitDataPayload(this.gitData));
|
|
343
|
+
}
|
|
344
|
+
return (0, helpers_1.uploadMultipartHelper)(requestBuilder, payload, {
|
|
345
|
+
apiKeyValidator,
|
|
346
|
+
onError: (e) => {
|
|
347
|
+
this.context.stdout.write((0, renderer_1.renderFailedUpload)(fileMetadata.filename, e.message));
|
|
348
|
+
metricsLogger.logger.increment('failed', 1);
|
|
349
|
+
},
|
|
350
|
+
onRetry: (e, attempts) => {
|
|
351
|
+
this.context.stdout.write((0, renderer_1.renderRetriedUpload)(fileMetadata.filename, e.message, attempts));
|
|
352
|
+
metricsLogger.logger.increment('retries', 1);
|
|
353
|
+
},
|
|
354
|
+
onUpload: () => {
|
|
355
|
+
this.context.stdout.write((0, renderer_1.renderUpload)(fileMetadata.filename, metadata));
|
|
356
|
+
},
|
|
357
|
+
retries: 5,
|
|
358
|
+
useGzip: true,
|
|
359
|
+
});
|
|
360
|
+
}));
|
|
361
|
+
return results;
|
|
362
|
+
}
|
|
363
|
+
catch (error) {
|
|
364
|
+
throw error;
|
|
365
|
+
}
|
|
366
|
+
finally {
|
|
367
|
+
try {
|
|
368
|
+
yield metricsLogger.flush();
|
|
369
|
+
}
|
|
370
|
+
catch (err) {
|
|
371
|
+
this.context.stdout.write(`WARN: ${err}\n`);
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
});
|
|
375
|
+
}
|
|
376
|
+
verifyParameters() {
|
|
377
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
378
|
+
let parametersOkay = true;
|
|
379
|
+
if (!this.symbolsLocations || this.symbolsLocations.length === 0) {
|
|
380
|
+
this.context.stderr.write((0, renderer_1.renderArgumentMissingError)('symbols locations'));
|
|
381
|
+
parametersOkay = false;
|
|
382
|
+
}
|
|
383
|
+
else {
|
|
384
|
+
for (const symbolsLocation of this.symbolsLocations) {
|
|
385
|
+
if (fs_1.default.existsSync(symbolsLocation)) {
|
|
386
|
+
const stats = fs_1.default.statSync(symbolsLocation);
|
|
387
|
+
if (!stats.isDirectory() && !stats.isFile()) {
|
|
388
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
|
|
389
|
+
parametersOkay = false;
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
else {
|
|
393
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
|
|
394
|
+
parametersOkay = false;
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
return parametersOkay;
|
|
399
|
+
});
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
exports.UploadCommand = UploadCommand;
|
|
403
|
+
UploadCommand.paths = [['pe-symbols', 'upload']];
|
|
404
|
+
UploadCommand.usage = clipanion_1.Command.Usage({
|
|
405
|
+
category: 'Profiling',
|
|
406
|
+
description: 'Upload Windows PE debug info files to Datadog.',
|
|
407
|
+
details: `
|
|
408
|
+
This command will upload debug info from all PE files found recursively in the given location in order to symbolicate profiles
|
|
409
|
+
`,
|
|
410
|
+
examples: [['Upload debug infos for all PE files in the current directory', 'datadog-ci pe-symbols upload .']],
|
|
411
|
+
});
|
|
412
|
+
//# sourceMappingURL=upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/pe-symbols/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const fs_1 = __importDefault(require("fs"));
|
|
15
16
|
const os_1 = __importDefault(require("os"));
|
|
17
|
+
const path_1 = __importDefault(require("path"));
|
|
16
18
|
const advanced_1 = require("clipanion/lib/advanced");
|
|
19
|
+
const simple_git_1 = __importDefault(require("simple-git"));
|
|
17
20
|
const renderer_1 = require("../renderer");
|
|
18
21
|
const upload_1 = require("../upload");
|
|
19
22
|
const makeCli = () => {
|
|
@@ -143,11 +146,11 @@ describe('upload', () => {
|
|
|
143
146
|
});
|
|
144
147
|
});
|
|
145
148
|
describe('execute', () => {
|
|
146
|
-
const runCLI = (
|
|
149
|
+
const runCLI = (args) => __awaiter(void 0, void 0, void 0, function* () {
|
|
147
150
|
const cli = makeCli();
|
|
148
151
|
const context = createMockContext();
|
|
149
152
|
process.env = { DATADOG_API_KEY: 'PLACEHOLDER' };
|
|
150
|
-
const code = yield cli.run(['sarif', 'upload', '--env', 'ci', '--dry-run', ...
|
|
153
|
+
const code = yield cli.run(['sarif', 'upload', '--env', 'ci', '--dry-run', ...args], context);
|
|
151
154
|
return { context, code };
|
|
152
155
|
});
|
|
153
156
|
test('relative path with double dots', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -184,16 +187,64 @@ describe('execute', () => {
|
|
|
184
187
|
basePaths: [`${process.cwd()}/src/commands/sarif/__tests__/fixtures/subfolder`],
|
|
185
188
|
concurrency: 20,
|
|
186
189
|
env: 'ci',
|
|
190
|
+
spanTags: {
|
|
191
|
+
'git.repository_url': 'DataDog/datadog-ci',
|
|
192
|
+
env: 'ci',
|
|
193
|
+
},
|
|
187
194
|
});
|
|
188
195
|
}));
|
|
196
|
+
test('absolute path when passing git repository', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
197
|
+
const tmpdir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'gitPath-'));
|
|
198
|
+
try {
|
|
199
|
+
// Configure local git repository
|
|
200
|
+
const git = (0, simple_git_1.default)(tmpdir);
|
|
201
|
+
setupLocalGitConfig(tmpdir);
|
|
202
|
+
yield git.init();
|
|
203
|
+
// eslint-disable-next-line no-null/no-null
|
|
204
|
+
yield git.commit('Initial commit', [], { '--allow-empty': null });
|
|
205
|
+
const repositoryParam = `--git-repository=${tmpdir}`;
|
|
206
|
+
const { context, code } = yield runCLI([
|
|
207
|
+
repositoryParam,
|
|
208
|
+
process.cwd() + '/src/commands/sarif/__tests__/fixtures/subfolder',
|
|
209
|
+
]);
|
|
210
|
+
const output = context.stdout.toString().split(os_1.default.EOL);
|
|
211
|
+
expect(code).toBe(0);
|
|
212
|
+
checkConsoleOutput(output, {
|
|
213
|
+
basePaths: [`${process.cwd()}/src/commands/sarif/__tests__/fixtures/subfolder`],
|
|
214
|
+
concurrency: 20,
|
|
215
|
+
env: 'ci',
|
|
216
|
+
spanTags: {
|
|
217
|
+
'git.repository_url': 'mock-repo.local/fake.git',
|
|
218
|
+
'git.branch': 'mock-branch',
|
|
219
|
+
'git.commit.message': 'Initial commit',
|
|
220
|
+
'git.commit.committer.email': 'mock@fake.local',
|
|
221
|
+
'git.commit.committer.name': 'MockUser123',
|
|
222
|
+
'git.commit.author.email': 'mock@fake.local',
|
|
223
|
+
'git.commit.author.name': 'MockUser123',
|
|
224
|
+
env: 'ci',
|
|
225
|
+
},
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
finally {
|
|
229
|
+
// Removed temporary git file
|
|
230
|
+
fs_1.default.rmSync(tmpdir, { recursive: true, force: true });
|
|
231
|
+
}
|
|
232
|
+
}));
|
|
233
|
+
test('absolute path when passing git repository which does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
234
|
+
const nonExistingGitRepository = '/you/cannot/find/me';
|
|
235
|
+
const repositoryParam = `--git-repository=${nonExistingGitRepository}`;
|
|
236
|
+
// Pass a git repository which does not exist, command should fail
|
|
237
|
+
const { code } = yield runCLI([repositoryParam, process.cwd() + '/src/commands/sarif/__tests__/fixtures/subfolder']);
|
|
238
|
+
expect(code).toBe(1);
|
|
239
|
+
}));
|
|
189
240
|
test('single file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
190
241
|
const { context, code } = yield runCLI([process.cwd() + '/src/commands/sarif/__tests__/fixtures/valid-results.sarif']);
|
|
191
242
|
const output = context.stdout.toString().split(os_1.default.EOL);
|
|
192
|
-
const
|
|
243
|
+
const location = `${process.cwd()}/src/commands/sarif/__tests__/fixtures/valid-results.sarif`;
|
|
193
244
|
expect(code).toBe(0);
|
|
194
245
|
expect(output[0]).toContain('DRY-RUN MODE ENABLED. WILL NOT UPLOAD SARIF REPORT');
|
|
195
246
|
expect(output[1]).toContain('Starting upload with concurrency 20.');
|
|
196
|
-
expect(output[2]).toContain(`Will upload SARIF report file ${
|
|
247
|
+
expect(output[2]).toContain(`Will upload SARIF report file ${location}`);
|
|
197
248
|
expect(output[3]).toContain('Only one upload per commit, env and tool');
|
|
198
249
|
expect(output[4]).toContain(`Preparing upload for`);
|
|
199
250
|
expect(output[4]).toContain(`env:ci`);
|
|
@@ -201,9 +252,9 @@ describe('execute', () => {
|
|
|
201
252
|
test('not found file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
202
253
|
const { context, code } = yield runCLI([process.cwd() + '/src/commands/sarif/__tests__/fixtures/not-found.sarif']);
|
|
203
254
|
const output = context.stdout.toString().split(os_1.default.EOL);
|
|
204
|
-
const
|
|
255
|
+
const location = `${process.cwd()}/src/commands/sarif/__tests__/fixtures/not-found.sarif`;
|
|
205
256
|
expect(code).toBe(1);
|
|
206
|
-
expect(output[0]).toContain(`Cannot find valid SARIF report files to upload in ${
|
|
257
|
+
expect(output[0]).toContain(`Cannot find valid SARIF report files to upload in ${location}`);
|
|
207
258
|
expect(output[1]).toContain('Check the files exist and are valid.');
|
|
208
259
|
}));
|
|
209
260
|
});
|
|
@@ -214,5 +265,27 @@ const checkConsoleOutput = (output, expected) => {
|
|
|
214
265
|
expect(output[3]).toContain('Only one upload per commit, env and tool');
|
|
215
266
|
expect(output[4]).toContain(`Preparing upload for`);
|
|
216
267
|
expect(output[4]).toContain(`env:${expected.env}`);
|
|
268
|
+
if (expected.spanTags) {
|
|
269
|
+
const regex = /with tags (\{.*\})/;
|
|
270
|
+
const match = output[5].match(regex);
|
|
271
|
+
expect(match).not.toBeNull();
|
|
272
|
+
const spanTags = JSON.parse(match[1]);
|
|
273
|
+
Object.keys(expected.spanTags).forEach((k) => {
|
|
274
|
+
expect(spanTags[k]).not.toBeNull();
|
|
275
|
+
expect(spanTags[k]).toContain(expected.spanTags[k]);
|
|
276
|
+
});
|
|
277
|
+
}
|
|
278
|
+
};
|
|
279
|
+
const getFixtures = (file) => {
|
|
280
|
+
return path_1.default.join('./src/commands/sarif/__tests__/fixtures', file);
|
|
281
|
+
};
|
|
282
|
+
const setupLocalGitConfig = (dir) => {
|
|
283
|
+
const gitDir = path_1.default.join(dir, '.git');
|
|
284
|
+
if (!fs_1.default.existsSync(gitDir)) {
|
|
285
|
+
fs_1.default.mkdirSync(gitDir, { recursive: true });
|
|
286
|
+
}
|
|
287
|
+
const configFixture = fs_1.default.readFileSync(getFixtures('gitconfig'), 'utf8');
|
|
288
|
+
const configPath = path_1.default.join(gitDir, '/config');
|
|
289
|
+
fs_1.default.writeFileSync(configPath, configFixture);
|
|
217
290
|
};
|
|
218
291
|
//# sourceMappingURL=upload.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/sarif/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/sarif/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,5 +6,6 @@ export declare const renderRetriedUpload: (sarifReport: Payload, errorMessage: s
|
|
|
6
6
|
export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => string;
|
|
7
7
|
export declare const renderDryRunUpload: (payload: Payload) => string;
|
|
8
8
|
export declare const renderUpload: (payload: Payload) => string;
|
|
9
|
+
export declare const renderUploadWithSpan: (payload: Payload) => string;
|
|
9
10
|
export declare const renderCommandInfo: (basePaths: string[], env: string, sha: string, concurrency: number, dryRun: boolean, noVerify: boolean) => string;
|
|
10
11
|
export declare const renderFilesNotFound: (basePaths: string[]) => string;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.renderFilesNotFound = exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderMissingTags = exports.renderInvalidFile = void 0;
|
|
6
|
+
exports.renderFilesNotFound = exports.renderCommandInfo = exports.renderUploadWithSpan = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderMissingTags = exports.renderInvalidFile = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const utils_1 = require("../junit/utils");
|
|
@@ -60,10 +60,12 @@ const renderSuccessfulCommand = (fileCount, duration) => {
|
|
|
60
60
|
return fullStr;
|
|
61
61
|
};
|
|
62
62
|
exports.renderSuccessfulCommand = renderSuccessfulCommand;
|
|
63
|
-
const renderDryRunUpload = (payload) => `[DRYRUN] ${(0, exports.
|
|
63
|
+
const renderDryRunUpload = (payload) => `[DRYRUN] ${(0, exports.renderUploadWithSpan)(payload)}`;
|
|
64
64
|
exports.renderDryRunUpload = renderDryRunUpload;
|
|
65
65
|
const renderUpload = (payload) => `Uploading SARIF report in ${payload.reportPath}\n`;
|
|
66
66
|
exports.renderUpload = renderUpload;
|
|
67
|
+
const renderUploadWithSpan = (payload) => `Uploading SARIF report to ${payload.reportPath} with tags ${JSON.stringify(payload.spanTags)}\n`;
|
|
68
|
+
exports.renderUploadWithSpan = renderUploadWithSpan;
|
|
67
69
|
const renderCommandInfo = (basePaths, env, sha, concurrency, dryRun, noVerify) => {
|
|
68
70
|
let fullStr = '';
|
|
69
71
|
if (dryRun) {
|