@datadog/datadog-ci 3.7.1 → 3.9.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.
Files changed (67) hide show
  1. package/dist/cli.js +1 -1
  2. package/dist/cli.js.map +1 -1
  3. package/dist/commands/aas/cli.d.ts +1 -0
  4. package/dist/commands/aas/cli.js +5 -0
  5. package/dist/commands/aas/cli.js.map +1 -0
  6. package/dist/commands/aas/common.d.ts +24 -0
  7. package/dist/commands/aas/common.js +128 -0
  8. package/dist/commands/aas/common.js.map +1 -0
  9. package/dist/commands/aas/instrument.d.ts +11 -0
  10. package/dist/commands/aas/instrument.js +158 -0
  11. package/dist/commands/aas/instrument.js.map +1 -0
  12. package/dist/commands/aas/interfaces.d.ts +16 -0
  13. package/dist/commands/aas/interfaces.js +3 -0
  14. package/dist/commands/aas/interfaces.js.map +1 -0
  15. package/dist/commands/cloud-run/constants.js +12 -12
  16. package/dist/commands/cloud-run/constants.js.map +1 -1
  17. package/dist/commands/coverage/renderer.d.ts +2 -0
  18. package/dist/commands/coverage/renderer.js +9 -1
  19. package/dist/commands/coverage/renderer.js.map +1 -1
  20. package/dist/commands/coverage/upload.d.ts +6 -1
  21. package/dist/commands/coverage/upload.js +108 -66
  22. package/dist/commands/coverage/upload.js.map +1 -1
  23. package/dist/commands/coverage/utils.d.ts +6 -2
  24. package/dist/commands/coverage/utils.js +72 -24
  25. package/dist/commands/coverage/utils.js.map +1 -1
  26. package/dist/commands/gate/evaluate.js +1 -1
  27. package/dist/commands/gate/evaluate.js.map +1 -1
  28. package/dist/commands/git-metadata/git.d.ts +1 -0
  29. package/dist/commands/git-metadata/git.js +19 -5
  30. package/dist/commands/git-metadata/git.js.map +1 -1
  31. package/dist/commands/lambda/functions/instrument.js +1 -1
  32. package/dist/commands/lambda/functions/instrument.js.map +1 -1
  33. package/dist/commands/sbom/payload.js +9 -6
  34. package/dist/commands/sbom/payload.js.map +1 -1
  35. package/dist/commands/sbom/renderer.d.ts +1 -1
  36. package/dist/commands/sbom/renderer.js +16 -6
  37. package/dist/commands/sbom/renderer.js.map +1 -1
  38. package/dist/commands/sbom/upload.js +1 -1
  39. package/dist/commands/sbom/upload.js.map +1 -1
  40. package/dist/commands/synthetics/deploy-tests-command.d.ts +1 -0
  41. package/dist/commands/synthetics/deploy-tests-command.js +7 -4
  42. package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
  43. package/dist/commands/synthetics/deploy-tests-lib.js +23 -3
  44. package/dist/commands/synthetics/deploy-tests-lib.js.map +1 -1
  45. package/dist/commands/synthetics/interfaces.d.ts +1 -0
  46. package/dist/commands/synthetics/tunnel/tunnel.js +3 -4
  47. package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -1
  48. package/dist/constants.d.ts +1 -0
  49. package/dist/constants.js +3 -1
  50. package/dist/constants.js.map +1 -1
  51. package/dist/helpers/apikey.d.ts +1 -0
  52. package/dist/helpers/apikey.js +15 -11
  53. package/dist/helpers/apikey.js.map +1 -1
  54. package/dist/helpers/ci.d.ts +0 -1
  55. package/dist/helpers/ci.js +85 -36
  56. package/dist/helpers/ci.js.map +1 -1
  57. package/dist/helpers/file-finder.d.ts +3 -0
  58. package/dist/helpers/file-finder.js +49 -2
  59. package/dist/helpers/file-finder.js.map +1 -1
  60. package/dist/helpers/interfaces.d.ts +2 -2
  61. package/dist/helpers/tags.d.ts +0 -1
  62. package/dist/helpers/tags.js +1 -2
  63. package/dist/helpers/tags.js.map +1 -1
  64. package/dist/helpers/user-provided-git.js +5 -1
  65. package/dist/helpers/user-provided-git.js.map +1 -1
  66. package/dist/helpers/utils.d.ts +2 -1
  67. package/package.json +8 -1
