@datadog/datadog-ci 3.8.0 → 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.
- package/dist/commands/aas/instrument.js +13 -1
- package/dist/commands/aas/instrument.js.map +1 -1
- package/dist/commands/coverage/upload.d.ts +1 -2
- package/dist/commands/coverage/upload.js +43 -61
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +6 -2
- package/dist/commands/coverage/utils.js +72 -24
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/sbom/renderer.d.ts +1 -1
- package/dist/commands/sbom/renderer.js +16 -6
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/sbom/upload.js +1 -1
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/helpers/apikey.d.ts +1 -0
- package/dist/helpers/apikey.js +15 -11
- package/dist/helpers/apikey.js.map +1 -1
- package/dist/helpers/file-finder.d.ts +3 -0
- package/dist/helpers/file-finder.js +49 -2
- package/dist/helpers/file-finder.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,7 +18,10 @@ const identity_1 = require("@azure/identity");
|
|
|
18
18
|
const chalk_1 = __importDefault(require("chalk"));
|
|
19
19
|
const clipanion_1 = require("clipanion");
|
|
20
20
|
const es6_1 = __importDefault(require("fast-deep-equal/es6"));
|
|
21
|
+
const constants_1 = require("../../constants");
|
|
22
|
+
const apikey_1 = require("../../helpers/apikey");
|
|
21
23
|
const renderer_1 = require("../../helpers/renderer");
|
|
24
|
+
const utils_1 = require("../../helpers/utils");
|
|
22
25
|
const common_1 = require("./common");
|
|
23
26
|
class InstrumentCommand extends common_1.AasCommand {
|
|
24
27
|
constructor() {
|
|
@@ -28,6 +31,7 @@ class InstrumentCommand extends common_1.AasCommand {
|
|
|
28
31
|
});
|
|
29
32
|
}
|
|
30
33
|
execute() {
|
|
34
|
+
var _a, _b;
|
|
31
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
36
|
this.enableFips();
|
|
33
37
|
const [config, errors] = yield this.ensureConfig();
|
|
@@ -37,6 +41,14 @@ class InstrumentCommand extends common_1.AasCommand {
|
|
|
37
41
|
}
|
|
38
42
|
return 1;
|
|
39
43
|
}
|
|
44
|
+
const isApiKeyValid = yield (0, apikey_1.newApiKeyValidator)({
|
|
45
|
+
apiKey: process.env.DD_API_KEY,
|
|
46
|
+
datadogSite: (_a = process.env.DD_SITE) !== null && _a !== void 0 ? _a : constants_1.DATADOG_SITE_US1,
|
|
47
|
+
}).validateApiKey();
|
|
48
|
+
if (!isApiKeyValid) {
|
|
49
|
+
this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Invalid API Key stored in the environment variable ${chalk_1.default.bold('DD_API_KEY')}: ${(0, utils_1.maskString)((_b = process.env.DD_API_KEY) !== null && _b !== void 0 ? _b : '')}\nEnsure you copied the value and not the Key ID.`));
|
|
50
|
+
return 1;
|
|
51
|
+
}
|
|
40
52
|
const cred = new identity_1.DefaultAzureCredential();
|
|
41
53
|
try {
|
|
42
54
|
yield cred.getToken('https://management.azure.com/.default');
|
|
@@ -82,7 +94,7 @@ https://docs.datadoghq.com/serverless/azure_app_services/azure_app_services_wind
|
|
|
82
94
|
var _a;
|
|
83
95
|
const envVars = {
|
|
84
96
|
DD_API_KEY: process.env.DD_API_KEY,
|
|
85
|
-
DD_SITE: (_a = process.env.DD_SITE) !== null && _a !== void 0 ? _a :
|
|
97
|
+
DD_SITE: (_a = process.env.DD_SITE) !== null && _a !== void 0 ? _a : constants_1.DATADOG_SITE_US1,
|
|
86
98
|
DD_AAS_INSTANCE_LOGGING_ENABLED: config.isInstanceLoggingEnabled.toString(),
|
|
87
99
|
};
|
|
88
100
|
if (config.service) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/aas/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAA+E;AAC/E,8CAAsD;AACtD,kDAAyB;AACzB,yCAAyC;AACzC,8DAAuC;AAEvC,qDAAqE;
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/aas/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,12 @@ export declare class UploadCodeCoverageReportCommand extends Command {
|
|
|
11
11
|
private uploadGitDiff;
|
|
12
12
|
private skipGitMetadataUpload;
|
|
13
13
|
private gitRepositoryURL;
|
|
14
|
-
private automaticReportsDiscovery;
|
|
15
14
|
private ignoredPaths;
|
|
16
15
|
private fips;
|
|
17
16
|
private fipsIgnoreError;
|
|
18
17
|
private config;
|
|
19
18
|
private logger;
|
|
20
19
|
private git;
|
|
21
|
-
constructor();
|
|
22
20
|
execute(): Promise<1 | undefined>;
|
|
23
21
|
private uploadToGitDB;
|
|
24
22
|
private uploadCodeCoverageReports;
|
|
@@ -31,5 +29,6 @@ export declare class UploadCodeCoverageReportCommand extends Command {
|
|
|
31
29
|
private getCustomTags;
|
|
32
30
|
private getCustomMeasures;
|
|
33
31
|
private getMatchingCoverageReportFilesByFormat;
|
|
32
|
+
private getCoverageReportFormat;
|
|
34
33
|
private uploadCodeCoverageReport;
|
|
35
34
|
}
|
|
@@ -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");
|
|
@@ -65,25 +41,10 @@ const TRACE_ID_HTTP_HEADER = 'x-datadog-trace-id';
|
|
|
65
41
|
const PARENT_ID_HTTP_HEADER = 'x-datadog-parent-id';
|
|
66
42
|
const errorCodesStopUpload = [400, 403];
|
|
67
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
|
|
68
|
-
const isCoverageReport = (file) => {
|
|
69
|
-
if (upath_1.default.extname(file) !== '.xml') {
|
|
70
|
-
return false;
|
|
71
|
-
}
|
|
72
|
-
const filename = upath_1.default.basename(file);
|
|
73
|
-
return (filename.startsWith('jacoco') || filename.includes('Jacoco') // jacoco*.xml, *Jacoco*.xml
|
|
74
|
-
);
|
|
75
|
-
};
|
|
76
|
-
const validateReport = (explicitFormat, file) => {
|
|
77
|
-
const format = explicitFormat || (0, utils_2.detectFormat)(file);
|
|
78
|
-
if (format === undefined) {
|
|
79
|
-
return `Could not detect format of ${file}, please specify the format manually using the --format option`;
|
|
80
|
-
}
|
|
81
|
-
return (0, utils_2.validateCoverageReport)(file, format);
|
|
82
|
-
};
|
|
83
44
|
class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
84
45
|
constructor() {
|
|
85
46
|
var _a, _b;
|
|
86
|
-
super();
|
|
47
|
+
super(...arguments);
|
|
87
48
|
this.basePaths = clipanion_1.Option.Rest({ required: 1 });
|
|
88
49
|
this.verbose = clipanion_1.Option.Boolean('--verbose', false);
|
|
89
50
|
this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
|
|
@@ -93,10 +54,6 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
93
54
|
this.uploadGitDiff = clipanion_1.Option.Boolean('--upload-git-diff', true);
|
|
94
55
|
this.skipGitMetadataUpload = clipanion_1.Option.Boolean('--skip-git-metadata-upload', false);
|
|
95
56
|
this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
|
|
96
|
-
this.automaticReportsDiscovery = clipanion_1.Option.String('--auto-discovery', 'true', {
|
|
97
|
-
validator: t.isBoolean(),
|
|
98
|
-
tolerateBoolean: true,
|
|
99
|
-
});
|
|
100
57
|
this.ignoredPaths = clipanion_1.Option.String('--ignored-paths');
|
|
101
58
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
102
59
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
@@ -109,7 +66,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
109
66
|
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
110
67
|
};
|
|
111
68
|
this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
|
|
112
|
-
this.git =
|
|
69
|
+
this.git = undefined;
|
|
113
70
|
}
|
|
114
71
|
execute() {
|
|
115
72
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -120,8 +77,16 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
120
77
|
this.context.stderr.write('Positional arguments must be provided\n');
|
|
121
78
|
return 1;
|
|
122
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
|
+
}
|
|
123
88
|
if (!this.skipGitMetadataUpload) {
|
|
124
|
-
if (
|
|
89
|
+
if (isGitRepository) {
|
|
125
90
|
const traceId = (0, id_1.default)();
|
|
126
91
|
const requestBuilder = (0, utils_1.getRequestBuilder)({
|
|
127
92
|
baseUrl: api_1.apiUrl,
|
|
@@ -158,7 +123,10 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
158
123
|
}
|
|
159
124
|
uploadToGitDB(opts) {
|
|
160
125
|
return __awaiter(this, void 0, void 0, function* () {
|
|
161
|
-
|
|
126
|
+
if (!this.git) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
yield (0, gitdb_1.uploadToGitDB)(this.logger, opts.requestBuilder, this.git, this.dryRun, this.gitRepositoryURL);
|
|
162
130
|
});
|
|
163
131
|
}
|
|
164
132
|
uploadCodeCoverageReports() {
|
|
@@ -217,7 +185,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
217
185
|
}
|
|
218
186
|
getPrDiff(spanTags) {
|
|
219
187
|
return __awaiter(this, void 0, void 0, function* () {
|
|
220
|
-
if (!this.uploadGitDiff) {
|
|
188
|
+
if (!this.uploadGitDiff || !this.git) {
|
|
221
189
|
return undefined;
|
|
222
190
|
}
|
|
223
191
|
try {
|
|
@@ -225,7 +193,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
225
193
|
if (!pr.headSha || !pr.baseSha) {
|
|
226
194
|
return undefined;
|
|
227
195
|
}
|
|
228
|
-
return yield (0, git_1.getGitDiff)(
|
|
196
|
+
return yield (0, git_1.getGitDiff)(this.git, pr.baseSha, pr.headSha);
|
|
229
197
|
}
|
|
230
198
|
catch (e) {
|
|
231
199
|
this.logger.debug(`Error while trying to calculate PR diff: ${e}`);
|
|
@@ -243,9 +211,12 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
243
211
|
if (baseSha) {
|
|
244
212
|
return { headSha, baseSha };
|
|
245
213
|
}
|
|
214
|
+
if (!this.git) {
|
|
215
|
+
return {};
|
|
216
|
+
}
|
|
246
217
|
const baseBranch = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH];
|
|
247
218
|
if (baseBranch) {
|
|
248
|
-
const mergeBase = yield (0, git_1.getMergeBase)(
|
|
219
|
+
const mergeBase = yield (0, git_1.getMergeBase)(this.git, baseBranch, headSha);
|
|
249
220
|
return { headSha, baseSha: mergeBase };
|
|
250
221
|
}
|
|
251
222
|
return {};
|
|
@@ -260,8 +231,11 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
260
231
|
if (!commit) {
|
|
261
232
|
return undefined;
|
|
262
233
|
}
|
|
234
|
+
if (!this.git) {
|
|
235
|
+
return undefined;
|
|
236
|
+
}
|
|
263
237
|
try {
|
|
264
|
-
return yield (0, git_1.getGitDiff)(
|
|
238
|
+
return yield (0, git_1.getGitDiff)(this.git, commit + '^', commit);
|
|
265
239
|
}
|
|
266
240
|
catch (e) {
|
|
267
241
|
this.logger.debug(`Error while trying to calculate commit diff: ${e}`);
|
|
@@ -295,18 +269,22 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
295
269
|
return Object.assign(Object.assign({}, cliMeasures), envVarMeasures);
|
|
296
270
|
}
|
|
297
271
|
getMatchingCoverageReportFilesByFormat() {
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
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`));
|
|
305
279
|
}
|
|
306
|
-
|
|
307
|
-
|
|
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;
|
|
308
286
|
}
|
|
309
|
-
return
|
|
287
|
+
return format;
|
|
310
288
|
}
|
|
311
289
|
uploadCodeCoverageReport(api, codeCoverageReport) {
|
|
312
290
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -356,6 +334,10 @@ UploadCodeCoverageReportCommand.usage = clipanion_1.Command.Usage({
|
|
|
356
334
|
'Upload all code coverage report files in src/unit-test-coverage and src/acceptance-test-coverage',
|
|
357
335
|
'datadog-ci coverage upload src/unit-test-coverage src/acceptance-test-coverage',
|
|
358
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
|
+
],
|
|
359
341
|
[
|
|
360
342
|
'Upload all code coverage report files in current directory and add extra tags globally',
|
|
361
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
|
|
2
|
-
export
|
|
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.
|
|
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
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
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
|
-
|
|
23
|
+
if ((0, exports.isCoverageFormat)(value)) {
|
|
24
|
+
return value;
|
|
25
|
+
}
|
|
26
|
+
throw new Error(`Invalid coverage format: ${value}`);
|
|
29
27
|
};
|
|
30
|
-
exports.
|
|
28
|
+
exports.toCoverageFormat = toCoverageFormat;
|
|
31
29
|
const detectFormat = (filePath) => {
|
|
32
30
|
if (!fs_1.default.existsSync(filePath)) {
|
|
33
31
|
return undefined;
|
|
34
32
|
}
|
|
35
|
-
|
|
36
|
-
|
|
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
|
-
|
|
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.
|
|
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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/coverage/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export declare const renderInvalidFile: (sbomReport: string) => string;
|
|
|
3
3
|
export declare const renderInvalidPayload: (sbomReport: string) => string;
|
|
4
4
|
export declare const renderDuplicateUpload: (branch: string, sha: string) => string;
|
|
5
5
|
export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
|
|
6
|
-
export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
|
|
6
|
+
export declare const renderFailedUpload: (sbomReport: string, error: any, debug: boolean) => string;
|
|
7
7
|
export declare const renderUploading: (sbomReport: string, scaRequest: ScaRequest) => string;
|
|
8
8
|
export declare const renderSuccessfulCommand: (duration: number) => string;
|
|
9
9
|
export declare const renderPayloadWarning: (dependencies: Dependency[]) => string;
|
|
@@ -49,13 +49,23 @@ const renderNoDefaultBranch = (repositoryUrl) => {
|
|
|
49
49
|
return fullStr;
|
|
50
50
|
};
|
|
51
51
|
exports.renderNoDefaultBranch = renderNoDefaultBranch;
|
|
52
|
-
const renderFailedUpload = (sbomReport, error) => {
|
|
53
|
-
var _a;
|
|
52
|
+
const renderFailedUpload = (sbomReport, error, debug) => {
|
|
53
|
+
var _a, _b, _c, _d;
|
|
54
54
|
const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
|
|
55
55
|
let fullStr = '';
|
|
56
56
|
fullStr += chalk_1.default.red(`${ICONS.FAILED} Failed upload SBOM file ${reportPath}: ${error.message}\n`);
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
const status = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status;
|
|
58
|
+
const errors = (_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.errors;
|
|
59
|
+
if (status) {
|
|
60
|
+
let str = `API status code: ${status}`;
|
|
61
|
+
// Always show the first error detail if present
|
|
62
|
+
if (Array.isArray(errors) && errors.length > 0 && errors[0].detail) {
|
|
63
|
+
str += `, Detail: ${errors[0].detail}`;
|
|
64
|
+
}
|
|
65
|
+
fullStr += chalk_1.default.red(`${str}\n`);
|
|
66
|
+
}
|
|
67
|
+
if (debug && Array.isArray(errors)) {
|
|
68
|
+
fullStr += chalk_1.default.red(`API full error response:\n${JSON.stringify((_d = error === null || error === void 0 ? void 0 : error.response) === null || _d === void 0 ? void 0 : _d.data, undefined, 2)}\n`);
|
|
59
69
|
}
|
|
60
70
|
return fullStr;
|
|
61
71
|
};
|
|
@@ -65,12 +75,12 @@ const renderUploading = (sbomReport, scaRequest) => {
|
|
|
65
75
|
for (const dep of scaRequest.dependencies) {
|
|
66
76
|
languages.add(dep.language.toString());
|
|
67
77
|
}
|
|
68
|
-
return `Uploading SBOM report in ${sbomReport} (${scaRequest.dependencies.length} dependencies detected for languages ${Array.from(languages).join(',')})\nUpload for repository ${scaRequest.repository.url}, branch ${scaRequest.commit.branch}\n`;
|
|
78
|
+
return `Uploading SBOM report in ${sbomReport} (${scaRequest.dependencies.length} dependencies detected for languages ${Array.from(languages).join(',')})\nUpload for repository ${scaRequest.repository.url}, branch ${scaRequest.commit.branch}, sha ${scaRequest.commit.sha}\n`;
|
|
69
79
|
};
|
|
70
80
|
exports.renderUploading = renderUploading;
|
|
71
81
|
const renderSuccessfulCommand = (duration) => {
|
|
72
82
|
let fullStr = '';
|
|
73
|
-
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded file in ${duration} seconds.\n`);
|
|
83
|
+
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded SBOM file in ${duration} seconds.\n`);
|
|
74
84
|
fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
75
85
|
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
76
86
|
return fullStr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAGzC,6CAAmD;AAEnD,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IACpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;IAE1G,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC;AAEM,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE;IACnE,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAA;IACrE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,iDAAiD,MAAM,YAAY,GAAG,IAAI,CAAC,CAAA;IAChG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;IAClE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAA;IACnG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,qBAAqB,yBASjC;AAEM,MAAM,qBAAqB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7D,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,4CAA4C,aAAa,IAAI,CAAC,CAAA;IACnG,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;IACnE,OAAO,IAAI,eAAK,CAAC,GAAG,CAClB,sHAAsH,CACvH,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,GAAG,CAClB,eAAe,IAAA,kBAAU,GAAE,wFAAwF,CACpH,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,mFAAmF,CAAC,CAAA;IAEzG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAdY,QAAA,qBAAqB,yBAcjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,7 +131,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
131
131
|
return 1;
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
-
this.context.stderr.write((0, renderer_2.renderFailedUpload)(basePath, error));
|
|
134
|
+
this.context.stderr.write((0, renderer_2.renderFailedUpload)(basePath, error, !!this.debug));
|
|
135
135
|
return 1;
|
|
136
136
|
}
|
|
137
137
|
const uploadTimeMs = (Date.now() - startTimeMs) / 1000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/apikey.d.ts
CHANGED
package/dist/helpers/apikey.js
CHANGED
|
@@ -45,17 +45,10 @@ class ApiKeyValidatorImplem {
|
|
|
45
45
|
}
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
if (this.isValid === undefined) {
|
|
54
|
-
this.isValid = yield this.validateApiKey();
|
|
55
|
-
}
|
|
56
|
-
return this.isValid;
|
|
57
|
-
});
|
|
58
|
-
}
|
|
48
|
+
/**
|
|
49
|
+
* Check if the API key is valid by making a request to the Datadog validate API.
|
|
50
|
+
* @returns `true` if the API key is valid, `false` otherwise.
|
|
51
|
+
*/
|
|
59
52
|
validateApiKey() {
|
|
60
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
54
|
try {
|
|
@@ -74,5 +67,16 @@ class ApiKeyValidatorImplem {
|
|
|
74
67
|
}
|
|
75
68
|
});
|
|
76
69
|
}
|
|
70
|
+
getApiKeyValidationURL() {
|
|
71
|
+
return `https://api.${this.datadogSite}/api/v1/validate`;
|
|
72
|
+
}
|
|
73
|
+
isApiKeyValid() {
|
|
74
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
if (this.isValid === undefined) {
|
|
76
|
+
this.isValid = yield this.validateApiKey();
|
|
77
|
+
}
|
|
78
|
+
return this.isValid;
|
|
79
|
+
});
|
|
80
|
+
}
|
|
77
81
|
}
|
|
78
82
|
//# sourceMappingURL=apikey.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../../src/helpers/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,kDAAyB;AAGzB,qCAAkD;
|
|
1
|
+
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../../src/helpers/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,kDAAyB;AAGzB,qCAAkD;AAgB3C,MAAM,kBAAkB,GAAG,CAAC,MAA6B,EAAmB,EAAE,CACnF,IAAI,qBAAqB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;AADvE,QAAA,kBAAkB,sBACqD;AAEpF;;GAEG;AACH,MAAM,qBAAqB;IAOzB,YAAY,MAA0B,EAAE,WAAmB,EAAE,aAAqC;QAChG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED;;;;OAIG;IACU,YAAY,CAAC,KAAiB;;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAChC,OAAM;aACP;YACD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE;gBACrG,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;oBACpC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;iBAChD;gBACD,MAAM,IAAI,kCAAyB,CACjC,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,sDAAsD,IAAI,CAAC,WAAW,EAAE,CAC7G,CAAA;aACF;QACH,CAAC;KAAA;IAED;;;OAGG;IACU,cAAc;;YACzB,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;oBAC9D,OAAO,EAAE;wBACP,YAAY,EAAE,IAAI,CAAC,MAAM;qBAC1B;iBACF,CAAC,CAAA;gBAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;oBACnD,OAAO,KAAK,CAAA;iBACb;gBACD,MAAM,KAAK,CAAA;aACZ;QACH,CAAC;KAAA;IAEO,sBAAsB;QAC5B,OAAO,eAAe,IAAI,CAAC,WAAW,kBAAkB,CAAA;IAC1D,CAAC;IAEa,aAAa;;YACzB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;aAC3C;YAED,OAAO,IAAI,CAAC,OAAO,CAAA;QACrB,CAAC;KAAA;CACF"}
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.findFiles = void 0;
|
|
26
|
+
exports.findFiles = exports.partitionFiles = void 0;
|
|
27
27
|
const fs = __importStar(require("fs"));
|
|
28
28
|
const glob_1 = require("./glob");
|
|
29
29
|
const utils_1 = require("./utils");
|
|
@@ -55,12 +55,59 @@ const DEFAULT_IGNORED_FOLDERS = [
|
|
|
55
55
|
'bower_components',
|
|
56
56
|
'conftest_*.c.gcov',
|
|
57
57
|
'htmlcov',
|
|
58
|
-
'js/generated/coverage',
|
|
59
58
|
'jspm_packages',
|
|
60
59
|
'node_modules',
|
|
61
60
|
'virtualenv',
|
|
62
61
|
'virtualenvs',
|
|
63
62
|
];
|
|
63
|
+
const partitionFiles = (basePaths, ignoredPaths,
|
|
64
|
+
// strict is set to true when the path is a file that was specified explicitly:
|
|
65
|
+
// for such files stricter validation is applied
|
|
66
|
+
partition) => {
|
|
67
|
+
const results = {};
|
|
68
|
+
for (const basePath of basePaths) {
|
|
69
|
+
if ((0, glob_1.hasMagic)(basePath)) {
|
|
70
|
+
// glob pattern
|
|
71
|
+
const globMatches = (0, glob_1.globSync)(basePath, { dotRelative: true });
|
|
72
|
+
for (const globMatch of globMatches) {
|
|
73
|
+
partitionFilesRecursive(globMatch, ignoredPaths, partition, results, false);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
partitionFilesRecursive(basePath, ignoredPaths, partition, results, true);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
// deduplicate
|
|
81
|
+
for (const key in results) {
|
|
82
|
+
if (results.hasOwnProperty(key)) {
|
|
83
|
+
results[key] = [...new Set(results[key])];
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return results;
|
|
87
|
+
};
|
|
88
|
+
exports.partitionFiles = partitionFiles;
|
|
89
|
+
const partitionFilesRecursive = (path, ignoredPaths, partition, results, strict) => {
|
|
90
|
+
if (!fs.existsSync(path)) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
if ((0, utils_1.isFile)(path)) {
|
|
94
|
+
// regular file
|
|
95
|
+
const pathPartition = partition(path, strict);
|
|
96
|
+
if (pathPartition) {
|
|
97
|
+
results[pathPartition] = results[pathPartition] || [];
|
|
98
|
+
results[pathPartition].push(path);
|
|
99
|
+
}
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
const entries = fs.readdirSync(path, { withFileTypes: true });
|
|
103
|
+
for (const entry of entries) {
|
|
104
|
+
const fullPath = (0, utils_1.buildPath)(path, entry.name);
|
|
105
|
+
if (ignoredPaths.includes(fullPath) || DEFAULT_IGNORED_FOLDERS.includes(entry.name)) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
partitionFilesRecursive(fullPath, ignoredPaths, partition, results, false);
|
|
109
|
+
}
|
|
110
|
+
};
|
|
64
111
|
/**
|
|
65
112
|
* Finds and validates files based on the provided base paths.
|
|
66
113
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-finder.js","sourceRoot":"","sources":["../../src/helpers/file-finder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AAExB,iCAAyC;AACzC,mCAAyC;AAEzC,MAAM,uBAAuB,GAAG;IAC9B,WAAW;IACX,YAAY;IACZ,MAAM;IACN,OAAO;IACP,MAAM;IACN,SAAS;IACT,SAAS;IACT,KAAK;IACL,SAAS;IACT,KAAK;IACL,OAAO;IACP,MAAM;IACN,SAAS;IACT,MAAM;IACN,aAAa;IACb,MAAM;IACN,OAAO;IACP,QAAQ;IACR,aAAa;IACb,cAAc;IACd,SAAS;IACT,OAAO;IACP,aAAa;IACb,aAAa;IACb,kBAAkB;IAClB,mBAAmB;IACnB,SAAS;IACT,
|
|
1
|
+
{"version":3,"file":"file-finder.js","sourceRoot":"","sources":["../../src/helpers/file-finder.ts"],"names":[],"mappings":"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"}
|