npm - @datadog/datadog-ci - Versions diffs - 3.3.0 → 3.4.0 - Mend

@datadog/datadog-ci 3.3.0 → 3.4.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 (90) hide show

package/dist/commands/sbom/__tests__/validation.test.js CHANGED Viewed

@@ -68,6 +68,7 @@ describe('validation of sbom file', () => {
             is_direct: undefined,
             package_manager: 'pypi',
             is_dev: undefined,
+            reachable_symbol_properties: undefined,
         })).toBeFalsy();
         expect((0, validation_1.validateDependencyName)({
             name: 'foobar',
@@ -80,6 +81,7 @@ describe('validation of sbom file', () => {
             is_direct: undefined,
             package_manager: 'pypi',
             is_dev: undefined,
+            reachable_symbol_properties: undefined,
         })).toBeTruthy();
         expect((0, validation_1.validateDependencyName)({
             name: 'py',
@@ -92,6 +94,7 @@ describe('validation of sbom file', () => {
             is_direct: undefined,
             package_manager: 'pypi',
             is_dev: undefined,
+            reachable_symbol_properties: undefined,
         })).toBeTruthy();
         expect((0, validation_1.validateDependencyName)({
             name: 'rx',
@@ -104,6 +107,7 @@ describe('validation of sbom file', () => {
             is_direct: undefined,
             package_manager: 'pypi',
             is_dev: undefined,
+            reachable_symbol_properties: undefined,
         })).toBeTruthy();
     });
     test('should not filter purl if all are correct', () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/commands/sbom/__tests__/validation.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../../src/commands/sbom/__tests__/validation.test.ts"],"names":[],"mappings":"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~~SAClB~~,CAAC,CACH,CAAC,SAAS,EAAE,CAAA;QACb,MAAM,CACJ,IAAA,mCAAsB,EAAC;YACrB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,0BAAkB,CAAC,MAAM;YACnC,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,SAAS;YACpB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE,SAAS;~~SAClB~~,CAAC,CACH,CAAC,UAAU,EAAE,CAAA;QACd,MAAM,CACJ,IAAA,mCAAsB,EAAC;YACrB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,0BAAkB,CAAC,MAAM;YACnC,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,SAAS;YACpB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE,SAAS;~~SAClB~~,CAAC,CACH,CAAC,UAAU,EAAE,CAAA;QACd,MAAM,CACJ,IAAA,mCAAsB,EAAC;YACrB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,0BAAkB,CAAC,MAAM;YACnC,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,SAAS;YACpB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE,SAAS;~~SAClB~~,CAAC,CACH,CAAC,UAAU,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;IACF,IAAI,CAAC,2CAA2C,EAAE,GAAS,EAAE;QAC3D,MAAM,QAAQ,GAAG,iEAAiE,CAAA;QAClF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAErD,MAAM,oBAAoB,GAAG,IAAA,sCAAyB,EAAC,OAAQ,CAAC,YAAY,CAAC,CAAA;QAC7E,MAAM,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,OAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IACzE,CAAC,CAAA,CAAC,CAAA;IACF,IAAI,CAAC,4BAA4B,EAAE,GAAS,EAAE;QAC5C,MAAM,QAAQ,GAAG,+DAA+D,CAAA;QAChF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAErD,MAAM,oBAAoB,GAAG,IAAA,sCAAyB,EAAC,OAAQ,CAAC,YAAY,CAAC,CAAA;QAC7E,MAAM,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAC5C,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;IACvE,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../../src/commands/sbom/__tests__/validation.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/constants.d.ts CHANGED Viewed

@@ -3,5 +3,4 @@ export declare const PACKAGE_MANAGER_PROPERTY_KEY = "osv-scanner:package-manager
 export declare const IS_DEPENDENCY_DIRECT_PROPERTY_KEY = "osv-scanner:is-direct";
 export declare const IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = "osv-scanner:is-dev";
 export declare const FILE_PACKAGE_PROPERTY_KEY = "osv-scanner:package";
-export declare const TOOL_GENERATOR_NAME = "tool.generator.name";
-export declare const TOOL_GENERATOR_VERSION = "tool.generator.version";
+export declare const REACHABLE_SYMBOL_LOCATION_KEY_PREFIX = "datadog-sbom-generator:reachable-symbol-location";

package/dist/commands/sbom/constants.js CHANGED Viewed

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOOL_GENERATOR_VERSION = exports.TOOL_GENERATOR_NAME = exports.FILE_PACKAGE_PROPERTY_KEY = exports.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = exports.PACKAGE_MANAGER_PROPERTY_KEY = exports.API_ENDPOINT = void 0;
+exports.REACHABLE_SYMBOL_LOCATION_KEY_PREFIX = exports.FILE_PACKAGE_PROPERTY_KEY = exports.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = exports.PACKAGE_MANAGER_PROPERTY_KEY = exports.API_ENDPOINT = void 0;
 exports.API_ENDPOINT = 'api/v2/static-analysis-sca/dependencies';
 exports.PACKAGE_MANAGER_PROPERTY_KEY = 'osv-scanner:package-manager';
 exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = 'osv-scanner:is-direct';
 exports.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = 'osv-scanner:is-dev';
 exports.FILE_PACKAGE_PROPERTY_KEY = 'osv-scanner:package';
-// Tags
-exports.TOOL_GENERATOR_NAME = 'tool.generator.name';
-exports.TOOL_GENERATOR_VERSION = 'tool.generator.version';
+exports.REACHABLE_SYMBOL_LOCATION_KEY_PREFIX = 'datadog-sbom-generator:reachable-symbol-location';
 //# sourceMappingURL=constants.js.map

package/dist/commands/sbom/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yCAAyC,CAAA;AAExD,QAAA,4BAA4B,GAAG,6BAA6B,CAAA;AAC5D,QAAA,iCAAiC,GAAG,uBAAuB,CAAA;AAC3D,QAAA,0CAA0C,GAAG,oBAAoB,CAAA;AACjE,QAAA,yBAAyB,GAAG,qBAAqB,CAAA;~~AAE9D~~,~~OAAO;AACM,~~QAAA,~~mBAAmB~~,GAAG,~~qBAAqB~~,CAAA~~;AAC3C,QAAA,sBAAsB,GAAG,wBAAwB,CAAA~~"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yCAAyC,CAAA;AAExD,QAAA,4BAA4B,GAAG,6BAA6B,CAAA;AAC5D,QAAA,iCAAiC,GAAG,uBAAuB,CAAA;AAC3D,QAAA,0CAA0C,GAAG,oBAAoB,CAAA;AACjE,QAAA,yBAAyB,GAAG,qBAAqB,CAAA;AAEjD,QAAA,oCAAoC,GAAG,kDAAkD,CAAA"}

package/dist/commands/sbom/payload.js CHANGED Viewed

@@ -96,14 +96,15 @@ const generatePayload = (jsonContent, tags, service, env) => {
     const dependencies = [];
     const files = [];
     const relations = [];
+    const vulnerabilities = [];
     if (jsonContent) {
         // If the tool generator for SBOM creation is not already defined by the user,
         // attempt to determine it from the metadata attribute.
-        if (!tags[constants_1.TOOL_GENERATOR_NAME]) {
+        if (!tags[tags_1.SBOM_TOOL_GENERATOR_NAME]) {
             const generationTool = getGenerationTool(jsonContent);
             if (generationTool) {
-                tags[constants_1.TOOL_GENERATOR_NAME] = generationTool.name;
-                tags[constants_1.TOOL_GENERATOR_VERSION] = generationTool.version;
+                tags[tags_1.SBOM_TOOL_GENERATOR_NAME] = generationTool.name;
+                tags[tags_1.SBOM_TOOL_GENERATOR_VERSION] = generationTool.version;
             }
         }
         if (jsonContent['components']) {
@@ -130,6 +131,27 @@ const generatePayload = (jsonContent, tags, service, env) => {
                 relations.push(extractingRelations(dependency));
             }
         }
+        if (jsonContent['vulnerabilities']) {
+            for (const vulnerability of jsonContent['vulnerabilities']) {
+                if (!vulnerability['id'] || !vulnerability['bom-ref']) {
+                    continue;
+                }
+                const affects = [];
+                for (const affected of vulnerability['affects']) {
+                    if (!affected['ref']) {
+                        continue;
+                    }
+                    affects.push({
+                        ref: affected['ref'],
+                    });
+                }
+                vulnerabilities.push({
+                    id: vulnerability['id'],
+                    bom_ref: vulnerability['bom-ref'],
+                    affects,
+                });
+            }
+        }
     }
     // The tags dictionary is validated prior to generatePayload being called
     //  see upload.ts missingGitFields
@@ -150,6 +172,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
         dependencies,
         files,
         relations,
+        vulnerabilities,
         service,
         env,
     };
@@ -188,6 +211,7 @@ const extractingDependency = (component) => {
     let packageManager = '';
     let isDirect;
     let isDev;
+    const reachableSymbolProperties = [];
     for (const property of (_a = component['properties']) !== null && _a !== void 0 ? _a : []) {
         if (property['name'] === constants_1.PACKAGE_MANAGER_PROPERTY_KEY) {
             packageManager = property['value'];
@@ -198,6 +222,20 @@ const extractingDependency = (component) => {
         else if (property['name'] === constants_1.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY) {
             isDev = property['value'].toLowerCase() === 'true' ? true : undefined;
         }
+        else if (property['name'].startsWith(constants_1.REACHABLE_SYMBOL_LOCATION_KEY_PREFIX)) {
+            const missingKeys = validateReachableSymbolLocationValue(property['value']);
+            if (missingKeys.length > 0) {
+                console.error(`Error in reachable symbol locations for ${purl}:`);
+                for (const key of missingKeys) {
+                    console.error(`- ${key} is missing`);
+                }
+                continue;
+            }
+            reachableSymbolProperties.push({
+                name: property['name'],
+                value: property['value'],
+            });
+        }
     }
     const dependency = {
         name: component['name'],
@@ -210,6 +248,7 @@ const extractingDependency = (component) => {
         is_direct: isDirect,
         is_dev: isDev,
         package_manager: packageManager,
+        reachable_symbol_properties: reachableSymbolProperties,
     };
     return dependency;
 };
@@ -267,4 +306,31 @@ const extractGenerationTool = (tool) => {
         version: tool['version'],
     };
 };
+// validateReachableSymbolLocationValue checks if the JSON string value in
+// the reachable symbol location is valid and returns any keys that were missing.
+const validateReachableSymbolLocationValue = (value) => {
+    const missingKeys = [];
+    const parsedVals = JSON.parse(value);
+    for (const parsedVal of parsedVals) {
+        if (!parsedVal.file_name) {
+            missingKeys.push('file_name');
+        }
+        if (!parsedVal.line_start) {
+            missingKeys.push('line_start');
+        }
+        if (!parsedVal.line_end) {
+            missingKeys.push('line_end');
+        }
+        if (!parsedVal.column_start) {
+            missingKeys.push('column_start');
+        }
+        if (!parsedVal.column_end) {
+            missingKeys.push('column_end');
+        }
+        if (!parsedVal.symbol) {
+            missingKeys.push('symbol');
+        }
+    }
+    return missingKeys;
+};
 //# sourceMappingURL=payload.js.map

package/dist/commands/sbom/payload.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,oDAA2B;AAG3B,~~6CAQ2B~~;AAE3B,~~2CAOoB~~;AACpB,yCAAmD;~~AAGnD~~,sFAAsF;AACtF,mBAAmB;AACnB,MAAM,aAAa,GAAG,CAAC,QAA0B,EAAwB,EAAE;IACzE,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IACD,IACE,CAAC,QAAQ,CAAC,SAAS;QACnB,CAAC,QAAQ,CAAC,UAAU;QACpB,CAAC,QAAQ,CAAC,QAAQ;QAClB,CAAC,QAAQ,CAAC,YAAY;QACtB,CAAC,QAAQ,CAAC,UAAU,EACpB;QACA,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,UAAU,EAAE;QAC3C,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,EAAE;QAC7F,OAAO,SAAS,CAAA;KACjB;IAED,wBAAwB;IACxB,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,EAAE;QAChH,OAAO,SAAS,CAAA;KACjB;IAED,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ,CAAC,UAAU;YACzB,GAAG,EAAE,QAAQ,CAAC,YAAY;SAC3B;QACD,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,GAAG,EAAE,QAAQ,CAAC,UAAU;SACzB;KACF,CAAA;AACH,CAAC,CAAA;AAED,4FAA4F;AAC5F,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAyB,EAAE;IACxE,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAEpC,MAAM,GAAG,GAAc;YACrB,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7C,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC1C,CAAA;QAED,iFAAiF;QACjF,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,GAAG,CAAA;KACX;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAA;KACpD;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,0CAA0C;AAC1C,sDAAsD;AACtD,yCAAyC;AAClC,MAAM,eAAe,GAAG,CAC7B,WAAgB,EAChB,IAAc,EACd,OAAe,EACf,GAAW,EACa,EAAE;;IAC1B,MAAM,YAAY,GAAiB,EAAE,CAAA;IACrC,MAAM,KAAK,GAAW,EAAE,CAAA;IACxB,MAAM,SAAS,GAAgB,EAAE,CAAA;~~IAEjC~~,IAAI,WAAW,EAAE;QACf,8EAA8E;QAC9E,uDAAuD;QACvD,IAAI,CAAC,IAAI,CAAC,+~~BAAmB~~,CAAC,EAAE;~~YAC9B~~,MAAM,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAA;YAErD,IAAI,cAAc,EAAE;gBAClB,IAAI,CAAC,+~~BAAmB~~,CAAC,GAAG,cAAc,CAAC,IAAI,CAAA;~~gBAC/C~~,IAAI,CAAC,~~kCAAsB~~,CAAC,GAAG,cAAc,CAAC,OAAO,CAAA;~~aACtD~~;SACF;QACD,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE;YAC7B,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE;gBACjD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBAC5C,SAAQ;iBACT;gBAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,WAAW,EAAE;oBACxE,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAA;oBAElD,IAAI,UAAU,KAAK,SAAS,EAAE;wBAC5B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;qBAC9B;iBACF;qBAAM,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE;oBACvC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAA;iBACtC;aACF;SACF;QACD,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;YAC/B,KAAK,MAAM,UAAU,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;gBACpD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;oBAClD,SAAQ;iBACT;gBACD,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA;aAChD;SACF;KACF;IAED,yEAAyE;IACzE,kCAAkC;IAClC,OAAO;QACL,EAAE,EAAE,gBAAM,CAAC,UAAU,EAAE;QACvB,MAAM,EAAE;YACN,WAAW,EAAE,MAAA,IAAI,CAAC,6BAAsB,CAAC,mCAAI,EAAE;YAC/C,YAAY,EAAE,MAAA,IAAI,CAAC,8BAAuB,CAAC,mCAAI,EAAE;YACjD,cAAc,EAAE,MAAA,IAAI,CAAC,gCAAyB,CAAC,mCAAI,EAAE;YACrD,eAAe,EAAE,MAAA,IAAI,CAAC,iCAA0B,CAAC,mCAAI,EAAE;YACvD,GAAG,EAAE,MAAA,IAAI,CAAC,cAAO,CAAC,mCAAI,EAAE;YACxB,MAAM,EAAE,MAAA,IAAI,CAAC,iBAAU,CAAC,mCAAI,EAAE;SAC/B;QACD,UAAU,EAAE;YACV,GAAG,EAAE,MAAA,IAAI,CAAC,yBAAkB,CAAC,mCAAI,EAAE;SACpC;QACD,IAAI;QACJ,YAAY;QACZ,KAAK;QACL,SAAS;QACT,OAAO;QACP,GAAG;KACJ,CAAA;AACH,CAAC,CAAA;~~AAtEY~~,QAAA,eAAe,~~mBAsE3B~~;AAED,MAAM,oBAAoB,GAAG,CAAC,SAAc,EAA0B,EAAE;;IACtE,MAAM,IAAI,GAAG,IAAA,mCAAwB,EAAC,SAAS,CAAC,CAAA;IAEhD,IAAI,CAAC,IAAI,EAAE;QACT,OAAM;KACP;IAED,MAAM,IAAI,GAAuB,SAAS,CAAC,MAAM,CAAC,CAAA;IAElD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEpE,OAAM;KACP;IAED,MAAM,SAAS,GAAgB,EAAE,CAAA;IAEjC,qDAAqD;IACrD,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAA;IAC/C,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,EAAE;QACjE,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,EAAE;YACtD,IAAI,GAAG,CAAC,UAAU,CAAC,EAAE;gBACnB,MAAM,GAAG,GAAW,GAAG,CAAC,UAAU,CAAC,CAAA;gBAEnC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC9B,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;iBAC1B;aACF;SACF;KACF;IAED,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;QAChC,MAAM,GAAG,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACnC,IAAI,GAAG,EAAE;YACP,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACpB;KACF;IAED,IAAI,cAAc,GAAG,EAAE,CAAA;IACvB,IAAI,QAAQ,CAAA;IACZ,IAAI,KAAK,CAAA;IACT,KAAK,MAAM,QAAQ,IAAI,MAAA,SAAS,CAAC,YAAY,CAAC,mCAAI,EAAE,EAAE;QACpD,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,wCAA4B,EAAE;YACrD,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;SACnC;aAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,6CAAiC,EAAE;YACjE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;SACzE;aAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,sDAA0C,EAAE;YAC1E,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;SACtE;KACF;IAED,MAAM,UAAU,GAAe;QAC7B,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;QACvB,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS;QACtC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS;QAC1C,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,EAAE;QACZ,IAAI;QACJ,SAAS;QACT,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,KAAK;QACb,eAAe,EAAE,cAAc;~~KAChC~~,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,SAAc,EAAQ,EAAE;;IAC9C,IAAI,IAAI,CAAA;IACR,KAAK,MAAM,QAAQ,IAAI,MAAA,SAAS,CAAC,YAAY,CAAC,mCAAI,EAAE,EAAE;QACpD,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,qCAAyB,EAAE;YAClD,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;SACzB;KACF;IAED,OAAO;QACL,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;QACvB,IAAI;KACL,CAAA;AACH,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,UAAe,EAAa,EAAE;IACzD,OAAO;QACL,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC;QAChC,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC;KACpC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,WAAgB,EAA8B,EAAE;;IACzE,MAAM,KAAK,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,0CAAE,KAAK,CAAA;IAE1C,2CAA2C;IAC3C,sDAAsD;IACtD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,6CAA6C;QAC7C,sDAAsD;KACvD;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QAE9C,OAAO,qBAAqB,CAAC,aAAa,CAAC,CAAA;KAC5C;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAO,EAAE;IAC3C,IAAI,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACrD,+DAA+D;QAC/D,kDAAkD;QAClD,MAAM,oBAAoB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;QACvG,IAAI,oBAAoB,EAAE;YACxB,OAAO,oBAAoB,CAAA;SAC5B;QAED,0DAA0D;QAC1D,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;KAC1B;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,IAAS,EAAkB,EAAE;IAC1D,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;KACzB,CAAA;AACH,CAAC,CAAA"}
1	+ {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/types.d.ts CHANGED Viewed

@@ -83,6 +83,10 @@ export interface Dependency {
     is_direct: undefined | boolean;
     is_dev: undefined | boolean;
     package_manager: string;
+    reachable_symbol_properties: undefined | Property[];
+}
+export interface ReachableSymbolLocationValue extends LocationFromFile {
+    symbol: string;
 }
 export interface CommitInformation {
     author_name: string;
@@ -103,6 +107,14 @@ export interface Relations {
     component_ref: string;
     depends_on: string[];
 }
+export interface Vulnerability {
+    id: string;
+    bom_ref: string;
+    affects: Affect[];
+}
+export interface Affect {
+    ref: string;
+}
 export interface ScaRequest {
     id: string;
     commit: CommitInformation;
@@ -110,6 +122,7 @@ export interface ScaRequest {
     dependencies: Dependency[];
     files: File[];
     relations: Relations[];
+    vulnerabilities: Vulnerability[];
     service: string;
     env: string;
     tags: Record<string, string>;

package/dist/commands/span/__tests__/span.test.d.ts ADDED Viewed

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

package/dist/commands/span/__tests__/span.test.js ADDED Viewed

@@ -0,0 +1,108 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-null/no-null */
+const stream_1 = require("stream");
+const advanced_1 = require("clipanion/lib/advanced");
+const fixtures_1 = require("../../../helpers/__tests__/fixtures");
+const test_utils_1 = require("../../trace/test-utils");
+const span_1 = require("../span");
+describe('span', () => {
+    const runCLI = (extraArgs, extraEnv) => __awaiter(void 0, void 0, void 0, function* () {
+        const cli = new advanced_1.Cli();
+        cli.register(span_1.SpanCommand);
+        const context = (0, fixtures_1.createMockContext)();
+        process.env = Object.assign({ DD_API_KEY: 'PLACEHOLDER' }, extraEnv);
+        context.env = process.env;
+        context.stderr = new stream_1.PassThrough();
+        const code = yield cli.run(['trace', 'span', '--dry-run', ...extraArgs], context);
+        return { context, code };
+    });
+    describe('execute', () => {
+        test('ci_provider', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"ci_provider":"gitlab"');
+        }));
+        test('name', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"name":"mytestname"');
+        }));
+        test('no-name', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--duration', '10000'], env);
+            expect(code).toBe(1);
+        }));
+        test('no-time-info', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--name', 'mytestname'], env);
+            expect(code).toBe(1);
+        }));
+        test('time', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--start-time', '42', '--end-time', '618'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"start_time":"1970-01-01T00:00:00.042Z"');
+            expect(context.stdout.toString()).toContain('"end_time":"1970-01-01T00:00:00.618Z"');
+        }));
+        test('time-only-start', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--name', 'mytestname', '--start-time', '42'], env);
+            expect(code).toBe(1);
+        }));
+        test('time-only-end', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--name', 'mytestname', '--end-time', '618'], env);
+            expect(code).toBe(1);
+        }));
+        test('time-and-duration', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--name', 'mytestname', '--start-time', '42', '--end-time', '618', '--duration', '1618'], env);
+            expect(code).toBe(1);
+        }));
+        test('time-reverse', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { code } = yield runCLI(['--name', 'mytestname', '--start-time', '618', '--end-time', '42'], env);
+            expect(code).toBe(1);
+        }));
+        test('tags', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--tags', 'hello:world', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"hello":"world"');
+        }));
+        test('tags-multiple', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--tags', 'hello:world', '--tags', 'super:mario', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"hello":"world"');
+            expect(context.stdout.toString()).toContain('"super":"mario"');
+        }));
+        test('measures', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--measures', 'life:42', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"life":42');
+        }));
+        test('measures-multiple', () => __awaiter(void 0, void 0, void 0, function* () {
+            const env = { GITLAB_CI: '1' };
+            const { context, code } = yield runCLI(['--name', 'mytestname', '--measures', 'life:42', '--measures', 'golden:1.618', '--duration', '10000'], env);
+            expect(code).toBe(0);
+            expect(context.stdout.toString()).toContain('"life":42');
+            expect(context.stdout.toString()).toContain('"golden":1.618');
+        }));
+    });
+    (0, test_utils_1.makeCIProviderTests)(runCLI, ['--name', 'mytestname', '--duration', '10000']);
+});
+//# sourceMappingURL=span.test.js.map

