@datadog/datadog-ci 2.47.0 → 3.0.0

package/dist/commands/sbom/language.js

@@ -6,7 +6,11 @@ const types_1 = require("./types");
 // the bom-ref or the purl property of the SBOM.
 const getLanguageFromComponent = (component) => {
     const componentName = component['name'];
+    let purlDisplay = 'N/A';
     if (component['bom-ref']) {
+        if (component['purl']) {
+            purlDisplay = component['purl'];
+        }
         if (component['bom-ref'].includes('pkg:npm') || component['purl'].includes('pkg:npm')) {
             return types_1.DependencyLanguage.NPM;
         }
@@ -32,7 +36,7 @@ const getLanguageFromComponent = (component) => {
             return types_1.DependencyLanguage.DOTNET;
         }
     }
-    console.debug(`language for component ${componentName} not found`);
+    console.debug(`language not detected for ${componentName} with due to purl (${purlDisplay})`);
     return undefined;
 };
 exports.getLanguageFromComponent = getLanguageFromComponent;

package/dist/commands/sbom/language.js.map

@@ -1 +1 @@
-{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,0BAA0B,aAAa,YAAY,CAAC,CAAA;IAElE,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAjCY,QAAA,wBAAwB,4BAiCpC"}
+{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACrB,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;SAChC;QAED,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,6BAA6B,aAAa,sBAAsB,WAAW,GAAG,CAAC,CAAA;IAE7F,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAvCY,QAAA,wBAAwB,4BAuCpC"}

package/dist/commands/sbom/renderer.d.ts

@@ -1,9 +1,9 @@
-import { Dependency } from './types';
+import { Dependency, ScaRequest } from './types';
 export declare const renderInvalidFile: (sbomReport: string) => string;
 export declare const renderInvalidPayload: (sbomReport: string) => string;
 export declare const renderDuplicateUpload: (sha: string, env: string, service: string) => string;
 export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
 export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
-export declare const renderUploading: (sbomReport: string) => string;
+export declare const renderUploading: (sbomReport: string, scaRequest: ScaRequest) => string;
 export declare const renderSuccessfulCommand: (duration: number) => string;
 export declare const renderPayloadWarning: (dependencies: Dependency[]) => string;

package/dist/commands/sbom/renderer.js

@@ -59,7 +59,13 @@ const renderFailedUpload = (sbomReport, error) => {
     return fullStr;
 };
 exports.renderFailedUpload = renderFailedUpload;
-const renderUploading = (sbomReport) => `Uploading SBOM report in ${sbomReport}\n`;
+const renderUploading = (sbomReport, scaRequest) => {
+    const languages = new Set();
+    for (const dep of scaRequest.dependencies) {
+        languages.add(dep.language.toString());
+    }
+    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`;
+};
 exports.renderUploading = renderUploading;
 const renderSuccessfulCommand = (duration) => {
     let fullStr = '';

package/dist/commands/sbom/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/upload.d.ts

@@ -3,7 +3,7 @@ export declare class UploadSbomCommand extends Command {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     private basePath;
-    private service;
+    private serviceFromCli;
     private env;
     private tags;
     private debug;

package/dist/commands/sbom/upload.js

@@ -31,7 +31,7 @@ class UploadSbomCommand extends clipanion_1.Command {
         var _a, _b;
         super(...arguments);
         this.basePath = clipanion_1.Option.String();
-        this.service = clipanion_1.Option.String('--service', 'datadog-ci');
+        this.serviceFromCli = clipanion_1.Option.String('--service');
         this.env = clipanion_1.Option.String('--env', 'ci');
         this.tags = clipanion_1.Option.Array('--tags');
         this.debug = clipanion_1.Option.Boolean('--debug');
@@ -58,7 +58,13 @@ class UploadSbomCommand extends clipanion_1.Command {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
-            const service = this.service;
+            // TODO(julien): remove this notice in April 2025
+            if (this.serviceFromCli !== undefined) {
+                this.context.stderr.write('The CLI flag `--service` is deprecated and will be removed in a future version of datadog-ci\n');
+                this.context.stderr.write('To associate findings with services, consider using the service-to-repo mapping from service catalog\n');
+                this.context.stderr.write('Learn more at https://docs.datadoghq.com/getting_started/code_security/?tab=staticcodeanalysissast#link-datadog-services-to-repository-scan-results\n');
+            }
+            const service = 'datadog-ci';
             const environment = this.env;
             if (!this.basePath || !this.basePath.length) {
                 this.context.stderr.write('Missing basePath\n');
@@ -103,7 +109,8 @@ class UploadSbomCommand extends clipanion_1.Command {
                     return 1;
                 }
                 this.context.stdout.write((0, renderer_2.renderPayloadWarning)(scaPayload.dependencies));
-                this.context.stdout.write((0, renderer_2.renderUploading)(basePath));
+                scaPayload.dependencies = (0, validation_1.filterInvalidDependencies)(scaPayload.dependencies);
+                this.context.stdout.write((0, renderer_2.renderUploading)(basePath, scaPayload));
                 yield api(scaPayload);
                 if (this.debug) {
                     this.context.stdout.write(`Upload done for ${basePath}.\n`);
@@ -139,6 +146,6 @@ UploadSbomCommand.usage = clipanion_1.Command.Usage({
     details: `
       This command uploads SBOM files to Datadog for dependency tracking.
     `,
-    examples: [['Upload the SBOM file sbom.json', 'datadog-ci sbom upload --service my-service file.sbom']],
+    examples: [['Upload the SBOM file sbom.json', 'datadog-ci sbom upload file.sbom']],
 });
 //# sourceMappingURL=upload.js.map

package/dist/commands/sbom/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/validation.d.ts

@@ -19,4 +19,9 @@ export declare const validateSbomFileAgainstSchema: (path: string, ajv: Ajv, deb
  * @param debug - if we need to show debug information
  */
 export declare const validateFileAgainstToolRequirements: (path: string, debug: boolean) => boolean;
+/**
+ * Filter invalid dependencies if some data is not compliant to what we expect.
+ * @param dependencies
+ */
+export declare const filterInvalidDependencies: (dependencies: Dependency[]) => Dependency[];
 export declare const validateDependencyName: (dependency: Dependency) => boolean;

package/dist/commands/sbom/validation.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateDependencyName = exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
+exports.validateDependencyName = exports.filterInvalidDependencies = exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
 const fs_1 = __importDefault(require("fs"));
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
@@ -117,15 +117,6 @@ const validateFileAgainstToolRequirements = (path, debug) => {
                     }
                     return false;
                 }
-                else {
-                    try {
-                        packageurl_js_1.PackageURL.fromString(component['purl']);
-                    }
-                    catch (purlError) {
-                        process.stderr.write(`invalid purl ${component['purl']} for component ${component['name']}: ${purlError.message}\n`);
-                        return false;
-                    }
-                }
             }
         }
     }
@@ -138,6 +129,28 @@ const validateFileAgainstToolRequirements = (path, debug) => {
     return true;
 };
 exports.validateFileAgainstToolRequirements = validateFileAgainstToolRequirements;
+/**
+ * Filter invalid dependencies if some data is not compliant to what we expect.
+ * @param dependencies
+ */
+const filterInvalidDependencies = (dependencies) => {
+    const filteredDependencies = [];
+    for (const dep of dependencies) {
+        let isValid = true;
+        try {
+            packageurl_js_1.PackageURL.fromString(dep.purl);
+        }
+        catch (purlError) {
+            isValid = false;
+            process.stderr.write(`invalid purl ${dep.purl} for component ${dep.name}\n`);
+        }
+        if (isValid) {
+            filteredDependencies.push(dep);
+        }
+    }
+    return filteredDependencies;
+};
+exports.filterInvalidDependencies = filterInvalidDependencies;
 const pythonPackaNameRegex = new RegExp('^[a-zA-Z0-9][a-zA-Z0-9\\-_.]*[a-zA-Z0-9]$');
 const validateDependencyName = (dependency) => {
     if (dependency.language === types_1.DependencyLanguage.PYTHON && !pythonPackaNameRegex.test(dependency.name)) {

package/dist/commands/sbom/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}

package/dist/commands/sourcemaps/__tests__/upload.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/sourcemaps/__tests__/upload.test.js

@@ -0,0 +1,270 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = __importDefault(require("os"));
+const chalk_1 = __importDefault(require("chalk"));
+const advanced_1 = require("clipanion/lib/advanced");
+const interfaces_1 = require("../interfaces");
+const upload_1 = require("../upload");
+describe('upload', () => {
+    describe('getMinifiedURL', () => {
+        test('should return correct URL', () => {
+            const command = new upload_1.UploadCommand();
+            command['basePath'] = '/js/sourcemaps';
+            command['minifiedPathPrefix'] = 'http://datadog.com/js';
+            expect(command['getMinifiedURLAndRelativePath']('/js/sourcemaps/common.min.js.map')).toStrictEqual([
+                'http://datadog.com/js/common.min.js.map',
+                '/common.min.js.map',
+            ]);
+        });
+    });
+    describe('getMinifiedURL: minifiedPathPrefix has the protocol omitted', () => {
+        test('should return correct URL', () => {
+            const command = new upload_1.UploadCommand();
+            command['basePath'] = '/js/sourcemaps';
+            command['minifiedPathPrefix'] = '//datadog.com/js';
+            expect(command['getMinifiedURLAndRelativePath']('/js/sourcemaps/common.min.js.map')).toStrictEqual([
+                '//datadog.com/js/common.min.js.map',
+                '/common.min.js.map',
+            ]);
+        });
+    });
+    describe('getMinifiedURL: minifiedPathPrefix is an absolute path', () => {
+        test('should return correct URL', () => {
+            const command = new upload_1.UploadCommand();
+            command['basePath'] = '/js/sourcemaps';
+            command['minifiedPathPrefix'] = '/js';
+            expect(command['getMinifiedURLAndRelativePath']('/js/sourcemaps/common.min.js.map')).toStrictEqual([
+                '/js/common.min.js.map',
+                '/common.min.js.map',
+            ]);
+        });
+    });
+    describe('isMinifiedPathPrefixValid: full URL', () => {
+        test('should return true', () => {
+            const command = new upload_1.UploadCommand();
+            command['minifiedPathPrefix'] = 'http://datadog.com/js';
+            expect(command['isMinifiedPathPrefixValid']()).toBe(true);
+        });
+    });
+    describe('isMinifiedPathPrefixValid: URL without protocol', () => {
+        test('should return true', () => {
+            const command = new upload_1.UploadCommand();
+            command['minifiedPathPrefix'] = '//datadog.com/js';
+            expect(command['isMinifiedPathPrefixValid']()).toBe(true);
+        });
+    });
+    describe('isMinifiedPathPrefixValid: leading slash', () => {
+        test('should return true', () => {
+            const command = new upload_1.UploadCommand();
+            command['minifiedPathPrefix'] = '/js';
+            expect(command['isMinifiedPathPrefixValid']()).toBe(true);
+        });
+    });
+    describe('isMinifiedPathPrefixValid: no leading slash', () => {
+        test('should return false', () => {
+            const command = new upload_1.UploadCommand();
+            command['minifiedPathPrefix'] = 'js';
+            expect(command['isMinifiedPathPrefixValid']()).toBe(false);
+        });
+    });
+    describe('isMinifiedPathPrefixValid: invalid URL without host', () => {
+        test('should return false', () => {
+            const command = new upload_1.UploadCommand();
+            command['minifiedPathPrefix'] = 'info: undesired log line\nhttps://example.com/static/js/';
+            expect(command['isMinifiedPathPrefixValid']()).toBe(false);
+        });
+    });
+    describe('getApiHelper', () => {
+        test('should throw an error if API key is undefined', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env = {};
+            const command = new upload_1.UploadCommand();
+            expect(command['getRequestBuilder'].bind(command)).toThrow(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment.`);
+        }));
+    });
+    describe('addRepositoryDataToPayloads', () => {
+        test('repository url and commit still defined without payload', () => __awaiter(void 0, void 0, void 0, function* () {
+            const command = new upload_1.UploadCommand();
+            const write = jest.fn();
+            command.context = { stdout: { write } };
+            const sourcemaps = new Array(new interfaces_1.Sourcemap('src/commands/sourcemaps/__tests__/fixtures/sourcemap-with-no-files/empty.min.js', 'http://example/empty.min.js', 'src/commands/sourcemaps/__tests__/fixtures/sourcemap-with-no-files/empty.min.js.map', '', ''));
+            // The command will fetch git metadatas for the current datadog-ci repository.
+            // The `empty.min.js.map` contains no files, therefore no file payload should be set.
+            yield command['addRepositoryDataToPayloads'](sourcemaps);
+            expect(sourcemaps[0].gitData).toBeDefined();
+            expect(sourcemaps[0].gitData.gitRepositoryURL).toBeDefined();
+            expect(sourcemaps[0].gitData.gitCommitSha).toHaveLength(40);
+            expect(sourcemaps[0].gitData.gitRepositoryPayload).toBeUndefined();
+        }));
+        test('should include payload', () => __awaiter(void 0, void 0, void 0, function* () {
+            const command = new upload_1.UploadCommand();
+            const write = jest.fn();
+            command.context = { stdout: { write } };
+            const sourcemaps = new Array(new interfaces_1.Sourcemap('src/commands/sourcemaps/__tests__/fixtures/basic/common.min.js', 'http://example/common.min.js', 'src/commands/sourcemaps/__tests__/fixtures/basic/common.min.js.map', '', ''));
+            // The command will fetch git metadatas for the current datadog-ci repository.
+            // The `common.min.js.map` contains the "git.test.ts" filename which matches a tracked filename,
+            // therefore a file payload should be set.
+            // Removing the "git.test.ts" file will break this test.
+            yield command['addRepositoryDataToPayloads'](sourcemaps);
+            expect(sourcemaps[0].gitData).toBeDefined();
+            expect(sourcemaps[0].gitData.gitRepositoryURL).toBeDefined();
+            expect(sourcemaps[0].gitData.gitCommitSha).toHaveLength(40);
+            expect(sourcemaps[0].gitData.gitRepositoryPayload).toBeDefined();
+        }));
+    });
+});
+describe('execute', () => {
+    const runCLI = (path) => __awaiter(void 0, void 0, void 0, function* () {
+        const cli = makeCli();
+        const context = createMockContext();
+        process.env = { DATADOG_API_KEY: 'PLACEHOLDER' };
+        const code = yield cli.run([
+            'sourcemaps',
+            'upload',
+            path,
+            '--release-version',
+            '1234',
+            '--service',
+            'test-service',
+            '--minified-path-prefix',
+            'https://static.com/js',
+            '--dry-run',
+        ], context);
+        return { context, code };
+    });
+    test('relative path with double dots', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/doesnotexist/../fixtures/basic');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePath: 'src/commands/sourcemaps/__tests__/fixtures/basic',
+            concurrency: 20,
+            jsFilesURLs: ['https://static.com/js/common.min.js'],
+            minifiedPathPrefix: 'https://static.com/js',
+            projectPath: '',
+            service: 'test-service',
+            sourcemapsPaths: ['src/commands/sourcemaps/__tests__/fixtures/basic/common.min.js.map'],
+            version: '1234',
+        });
+    }));
+    test('relative path', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/fixtures/basic');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePath: 'src/commands/sourcemaps/__tests__/fixtures/basic',
+            concurrency: 20,
+            jsFilesURLs: ['https://static.com/js/common.min.js'],
+            minifiedPathPrefix: 'https://static.com/js',
+            projectPath: '',
+            service: 'test-service',
+            sourcemapsPaths: ['src/commands/sourcemaps/__tests__/fixtures/basic/common.min.js.map'],
+            version: '1234',
+        });
+    }));
+    test('absolute path', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI(process.cwd() + '/src/commands/sourcemaps/__tests__/fixtures/basic');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePath: `${process.cwd()}/src/commands/sourcemaps/__tests__/fixtures/basic`,
+            concurrency: 20,
+            jsFilesURLs: ['https://static.com/js/common.min.js'],
+            minifiedPathPrefix: 'https://static.com/js',
+            projectPath: '',
+            service: 'test-service',
+            sourcemapsPaths: [`${process.cwd()}/src/commands/sourcemaps/__tests__/fixtures/basic/common.min.js.map`],
+            version: '1234',
+        });
+    }));
+    test('using the mjs extension', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/mjs');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePath: 'src/commands/sourcemaps/__tests__/mjs',
+            concurrency: 20,
+            jsFilesURLs: ['https://static.com/js/common.mjs'],
+            minifiedPathPrefix: 'https://static.com/js',
+            projectPath: '',
+            service: 'test-service',
+            sourcemapsPaths: ['src/commands/sourcemaps/__tests__/mjs/common.mjs.map'],
+            version: '1234',
+        });
+    }));
+    test('all files are skipped', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/fixtures/stdout-output/all-skipped');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        output.reverse();
+        expect(output[3]).toContain('Some sourcemaps have been skipped');
+        expect(output[2]).toContain('Details about the 2 found sourcemaps:');
+        expect(output[1]).toContain('  * 2 sourcemaps were skipped');
+    }));
+    test('mix of skipped filed and correct files', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/fixtures/stdout-output/mixed');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        output.reverse();
+        expect(output[4]).toContain('Some sourcemaps have been skipped');
+        expect(output[3]).toContain('Details about the 3 found sourcemaps:');
+        expect(output[2]).toContain('  * 2 sourcemaps successfully uploaded');
+        expect(output[1]).toContain('  * 1 sourcemap was skipped');
+    }));
+    test('completely empty sourcemap should be skipped', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI('./src/commands/sourcemaps/__tests__/fixtures/empty-file/');
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        output.reverse();
+        expect(output[3]).toContain('Some sourcemaps have been skipped');
+        expect(output[2]).toContain('Details about the 2 found sourcemaps:');
+        expect(output[1]).toContain('  * 2 sourcemaps were skipped');
+    }));
+});
+const makeCli = () => {
+    const cli = new advanced_1.Cli();
+    cli.register(upload_1.UploadCommand);
+    return cli;
+};
+const createMockContext = () => {
+    let data = '';
+    return {
+        stdout: {
+            toString: () => data,
+            write: (input) => {
+                data += input;
+            },
+        },
+    };
+};
+const checkConsoleOutput = (output, expected) => {
+    expect(output[0]).toContain('DRY-RUN MODE ENABLED. WILL NOT UPLOAD SOURCEMAPS');
+    expect(output[1]).toContain(`Starting upload with concurrency ${expected.concurrency}.`);
+    expect(output[2]).toContain(`Will look for sourcemaps in ${expected.basePath}`);
+    expect(output[3]).toContain(`Will match JS files for errors on files starting with ${expected.minifiedPathPrefix}`);
+    expect(output[4]).toContain(`version: ${expected.version} service: ${expected.service} project path: ${expected.projectPath}`);
+    const uploadedFileLines = output.slice(5, -4);
+    expect(expected.sourcemapsPaths.length).toEqual(uploadedFileLines.length); // Safety check
+    expect(expected.jsFilesURLs.length).toEqual(uploadedFileLines.length); // Safety check
+    uploadedFileLines.forEach((_, index) => {
+        expect(uploadedFileLines[index]).toContain(`[DRYRUN] Uploading sourcemap ${expected.sourcemapsPaths} for JS file available at ${expected.jsFilesURLs}`);
+    });
+    if (uploadedFileLines.length > 1) {
+        expect(output.slice(-2, -1)[0]).toContain(`[DRYRUN] Handled ${uploadedFileLines.length} sourcemaps with success`);
+    }
+    else {
+        expect(output.slice(-2, -1)[0]).toContain(`[DRYRUN] Handled ${uploadedFileLines.length} sourcemap with success`);
+    }
+};
+//# sourceMappingURL=upload.test.js.map