@@ -1,27 +1,4 @@
1
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
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,7 +16,6 @@ exports.UploadCodeCoverageReportCommand = void 0;
39
16
  const os_1 = __importDefault(require("os"));
40
17
  const chalk_1 = __importDefault(require("chalk"));
41
18
  const clipanion_1 = require("clipanion");
42
- const t = __importStar(require("typanion"));
43
19
  const upath_1 = __importDefault(require("upath"));
44
20
  const constants_1 = require("../../constants");
45
21
  const ci_1 = require("../../helpers/ci");
@@ -48,31 +24,23 @@ const file_finder_1 = require("../../helpers/file-finder");
48
24
  const fips_1 = require("../../helpers/fips");
49
25
  const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
50
26
  const glob_1 = require("../../helpers/glob");
27
+ const id_1 = __importDefault(require("../../helpers/id"));
51
28
  const logger_1 = require("../../helpers/logger");
52
29
  const retry_1 = require("../../helpers/retry");
53
30
  const tags_1 = require("../../helpers/tags");
54
31
  const user_provided_git_1 = require("../../helpers/user-provided-git");
32
+ const utils_1 = require("../../helpers/utils");
33
+ const git_metadata_1 = require("../git-metadata");
55
34
  const git_1 = require("../git-metadata/git");
56
- const api_1 = require("./api");
35
+ const gitdb_1 = require("../git-metadata/gitdb");
36
+ const api_1 = require("../junit/api");
37
+ const api_2 = require("./api");
57
38
  const renderer_1 = require("./renderer");
58
- const utils_1 = require("./utils");
39
+ const utils_2 = require("./utils");
40
+ const TRACE_ID_HTTP_HEADER = 'x-datadog-trace-id';
41
+ const PARENT_ID_HTTP_HEADER = 'x-datadog-parent-id';
59
42
  const errorCodesStopUpload = [400, 403];
60
43
  const MAX_REPORTS_PER_REQUEST = 8; // backend supports 10 attachments, to keep the logic simple we subtract 2: for PR diff and commit diff
61
- const isCoverageReport = (file) => {
62
- if (upath_1.default.extname(file) !== '.xml') {
63
- return false;
64
- }
65
- const filename = upath_1.default.basename(file);
66
- return (filename.startsWith('jacoco') || filename.includes('Jacoco') // jacoco*.xml, *Jacoco*.xml
67
- );
68
- };
69
- const validateReport = (explicitFormat, file) => {
70
- const format = explicitFormat || (0, utils_1.detectFormat)(file);
71
- if (format === undefined) {
72
- return `Could not detect format of ${file}, please specify the format manually using the --format option`;
73
- }
74
- return (0, utils_1.validateCoverageReport)(file, format);
75
- };
76
44
  class UploadCodeCoverageReportCommand extends clipanion_1.Command {
77
45
  constructor() {
78
46
  var _a, _b;
@@ -84,10 +52,8 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
84
52
  this.tags = clipanion_1.Option.Array('--tags');
85
53
  this.format = clipanion_1.Option.String('--format');
86
54
  this.uploadGitDiff = clipanion_1.Option.Boolean('--upload-git-diff', true);
87
- this.automaticReportsDiscovery = clipanion_1.Option.String('--auto-discovery', 'true', {
88
- validator: t.isBoolean(),
89
- tolerateBoolean: true,
90
- });
55
+ this.skipGitMetadataUpload = clipanion_1.Option.Boolean('--skip-git-metadata-upload', false);
56
+ this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
91
57
  this.ignoredPaths = clipanion_1.Option.String('--ignored-paths');
92
58
  this.fips = clipanion_1.Option.Boolean('--fips', false);
93
59
  this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
@@ -100,6 +66,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
100
66
  fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
101
67
  };
102
68
  this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
69
+ this.git = undefined;
103
70
  }