package/dist/commands/span/__tests__/span.test.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/commands/span/cli.d.ts ADDED Viewed

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

package/dist/commands/span/cli.js ADDED Viewed

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const span_1 = require("./span");
+module.exports = [span_1.SpanCommand];
+//# sourceMappingURL=cli.js.map

package/dist/commands/span/cli.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/span/cli.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAElC,MAAM,CAAC,OAAO,GAAG,CAAC,kBAAW,CAAC,CAAA"}

package/dist/commands/span/span.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+import { CustomSpanCommand } from '../trace/helper';
+export declare class SpanCommand extends CustomSpanCommand {
+    static paths: string[][];
+    static usage: import("clipanion").Usage;
+    private name;
+    private durationInMs;
+    private startTimeInMs;
+    private endTimeInMs;
+    execute(): Promise<number>;
+}

package/dist/commands/span/span.js ADDED Viewed

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpanCommand = void 0;
+const clipanion_1 = require("clipanion");
+const validation = __importStar(require("../../helpers/validation"));
+const helper_1 = require("../trace/helper");
+class SpanCommand extends helper_1.CustomSpanCommand {
+    constructor() {
+        super(...arguments);
+        this.name = clipanion_1.Option.String('--name');
+        this.durationInMs = clipanion_1.Option.String('--duration', {
+            validator: validation.isInteger(),
+        });
+        this.startTimeInMs = clipanion_1.Option.String('--start-time', {
+            validator: validation.isInteger(),
+        });
+        this.endTimeInMs = clipanion_1.Option.String('--end-time', {
+            validator: validation.isInteger(),
+        });
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.tryEnableFips();
+            if (!this.name) {
+                this.context.stdout.write(`The span name must be provided.\n`);
+                return 1;
+            }
+            if ((this.startTimeInMs && !this.endTimeInMs) ||
+                (!this.startTimeInMs && this.endTimeInMs) ||
+                (this.durationInMs && (this.startTimeInMs || this.endTimeInMs))) {
+                this.context.stdout.write(`Either duration or start and end time must be provided.\n`);
+                return 1;
+            }
+            if (this.startTimeInMs && this.endTimeInMs) {
+                this.durationInMs = this.endTimeInMs - this.startTimeInMs;
+            }
+            if (!this.durationInMs) {
+                this.context.stdout.write(`The span duration must be provided or start-time and end-time.\n`);
+                return 1;
+            }
+            if (this.durationInMs < 0) {
+                this.context.stdout.write(`The span duration must be positive / end time must be after start time.\n`);
+                return 1;
+            }
+            const endTime = this.endTimeInMs ? new Date(this.endTimeInMs) : new Date();
+            const startTime = new Date(endTime.getTime() - this.durationInMs);
+            return this.executeReportCustomSpan(this.generateSpanId(), startTime, endTime, {
+                name: this.name,
+                error_message: '',
+                exit_code: 0,
+                command: 'datadog-ci trace span',
+            });
+        });
+    }
+}
+exports.SpanCommand = SpanCommand;
+SpanCommand.paths = [['trace', 'span']];
+SpanCommand.usage = clipanion_1.Command.Usage({
+    category: 'CI Visibility',
+    description: 'Report a custom span to Datadog with name, start / end time or duration, tags and measures.',
+    details: `
+      This command reports a span with custom name and custom duration to Datadog.\n
+      See README for details.
+    `,
+    examples: [
+        [
+            'Create span with name "Get Dependencies" and duration of 10s and report to Datadog',
+            'datadog-ci trace span --name "Get Dependencies" --duration 10000',
+        ],
+        [
+            'Create span with name "Build" and duration of 10s using timestamps and report to Datadog',
+            'datadog-ci trace span --name "Build" --start-time 1744357891967 --end-time 1744357901967',
+        ],
+        [
+            'Create span with name "Get Dependencies" and duration of 10s and report to Datadog with tags and measures',
+            'datadog-ci trace span --name "Get Dependencies" --duration 10000 --tags "dependency-set:notify" --measures "n-dependencies:42"',
+        ],
+    ],
+});
+//# sourceMappingURL=span.js.map

package/dist/commands/span/span.js.map ADDED Viewed

@@ -0,0 +1 @@

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