package/dist/commands/sourcemaps/__tests__/upload.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/sourcemaps/__tests__/upload.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/sourcemaps/__tests__/utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/sourcemaps/__tests__/utils.test.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../utils");
+describe('utils', () => {
+    describe('getMinifiedFilePath', () => {
+        test('should return correct minified path', () => {
+            const file1 = 'sourcemaps/file1.min.js.map';
+            const file2 = 'sourcemaps/file2.js.map.xxx';
+            expect((0, utils_1.getMinifiedFilePath)(file1)).toBe('sourcemaps/file1.min.js');
+            expect(() => (0, utils_1.getMinifiedFilePath)(file2)).toThrow('cannot get minified file path from a file which is not a sourcemap');
+        });
+    });
+    describe('arelastFoldersRepeated', () => {
+        test('should return true', () => {
+            const minifiedPathPrefix = 'https://subdomain.domain.dev/static/js';
+            const relativePath = '/static/js/1.23.chunk.js';
+            expect((0, utils_1.extractRepeatedPath)(minifiedPathPrefix, relativePath)).toBe('static/js');
+        });
+        test('should return true 2', () => {
+            const minifiedPathPrefix = 'https://subdomain.domain.dev/static/js/';
+            const relativePath = '/static/js/1.23.chunk.js';
+            expect((0, utils_1.extractRepeatedPath)(minifiedPathPrefix, relativePath)).toBe('static/js');
+        });
+        test('should return false', () => {
+            const minifiedPathPrefix = 'https://subdomain.domain.dev/static/js';
+            const relativePath = '/1.23.chunk.js';
+            expect((0, utils_1.extractRepeatedPath)(minifiedPathPrefix, relativePath)).toBe(undefined);
+        });
+    });
+});
+//# sourceMappingURL=utils.test.js.map