104
71
  execute() {
105
72
  return __awaiter(this, void 0, void 0, function* () {
@@ -110,12 +77,58 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
110
77
  this.context.stderr.write('Positional arguments must be provided\n');
111
78
  return 1;
112
79
  }
80
+ if (this.format && !(0, utils_2.isCoverageFormat)(this.format)) {
81
+ this.context.stderr.write(`Unsupported format: ${this.format}, supported values are [${utils_2.coverageFormats.join(', ')}]\n`);
82
+ return 1;
83
+ }
84
+ const isGitRepository = yield (0, git_metadata_1.isGitRepo)();
85
+ if (isGitRepository) {
86
+ this.git = yield (0, git_1.newSimpleGit)();
87
+ }
88
+ if (!this.skipGitMetadataUpload) {
89
+ if (isGitRepository) {
90
+ const traceId = (0, id_1.default)();
91
+ const requestBuilder = (0, utils_1.getRequestBuilder)({
92
+ baseUrl: api_1.apiUrl,
93
+ apiKey: this.config.apiKey,
94
+ headers: new Map([
95
+ [TRACE_ID_HTTP_HEADER, traceId],
96
+ [PARENT_ID_HTTP_HEADER, traceId],
97
+ ]),
98
+ });
99
+ try {
100
+ this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Syncing git metadata...`);
101
+ let elapsed = 0;
102
+ if (!this.dryRun) {
103
+ elapsed = yield (0, utils_1.timedExecAsync)(this.uploadToGitDB.bind(this), { requestBuilder });
104
+ }
105
+ this.logger.info((0, renderer_1.renderSuccessfulGitDBSync)(this.dryRun, elapsed));
106
+ }
107
+ catch (err) {
108
+ this.logger.info((0, renderer_1.renderFailedGitDBSync)(err));
109
+ }
110
+ }
111
+ else {
112
+ this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Not syncing git metadata (not a git repo)`);
113
+ }
114
+ }
115
+ else {
116
+ this.logger.debug('Not syncing git metadata (skip git upload flag detected)');
117
+ }
113
118
  yield this.uploadCodeCoverageReports();
114
119
  if (!this.dryRun) {
115
120
  this.context.stdout.write((0, renderer_1.renderSuccessfulUploadCommand)());
116
121
  }
117
122
  });
118
123
  }