package/dist/commands/sourcemaps/__tests__/utils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../src/commands/sourcemaps/__tests__/utils.test.ts"],"names":[],"mappings":";;AAAA,oCAAiE;AAEjE,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC/C,MAAM,KAAK,GAAG,6BAA6B,CAAA;YAC3C,MAAM,KAAK,GAAG,6BAA6B,CAAA;YAE3C,MAAM,CAAC,IAAA,2BAAmB,EAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;YAClE,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,2BAAmB,EAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAC9C,oEAAoE,CACrE,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC9B,MAAM,kBAAkB,GAAG,wCAAwC,CAAA;YACnE,MAAM,YAAY,GAAG,0BAA0B,CAAA;YAE/C,MAAM,CAAC,IAAA,2BAAmB,EAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACjF,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAChC,MAAM,kBAAkB,GAAG,yCAAyC,CAAA;YACpE,MAAM,YAAY,GAAG,0BAA0B,CAAA;YAE/C,MAAM,CAAC,IAAA,2BAAmB,EAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACjF,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC/B,MAAM,kBAAkB,GAAG,wCAAwC,CAAA;YACnE,MAAM,YAAY,GAAG,gBAAgB,CAAA;YAErC,MAAM,CAAC,IAAA,2BAAmB,EAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/commands/sourcemaps/upload.d.ts

@@ -4,6 +4,7 @@ export declare class UploadCommand extends Command {
     static usage: import("clipanion").Usage;
     private basePath;
     private disableGit;
+    private quiet;
     private dryRun;
     private maxConcurrency;
     private minifiedPathPrefix;