124
+ uploadToGitDB(opts) {
125
+ return __awaiter(this, void 0, void 0, function* () {
126
+ if (!this.git) {
127
+ return;
128
+ }
129
+ yield (0, gitdb_1.uploadToGitDB)(this.logger, opts.requestBuilder, this.git, this.dryRun, this.gitRepositoryURL);
130
+ });
131
+ }
119
132
  uploadCodeCoverageReports() {
120
133
  return __awaiter(this, void 0, void 0, function* () {
121
134
  // Normalizing the basePath to resolve .. and .
@@ -138,7 +151,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
138
151
  this.logger.error(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.`);
139
152
  throw new Error('API key is missing');
140
153
  }
141
- return (0, api_1.apiConstructor)(api_1.intakeUrl, this.config.apiKey);
154
+ return (0, api_2.apiConstructor)(api_2.intakeUrl, this.config.apiKey);
142
155
  }
143
156
  generatePayloads() {
144
157
  return __awaiter(this, void 0, void 0, function* () {
@@ -172,17 +185,15 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
172
185
  }
173
186
  getPrDiff(spanTags) {
174
187
  return __awaiter(this, void 0, void 0, function* () {
175
- if (!this.uploadGitDiff) {
176
- return undefined;
177
- }
178
- const baseCommit = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH_SHA];
179
- const headCommit = spanTags[tags_1.GIT_HEAD_SHA] || spanTags[tags_1.GIT_SHA];
180
- if (!baseCommit || !headCommit) {
188
+ if (!this.uploadGitDiff || !this.git) {
181
189
  return undefined;
182
190
  }
183
191
  try {
184
- const git = yield (0, git_1.newSimpleGit)();
185
- return yield (0, git_1.getGitDiff)(git, baseCommit, headCommit);
192
+ const pr = yield this.getHeadAndBase(spanTags);
193
+ if (!pr.headSha || !pr.baseSha) {
194
+ return undefined;
195
+ }
196
+ return yield (0, git_1.getGitDiff)(this.git, pr.baseSha, pr.headSha);
186
197
  }
187
198
  catch (e) {
188
199
  this.logger.debug(`Error while trying to calculate PR diff: ${e}`);
@@ -190,6 +201,27 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
190
201
  }
191
202
  });
192
203
  }
204
+ getHeadAndBase(spanTags) {
205
+ return __awaiter(this, void 0, void 0, function* () {
206
+ const headSha = spanTags[tags_1.GIT_HEAD_SHA] || spanTags[tags_1.GIT_SHA];
207
+ if (!headSha) {
208
+ return {};
209
+ }
210
+ const baseSha = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH_SHA];
211
+ if (baseSha) {
212
+ return { headSha, baseSha };
213
+ }
214
+ if (!this.git) {
215
+ return {};
216
+ }
217
+ const baseBranch = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH];
218
+ if (baseBranch) {
219
+ const mergeBase = yield (0, git_1.getMergeBase)(this.git, baseBranch, headSha);
220
+ return { headSha, baseSha: mergeBase };
221
+ }
222
+ return {};
223
+ });
224
+ }
193
225
  getCommitDiff(spanTags) {
194
226
  return __awaiter(this, void 0, void 0, function* () {
195
227
  if (!this.uploadGitDiff) {
@@ -199,9 +231,11 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
199
231
  if (!commit) {
200
232
  return undefined;
201
233
  }
234
+ if (!this.git) {
235
+ return undefined;
236
+ }
202
237
  try {
203
- const git = yield (0, git_1.newSimpleGit)();
204
- return yield (0, git_1.getGitDiff)(git, commit + '^', commit);
238
+ return yield (0, git_1.getGitDiff)(this.git, commit + '^', commit);
205
239
  }
206
240
  catch (e) {
207
241
  this.logger.debug(`Error while trying to calculate commit diff: ${e}`);
@@ -235,18 +269,22 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
235
269
  return Object.assign(Object.assign({}, cliMeasures), envVarMeasures);
236
270
  }
237
271
  getMatchingCoverageReportFilesByFormat() {
238
- const validUniqueFiles = (0, file_finder_1.findFiles)(this.basePaths || ['.'], this.automaticReportsDiscovery, (0, glob_1.parsePathsList)(this.ignoredPaths), isCoverageReport, (filePath) => validateReport(this.format, filePath), (filePath, errorMessage) => this.context.stdout.write((0, renderer_1.renderInvalidFile)(filePath, errorMessage)));
239
- const pathsByFormat = {};
240
- for (const file of validUniqueFiles) {
241
- const format = this.format || (0, utils_1.detectFormat)(file);
242
- if (format === undefined) {
243
- // should not be possible, such files will fail validation
244
- continue;
272
+ return (0, file_finder_1.partitionFiles)(this.basePaths || ['.'], (0, glob_1.parsePathsList)(this.ignoredPaths), this.getCoverageReportFormat.bind(this));
273
+ }
274
+ getCoverageReportFormat(filePath, strict) {
275
+ const format = (0, utils_2.toCoverageFormat)(this.format) || (0, utils_2.detectFormat)(filePath);
276
+ if (!format) {
277
+ if (strict) {
278
+ this.context.stdout.write((0, renderer_1.renderInvalidFile)(filePath, `format could not be detected`));
245
279
  }
246
- pathsByFormat[format] = pathsByFormat[format] || [];
247
- pathsByFormat[format].push(file);
280
+ return undefined;
281
+ }
282
+ const validationError = (0, utils_2.validateCoverageReport)(filePath, format);
283
+ if (validationError) {
284
+ this.context.stdout.write((0, renderer_1.renderInvalidFile)(filePath, validationError));
285
+ return undefined;
248
286
  }
249
- return pathsByFormat;
287
+ return format;
250
288
  }
251
289
  uploadCodeCoverageReport(api, codeCoverageReport) {
252
290
  return __awaiter(this, void 0, void 0, function* () {
@@ -296,6 +334,10 @@ UploadCodeCoverageReportCommand.usage = clipanion_1.Command.Usage({
296
334
  'Upload all code coverage report files in src/unit-test-coverage and src/acceptance-test-coverage',
297
335
  'datadog-ci coverage upload src/unit-test-coverage src/acceptance-test-coverage',
298
336
  ],
337
+ [
338
+ 'Upload all XML code coverage report files in /coverage/ folders, ignoring src/ignored-module-a',
339
+ 'datadog-ci coverage upload **/coverage/*.xml --ignored-paths src/ignored-module-a',
340
+ ],
299
341
  [
300
342
  'Upload all code coverage report files in current directory and add extra tags globally',
301
343
  'datadog-ci coverage upload --tags key1:value1 --tags key2:value2 .',
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/coverage/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/coverage/upload.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,6 @@
1
- export declare const validateCoverageReport: (filePath: string, format: string) => string | undefined;
2
- export declare const detectFormat: (filePath: string) => 'jacoco' | undefined;
1
+ export declare const coverageFormats: readonly ["jacoco", "lcov"];
2
+ export type CoverageFormat = typeof coverageFormats[number];
3
+ export declare const isCoverageFormat: (value: string) => value is "jacoco" | "lcov";
4
+ export declare const toCoverageFormat: (value: string | undefined) => CoverageFormat | undefined;
5
+ export declare const detectFormat: (filePath: string) => CoverageFormat | undefined;
6
+ export declare const validateCoverageReport: (filePath: string, format: CoverageFormat) => string | undefined;
@@ -3,57 +3,105 @@ 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.detectFormat = exports.validateCoverageReport = void 0;
6
+ exports.validateCoverageReport = exports.detectFormat = exports.toCoverageFormat = exports.isCoverageFormat = exports.coverageFormats = void 0;
7
7
  const fs_1 = __importDefault(require("fs"));
8
8
  const fast_xml_parser_1 = require("fast-xml-parser");
9
9
  const upath_1 = __importDefault(require("upath"));
10
10
  const renderer_1 = require("./renderer");
11
11
  const ROOT_TAG_REGEX = /<([^?!\s/>]+)/;
12
- const validateCoverageReport = (filePath, format) => {
13
- if (format === 'jacoco') {
14
- const xmlFileContentString = String(fs_1.default.readFileSync(filePath));
15
- const validationOutput = fast_xml_parser_1.XMLValidator.validate(xmlFileContentString);
16
- if (validationOutput !== true) {
17
- return validationOutput.err.msg;
18
- }
19
- // Check that the root element is 'report' and that the report contains sourcefile tags
20
- const rootTagMatch = xmlFileContentString.match(ROOT_TAG_REGEX);
21
- if (!rootTagMatch || rootTagMatch[1] !== 'report') {
22
- return 'Invalid Jacoco report: root element must be <report>';
23
- }
24
- if (!xmlFileContentString.includes('<sourcefile')) {
25
- return 'Invalid Jacoco report: missing <sourcefile> tags';
26
- }
12
+ const jacocoFormat = 'jacoco';
13
+ const lcovFormat = 'lcov';
14
+ exports.coverageFormats = [jacocoFormat, lcovFormat];
15
+ const isCoverageFormat = (value) => {
16
+ return exports.coverageFormats.includes(value);
17
+ };
18
+ exports.isCoverageFormat = isCoverageFormat;
19
+ const toCoverageFormat = (value) => {
20
+ if (value === undefined) {
21
+ return undefined;
27
22
  }
28
- return undefined;
23
+ if ((0, exports.isCoverageFormat)(value)) {
24
+ return value;
25
+ }
26
+ throw new Error(`Invalid coverage format: ${value}`);
29
27
  };
30
- exports.validateCoverageReport = validateCoverageReport;
28
+ exports.toCoverageFormat = toCoverageFormat;
31
29
  const detectFormat = (filePath) => {
32
30
  if (!fs_1.default.existsSync(filePath)) {
33
31
  return undefined;
34
32
  }
35
- if (upath_1.default.extname(filePath).toLowerCase() !== '.xml') {
36
- return undefined;
33
+ const lowercaseFile = filePath.toLowerCase();
34
+ const filename = upath_1.default.basename(lowercaseFile);
35
+ const extension = upath_1.default.extname(lowercaseFile);
36
+ if (extension === '.xml' && filename.includes('jacoco')) {
37
+ return readFirstKb(filePath, (data) => {
38
+ return data.includes('<!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.1//EN"') ? jacocoFormat : undefined;
39
+ });
40
+ }
41
+ else if (extension === '.lcov' ||
42
+ extension === '.lcov.info' ||
43
+ extension === '.lcov-report.info' ||
44
+ filename === 'lcov.info' ||
45
+ filename === 'lcov-report.info' ||
46
+ filename === 'lcov.dat') {
47
+ return readFirstKb(filePath, (data) => {
48
+ return data.startsWith('TN:') || data.startsWith('SF:') ? lcovFormat : undefined;
49
+ });
37
50
  }
51
+ return undefined;
52
+ };
53
+ exports.detectFormat = detectFormat;
54
+ const readFirstKb = (filePath, action) => {
38
55
  let fd;
39
56
  try {
40
57
  fd = fs_1.default.openSync(filePath, 'r');
41
58
  const buffer = Buffer.alloc(1024);
42
59
  fs_1.default.readSync(fd, buffer, 0, 1024, 0);
43
60
  const data = buffer.toString('utf8');
44
- if (data.includes('<!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.1//EN"')) {
45
- return 'jacoco';
46
- }
61
+ return action(data);
47
62
  }
48
63
  catch (error) {
49
64
  (0, renderer_1.renderFileReadError)(filePath, error);
65
+ return undefined;
50
66
  }
51
67
  finally {
52
68
  if (fd !== undefined) {
53
69
  fs_1.default.closeSync(fd);
54
70
  }
55
71
  }
72
+ };
73
+ const validateCoverageReport = (filePath, format) => {
74
+ if (format === jacocoFormat) {
75
+ const xmlFileContentString = String(fs_1.default.readFileSync(filePath));
76
+ const validationOutput = fast_xml_parser_1.XMLValidator.validate(xmlFileContentString);
77
+ if (validationOutput !== true) {
78
+ return validationOutput.err.msg;
79
+ }
80
+ // Check that the root element is 'report' and that the report contains sourcefile tags
81
+ const rootTagMatch = xmlFileContentString.match(ROOT_TAG_REGEX);
82
+ if (!rootTagMatch || rootTagMatch[1] !== 'report') {
83
+ return 'Invalid Jacoco report: root element must be <report>';
84
+ }
85
+ if (!xmlFileContentString.includes('<sourcefile')) {
86
+ return 'Invalid Jacoco report: missing <sourcefile> tags';
87
+ }
88
+ }
89
+ if (format === lcovFormat) {
90
+ const content = fs_1.default.readFileSync(filePath, 'utf8');
91
+ if (!content.startsWith('TN:') || content.startsWith('SF:')) {
92
+ return 'Invalid LCOV report: must start with TN: or SF:';
93
+ }
94
+ const lines = content.split(/\r?\n/).filter((line) => line.trim().length > 0);
95
+ const hasData = lines.some((line) => line.startsWith('DA:'));
96
+ if (!hasData) {
97
+ return 'Invalid LCOV report: missing DA: lines';
98
+ }
99
+ const endsCorrectly = lines[lines.length - 1] === 'end_of_record';
100
+ if (!endsCorrectly) {
101
+ return 'Invalid LCOV report: does not end with "end_of_record"';
102
+ }
103
+ }
56
104
  return undefined;
57
105
  };
58
- exports.detectFormat = detectFormat;
106
+ exports.validateCoverageReport = validateCoverageReport;
59
107
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/coverage/utils.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,qDAA4C;AAC5C,kDAAyB;AAEzB,yCAA8C;AAE9C,MAAM,cAAc,GAAG,eAAe,CAAA;AAE/B,MAAM,sBAAsB,GAAG,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE;IACzE,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,MAAM,oBAAoB,GAAG,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC9D,MAAM,gBAAgB,GAAG,8BAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;QACpE,IAAI,gBAAgB,KAAK,IAAI,EAAE;YAC7B,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAA;SAChC;QAED,uFAAuF;QACvF,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAC/D,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YACjD,OAAO,sDAAsD,CAAA;SAC9D;QACD,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACjD,OAAO,kDAAkD,CAAA;SAC1D;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAnBY,QAAA,sBAAsB,0BAmBlC;AAEM,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAwB,EAAE;IACrE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAA;KACjB;IACD,IAAI,eAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACpD,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,EAAsB,CAAA;IAC1B,IAAI;QACF,EAAE,GAAG,YAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,YAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAEpC,IAAI,IAAI,CAAC,QAAQ,CAAC,yDAAyD,CAAC,EAAE;YAC5E,OAAO,QAAQ,CAAA;SAChB;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAA,8BAAmB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;KACrC;YAAS;QACR,IAAI,EAAE,KAAK,SAAS,EAAE;YACpB,YAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACjB;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA3BY,QAAA,YAAY,gBA2BxB"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/coverage/utils.ts"],"names":[],"mappings":"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"}
@@ -88,7 +88,7 @@ class GateEvaluateCommand extends clipanion_1.Command {
88
88
  };
89
89
  const api = this.getApiHelper();
90
90
  const spanTags = yield this.getSpanTags();
91
- const headRef = spanTags[tags_1.GIT_BASE_REF];
91
+ const headRef = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH];
92
92
  if (headRef) {
93
93
  const headSha = spanTags[tags_1.GIT_HEAD_SHA];
94
94
  if (headSha) {
@@ -1 +1 @@
1
- {"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ export declare const newSimpleGit: () => Promise<simpleGit.SimpleGit>;
4
4
  export declare const stripCredentials: (remote: string) => string;
5
5
  export declare const gitTrackedFiles: (git: simpleGit.SimpleGit) => Promise<string[]>;
6
6
  export declare const getCommitInfo: (git: simpleGit.SimpleGit, repositoryURL?: string) => Promise<CommitInfo>;
7
+ export declare const getMergeBase: (git: simpleGit.SimpleGit, target: string, source: string) => Promise<string>;
7
8
  export declare const getGitDiff: (git: simpleGit.SimpleGit, from: string, to: string) => Promise<DiffData>;
8
9
  export interface DiffData {
9
10
  head_sha: string;
@@ -32,21 +32,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32
32
  });
33
33
  };
34
34
  Object.defineProperty(exports, "__esModule", { value: true });
35
- exports.parseGitDiff = exports.getGitDiff = exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.newSimpleGit = void 0;
35
+ exports.parseGitDiff = exports.getGitDiff = exports.getMergeBase = exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.newSimpleGit = void 0;
36
36
  const url_1 = require("url");
37
37
  const simpleGit = __importStar(require("simple-git"));
38
+ const simple_git_1 = require("simple-git");
38
39
  const get_git_data_1 = require("../../helpers/git/get-git-data");
39
40
  const interfaces_1 = require("./interfaces");
40
41
  // Returns a configured SimpleGit.
41
42
  const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
43
+ const currentDir = process.cwd();
42
44
  const options = {
43
- baseDir: process.cwd(),
45
+ baseDir: currentDir,
44
46
  binary: 'git',
45
47
  maxConcurrentProcesses: 1,
46
48
  };
49
+ const git = simpleGit.simpleGit(options);
50
+ try {
51
+ // In some CI envs repo may be checked out as a different user than the one running the command.
52
+ // To be able to run git commands, we need to add the current directory as a safe directory.
53
+ yield git.addConfig('safe.directory', currentDir, true, simple_git_1.GitConfigScope.global);
54
+ }
55
+ catch (e) {
56
+ // Ignore the error
57
+ }
47
58
  // Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
48
59
  // returns the tracked files paths relative to the root of the repository.
49
- const git = simpleGit.simpleGit(options);
50
60
  const root = yield git.revparse('--show-toplevel');
51
61
  options.baseDir = root;
52
62
  return simpleGit.simpleGit(options);
@@ -93,6 +103,11 @@ const getCommitInfo = (git, repositoryURL) => __awaiter(void 0, void 0, void 0,
93
103
  return new interfaces_1.CommitInfo(hash, remote, trackedFiles);
94
104
  });
95
105
  exports.getCommitInfo = getCommitInfo;
106
+ const getMergeBase = (git, target, source) => __awaiter(void 0, void 0, void 0, function* () {
107
+ const result = yield git.raw(['merge-base', target, source]);
108
+ return result.trim();
109
+ });
110
+ exports.getMergeBase = getMergeBase;
96
111
  const getGitDiff = (git, from, to) => __awaiter(void 0, void 0, void 0, function* () {
97
112
  const fromResolved = yield git.revparse(from);
98
113
  const toResolved = yield git.revparse(to);
@@ -165,9 +180,8 @@ const base64Encode = (set) => {
165
180
  }
166
181
  const bytes = new Uint8Array(Math.ceil(maxBit / 8));
167
182
  for (const n of set) {
168
- const idx = n - 1;
169
183
  // eslint-disable-next-line no-bitwise
170
- bytes[idx >> 3] |= 1 << (idx & 7);
184
+ bytes[n >> 3] |= 1 << (n & 7);
171
185
  }
172
186
  return Buffer.from(bytes).toString('base64');
173
187
  };
@@ -1 +1 @@
1
- {"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/git.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/git.ts"],"names":[],"mappings":"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"}
@@ -128,7 +128,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
128
128
  changedEnvVars[constants_1.SITE_ENV_VAR] = site;
129
129
  }
130
130
  else {
131
- throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, or ddog-gov.com.');
131
+ throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, or ddog-gov.com.');
132
132
  }
133
133
  }
134
134
  if (site === undefined && oldEnvVars[constants_1.SITE_ENV_VAR] === undefined) {