@datadog/datadog-ci 2.22.0 → 2.23.0

package/dist/commands/lambda/functions/commons.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.maskConfig = exports.willUpdateFunctionConfigs = exports.handleLambdaFunctionUpdates = exports.updateFunctionConfiguration = exports.updateLambdaFunctionConfig = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.getAWSCredentials = exports.getAWSProfileCredentials = exports.getAWSFileCredentialsParams = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const credential_providers_1 = require("@aws-sdk/credential-providers");
-const property_provider_1 = require("@aws-sdk/property-provider");
+const property_provider_1 = require("@smithy/property-provider");
 const inquirer_1 = __importDefault(require("inquirer"));
 const constants_1 = require("../../../constants");
 const helpersRenderer = __importStar(require("../../../helpers/renderer"));

package/dist/commands/lambda/functions/commons.js.map

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

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

@@ -1,7 +1,7 @@
 import { AxiosPromise, AxiosResponse } from 'axios';
-import { SBOMPayload } from './protobuf/sbom_intake';
+import { ScaRequest } from './types';
 /**
  * Get the function to upload our results to the intake.
  * @param apiKey
  */
-export declare const getApiHelper: (apiKey: string) => (sbomPayload: SBOMPayload) => AxiosPromise<AxiosResponse>;
+export declare const getApiHelper: (apiKey: string, appKey: string) => (scaRequest: ScaRequest) => AxiosPromise<AxiosResponse>;

package/dist/commands/sbom/api.js

@@ -11,26 +11,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApiHelper = void 0;
 const constants_1 = require("../../constants");
-const api_1 = require("../../helpers/api");
 const utils_1 = require("../../helpers/utils");
+const utils_2 = require("../junit/utils");
 const constants_2 = require("./constants");
-const sbom_intake_1 = require("./protobuf/sbom_intake");
 const maxBodyLength = Infinity;
 /**
  * Get the function to upload our results to the intake.
  * @param apiKey
  */
-const getApiHelper = (apiKey) => {
+const getApiHelper = (apiKey, appKey) => {
     /**
      * function used to marshall and send the data
      * @param request - the AXIOS element used to send the request
      */
-    const uploadSBomPayload = (request) => (payload) => __awaiter(void 0, void 0, void 0, function* () {
-        const buffer = sbom_intake_1.SBOMPayload.encode(payload).finish();
+    const uploadSBomPayload = (request) => (scaPayload) => __awaiter(void 0, void 0, void 0, function* () {
+        // Make sure we follow the API signature
+        const payload = {
+            data: {
+                type: 'scarequests',
+                attributes: scaPayload,
+            },
+        };
         return request({
-            data: buffer,
+            data: JSON.stringify(payload),
             headers: {
-                [constants_1.CONTENT_TYPE_HEADER]: constants_1.CONTENT_TYPE_VALUE_PROTOBUF,
+                [constants_1.CONTENT_TYPE_HEADER]: constants_1.CONTENT_TYPE_VALUE_JSON,
                 'DD-EVP-ORIGIN': 'datadog-ci',
                 'DD-EVP-ORIGIN-VERSION': '0.0.1',
             },
@@ -40,9 +45,9 @@ const getApiHelper = (apiKey) => {
         });
     });
     // Get the intake name
-    const intakeUrl = (0, api_1.getBaseIntakeUrl)(constants_2.INTAKE_NAME);
+    const url = (0, utils_2.getBaseUrl)();
     // Get the AXIOS request/response function
-    const requestIntake = (0, utils_1.getRequestBuilder)({ baseUrl: intakeUrl, apiKey });
+    const requestIntake = (0, utils_1.getRequestBuilder)({ baseUrl: url, apiKey, appKey });
     return uploadSBomPayload(requestIntake);
 };
 exports.getApiHelper = getApiHelper;

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

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/sbom/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAA6F;AAC7F,2CAAkD;AAClD,+CAAqD;AAErD,2CAAqD;AACrD,wDAAkD;AAElD,MAAM,aAAa,GAAG,QAAQ,CAAA;AAE9B;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,MAAc,EAA+D,EAAE;IAC1G;;;OAGG;IACH,MAAM,iBAAiB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CAChG,OAAoB,EACpB,EAAE;QACF,MAAM,MAAM,GAAG,yBAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAA;QAEnD,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE;gBACP,CAAC,+BAAmB,CAAC,EAAE,uCAA2B;gBAClD,eAAe,EAAE,YAAY;gBAC7B,uBAAuB,EAAE,OAAO;aACjC;YACD,aAAa;YACb,MAAM,EAAE,uBAAW;YACnB,GAAG,EAAE,wBAAY;SAClB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAA;IAED,sBAAsB;IACtB,MAAM,SAAS,GAAG,IAAA,sBAAgB,EAAC,uBAAW,CAAC,CAAA;IAC/C,0CAA0C;IAC1C,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAC,CAAC,CAAA;IAErE,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAA;AACzC,CAAC,CAAA;AA7BY,QAAA,YAAY,gBA6BxB"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/sbom/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAAsH;AACtH,+CAAqD;AAErD,0CAAyC;AAEzC,2CAAwC;AAGxC,MAAM,aAAa,GAAG,QAAQ,CAAA;AAE9B;;;GAGG;AACI,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,MAAc,EAC6C,EAAE;IAC7D;;;OAGG;IACH,MAAM,iBAAiB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CAChG,UAAsB,EACtB,EAAE;QACF,wCAAwC;QACxC,MAAM,OAAO,GAAG;YACd,IAAI,EAAE;gBACJ,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,UAAU;aACvB;SACF,CAAA;QAED,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7B,OAAO,EAAE;gBACP,CAAC,+BAAmB,CAAC,EAAE,mCAAuB;gBAC9C,eAAe,EAAE,YAAY;gBAC7B,uBAAuB,EAAE,OAAO;aACjC;YACD,aAAa;YACb,MAAM,EAAE,uBAAW;YACnB,GAAG,EAAE,wBAAY;SAClB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAA;IAED,sBAAsB;IACtB,MAAM,GAAG,GAAG,IAAA,kBAAU,GAAE,CAAA;IACxB,0CAA0C;IAC1C,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAA;IAEvE,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAA;AACzC,CAAC,CAAA;AAtCY,QAAA,YAAY,gBAsCxB"}

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

@@ -1,2 +1 @@
-export declare const API_ENDPOINT = "api/v2/sbom";
-export declare const INTAKE_NAME = "sbom-intake";
+export declare const API_ENDPOINT = "api/v2/static-analysis-sca/dependencies";

package/dist/commands/sbom/constants.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INTAKE_NAME = exports.API_ENDPOINT = void 0;
-exports.API_ENDPOINT = 'api/v2/sbom';
-exports.INTAKE_NAME = 'sbom-intake';
+exports.API_ENDPOINT = void 0;
+exports.API_ENDPOINT = 'api/v2/static-analysis-sca/dependencies';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,aAAa,CAAA;AAC5B,QAAA,WAAW,GAAG,aAAa,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yCAAyC,CAAA"}

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

@@ -0,0 +1,2 @@
+import { DependencyLanguage } from './types';
+export declare const getLanguageFromComponent: (component: any) => DependencyLanguage | undefined;

package/dist/commands/sbom/language.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLanguageFromComponent = void 0;
+const types_1 = require("./types");
+// Attempt to find the language from a SBOM component. For now, we get the source either from
+// the bom-ref or the purl property of the SBOM.
+const getLanguageFromComponent = (component) => {
+    const componentName = component['name'];
+    if (component['bom-ref']) {
+        if (component['bom-ref'].includes('pkg:npm')) {
+            return types_1.DependencyLanguage.NPM;
+        }
+        if (component['purl'].includes('pkg:composer')) {
+            return types_1.DependencyLanguage.PHP;
+        }
+        if (component['purl'].includes('pkg:cargo')) {
+            return types_1.DependencyLanguage.RUST;
+        }
+        if (component['purl'].includes('pkg:gem')) {
+            return types_1.DependencyLanguage.RUBY;
+        }
+        if (component['purl'].includes('pkg:maven')) {
+            return types_1.DependencyLanguage.JVM;
+        }
+        if (component['purl'].includes('pkg:golang')) {
+            return types_1.DependencyLanguage.GO;
+        }
+    }
+    console.debug(`language for component ${componentName} not found`);
+    return undefined;
+};
+exports.getLanguageFromComponent = getLanguageFromComponent;
+//# sourceMappingURL=language.js.map

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

@@ -0,0 +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,EAAE;YAC5C,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;KACF;IAED,OAAO,CAAC,KAAK,CAAC,0BAA0B,aAAa,YAAY,CAAC,CAAA;IAElE,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA3BY,QAAA,wBAAwB,4BA2BpC"}

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

@@ -0,0 +1,3 @@
+import { DependencyLicense } from './types';
+export declare const getLicensesFromString: (s: string) => DependencyLicense[];
+export declare const getLicensesFromComponent: (component: any) => DependencyLicense[];

package/dist/commands/sbom/license.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLicensesFromComponent = exports.getLicensesFromString = void 0;
+const types_1 = require("./types");
+// Get the license from a string. If the license is valid, we return it. Otherwise, we return undefined
+// List of licenses: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository
+const getLicenseFromString = (s) => {
+    if (!s) {
+        return undefined;
+    }
+    switch (s.toLowerCase()) {
+        case '0bsd':
+            return types_1.DependencyLicense.ZEROBSD;
+        case 'apache-2.0':
+        case 'apache license, version 2.0':
+        case 'the apache software license, version 2.0':
+            return types_1.DependencyLicense.APACHE2;
+        case 'bsd-2-clause':
+            return types_1.DependencyLicense.BSD2CLAUSE;
+        case 'bsd-3-clause':
+            return types_1.DependencyLicense.BSD3CLAUSE;
+        case 'bsl-1.0':
+            return types_1.DependencyLicense.BSL1;
+        case 'gpl v2':
+            return types_1.DependencyLicense.GPL2_0;
+        case 'gpl v3':
+            return types_1.DependencyLicense.GPL3_0;
+        case 'isc':
+            return types_1.DependencyLicense.ISC;
+        case 'mit':
+        case 'the mit license':
+            return types_1.DependencyLicense.MIT;
+        case 'unlicense':
+            return types_1.DependencyLicense.UNLICENSE;
+        case 'zlib':
+            return types_1.DependencyLicense.ZLIB;
+    }
+    console.debug(`license ${s} not recognized`);
+    return undefined;
+};
+// Get all the licenses from a string. Sometimes, there are two licenses in one string
+// such as "MIT OR Apache-2.0". In this case, we return all the licenses in this condition.
+const getLicensesFromString = (s) => {
+    if (!s) {
+        return [];
+    }
+    const licenses = [];
+    if (s.toLowerCase().includes('or')) {
+        for (const lic of s.toLowerCase().split(' or ')) {
+            const l = getLicenseFromString(lic.trim());
+            if (l) {
+                licenses.push(l);
+            }
+        }
+    }
+    else {
+        const lic = getLicenseFromString(s);
+        if (lic) {
+            licenses.push(lic);
+        }
+    }
+    return licenses;
+};
+exports.getLicensesFromString = getLicensesFromString;
+// Get all the licenses of this component. We extract the "licenses" element from the SBOM component.
+// Unfortunately, depending on the SBOM generator, the licenses are generated in a different manner.
+// We attempt to get as much as possible.
+const getLicensesFromComponent = (component) => {
+    var _a;
+    const elementsForLicense = ['id', 'name'];
+    const componentName = component['name'];
+    const licenses = [];
+    // Get the "licenses" attribute of the SBOM component.
+    if (component['licenses']) {
+        for (const license of component['licenses']) {
+            for (const el of elementsForLicense) {
+                // Handle "license": [ {"license": {"id": <license>}} ]
+                if ((_a = license['license']) === null || _a === void 0 ? void 0 : _a[el]) {
+                    for (const l of (0, exports.getLicensesFromString)(license['license'][el])) {
+                        licenses.push(l);
+                    }
+                }
+                // Handle "license": [ {"expression": "MIT"} ]
+                if (license['expression']) {
+                    for (const l of (0, exports.getLicensesFromString)(license['expression'])) {
+                        licenses.push(l);
+                    }
+                }
+            }
+        }
+    }
+    if (licenses.length === 0) {
+        console.log(`license for component ${componentName} not found`);
+    }
+    return licenses;
+};
+exports.getLicensesFromComponent = getLicensesFromComponent;
+//# sourceMappingURL=license.js.map

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

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

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

@@ -1,4 +1,3 @@
 import { SpanTags } from '../../helpers/interfaces';
-import { SBOMPayload } from './protobuf/sbom_intake';
-import { SbomPayloadData } from './types';
-export declare const generatePayload: (payloadData: SbomPayloadData, service: string, tags: SpanTags) => SBOMPayload;
+import { ScaRequest } from './types';
+export declare const generatePayload: (jsonContent: any, tags: SpanTags) => ScaRequest | undefined;

package/dist/commands/sbom/payload.js

@@ -4,25 +4,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePayload = void 0;
-const os_1 = __importDefault(require("os"));
-const bom_1_4_1 = require("./protobuf/bom-1.4");
-const sbom_intake_1 = require("./protobuf/sbom_intake");
-const generatePayload = (payloadData, service, tags) => {
-    const spanTagsAsStringArray = Object.keys(tags).map((key) => `${key}:${tags[key]}`);
-    return sbom_intake_1.SBOMPayload.create({
-        host: os_1.default.hostname(),
-        source: 'CI',
-        entities: [
-            sbom_intake_1.SBOMEntity.create({
-                id: service,
-                type: sbom_intake_1.SBOMSourceType.CI_PIPELINE,
-                inUse: true,
-                generatedAt: new Date(),
-                ddTags: spanTagsAsStringArray,
-                cyclonedx: bom_1_4_1.Bom.fromJSON(payloadData.content),
-            }),
-        ],
-    });
+const crypto_1 = __importDefault(require("crypto"));
+const tags_1 = require("../../helpers/tags");
+const language_1 = require("./language");
+const license_1 = require("./license");
+// Generate the payload we send to the API
+// jsonContent is the SBOM file content read from disk
+// tags are the list of tags we retrieved
+const generatePayload = (jsonContent, tags) => {
+    if (!tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL] ||
+        !tags[tags_1.GIT_COMMIT_AUTHOR_NAME] ||
+        !tags[tags_1.GIT_SHA] ||
+        !tags[tags_1.GIT_BRANCH] ||
+        !tags[tags_1.GIT_REPOSITORY_URL]) {
+        return undefined;
+    }
+    const dependencies = [];
+    if (jsonContent) {
+        if (jsonContent['components']) {
+            for (const component of jsonContent['components']) {
+                if (!component['type'] || !component['name'] || !component['version']) {
+                    continue;
+                }
+                if (component['type'] !== 'library') {
+                    continue;
+                }
+                const lang = (0, language_1.getLanguageFromComponent)(component);
+                if (!lang) {
+                    continue;
+                }
+                const dependency = {
+                    name: component['name'],
+                    version: component['version'],
+                    language: lang,
+                    licenses: (0, license_1.getLicensesFromComponent)(component),
+                };
+                dependencies.push(dependency);
+            }
+        }
+    }
+    return {
+        id: crypto_1.default.randomUUID(),
+        commit: {
+            author_name: tags[tags_1.GIT_COMMIT_AUTHOR_NAME],
+            author_email: tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL],
+            sha: tags[tags_1.GIT_SHA],
+            branch: tags[tags_1.GIT_BRANCH],
+        },
+        repository: {
+            url: tags[tags_1.GIT_REPOSITORY_URL],
+        },
+        tags,
+        dependencies,
+    };
 };
 exports.generatePayload = generatePayload;
 //# sourceMappingURL=payload.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,gDAAsC;AACtC,wDAA8E;AAGvE,MAAM,eAAe,GAAG,CAAC,WAA4B,EAAE,OAAe,EAAE,IAAc,EAAe,EAAE;IAC5G,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,GAAqB,CAAC,EAAE,CAAC,CAAA;IAErG,OAAO,yBAAW,CAAC,MAAM,CAAC;QACxB,IAAI,EAAE,YAAE,CAAC,QAAQ,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE;YACR,wBAAU,CAAC,MAAM,CAAC;gBAChB,EAAE,EAAE,OAAO;gBACX,IAAI,EAAE,4BAAc,CAAC,WAAW;gBAChC,KAAK,EAAE,IAAI;gBACX,WAAW,EAAE,IAAI,IAAI,EAAE;gBACvB,MAAM,EAAE,qBAAqB;gBAC7B,SAAS,EAAE,aAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;aAC7C,CAAC;SACH;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAjBY,QAAA,eAAe,mBAiB3B"}
+{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAG3B,6CAM2B;AAE3B,yCAAmD;AACnD,uCAAkD;AAGlD,0CAA0C;AAC1C,sDAAsD;AACtD,yCAAyC;AAClC,MAAM,eAAe,GAAG,CAAC,WAAgB,EAAE,IAAc,EAA0B,EAAE;IAC1F,IACE,CAAC,IAAI,CAAC,8BAAuB,CAAC;QAC9B,CAAC,IAAI,CAAC,6BAAsB,CAAC;QAC7B,CAAC,IAAI,CAAC,cAAO,CAAC;QACd,CAAC,IAAI,CAAC,iBAAU,CAAC;QACjB,CAAC,IAAI,CAAC,yBAAkB,CAAC,EACzB;QACA,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,YAAY,GAAiB,EAAE,CAAA;IAErC,IAAI,WAAW,EAAE;QACf,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,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;oBACrE,SAAQ;iBACT;gBACD,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE;oBACnC,SAAQ;iBACT;gBAED,MAAM,IAAI,GAAG,IAAA,mCAAwB,EAAC,SAAS,CAAC,CAAA;gBAEhD,IAAI,CAAC,IAAI,EAAE;oBACT,SAAQ;iBACT;gBAED,MAAM,UAAU,GAAe;oBAC7B,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;oBACvB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;oBAC7B,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAA,kCAAwB,EAAC,SAAS,CAAC;iBAC9C,CAAA;gBACD,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;aAC9B;SACF;KACF;IAED,OAAO;QACL,EAAE,EAAE,gBAAM,CAAC,UAAU,EAAE;QACvB,MAAM,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,6BAAsB,CAAC;YACzC,YAAY,EAAE,IAAI,CAAC,8BAAuB,CAAC;YAC3C,GAAG,EAAE,IAAI,CAAC,cAAO,CAAC;YAClB,MAAM,EAAE,IAAI,CAAC,iBAAU,CAAC;SACzB;QACD,UAAU,EAAE;YACV,GAAG,EAAE,IAAI,CAAC,yBAAkB,CAAC;SAC9B;QACD,IAAI;QACJ,YAAY;KACb,CAAA;AACH,CAAC,CAAA;AAtDY,QAAA,eAAe,mBAsD3B"}

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

@@ -1,4 +1,69 @@
-export interface SbomPayloadData {
-    filePath: string;
-    content: any;
+export declare enum DependencyLanguage {
+    NPM = "node",
+    PYPI = "pypi",
+    PHP = "php",
+    RUST = "rust",
+    RUBY = "ruby",
+    GO = "go",
+    JVM = "jvm"
+}
+export declare enum DependencyLicense {
+    AFL3 = "AFL-3.0",
+    APACHE2 = "Apache-2.0",
+    ARTISTIC2 = "Artistic-2.0",
+    BSL1 = "BSL-1.0",
+    BSD2CLAUSE = "BSD-2-Clause",
+    BSD3CLAUSE = "BSD-3-Clause",
+    BSD3CLAUSECLEAR = "BSD-3-Clause-Clear",
+    BSD4CLAUSE = "BSD-4-Clause",
+    ZEROBSD = "0BSD",
+    CC = "CC",
+    CC0_1_0 = "CC0-1.0",
+    CC_BY_4_0 = "CC-BY-4.0",
+    CC_BY_SA_4_0 = "CC-BY-SA-4.0",
+    WTFPL = "WTFPL",
+    ECL2_0 = "ECL-2.0",
+    EPL1_0 = "EPL-1.0",
+    EPL2_0 = "EPL-2.0",
+    EUPL1_1 = "EUPL-1.1",
+    AGPL3_0 = "AGPL-3.0",
+    GPL = "GPL",
+    GPL2_0 = "GPL-2.0",
+    GPL3_0 = "GPL-3.0",
+    LGPL = "LGPL",
+    LGPL2_1 = "LGPL-2.1",
+    LGPL3_0 = "LGPL-3.0",
+    ISC = "ISC",
+    LPPL_1_3C = "LPPL-1.3c",
+    MS_PL = "MS-PL",
+    MIT = "MIT",
+    MPL_2_0 = "MPL-2.0",
+    OSL_3_0 = "OSL-3.0",
+    POSTGRESQL = "PostgreSQL",
+    OFL_1_1 = "OFL-1.1",
+    NCSA = "NCSA",
+    UNLICENSE = "Unlicense",
+    ZLIB = "Zlib"
+}
+export interface Dependency {
+    name: string;
+    version: string;
+    language: DependencyLanguage;
+    licenses: DependencyLicense[];
+}
+export interface CommitInformation {
+    author_name: string;
+    author_email: string;
+    sha: string;
+    branch: string;
+}
+export interface RepositoryInformation {
+    url: string;
+}
+export interface ScaRequest {
+    id: string;
+    commit: CommitInformation;
+    repository: RepositoryInformation;
+    dependencies: Dependency[];
+    tags: Record<string, string>;
 }

package/dist/commands/sbom/types.js

@@ -1,3 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DependencyLicense = exports.DependencyLanguage = void 0;
+var DependencyLanguage;
+(function (DependencyLanguage) {
+    DependencyLanguage["NPM"] = "node";
+    DependencyLanguage["PYPI"] = "pypi";
+    DependencyLanguage["PHP"] = "php";
+    DependencyLanguage["RUST"] = "rust";
+    DependencyLanguage["RUBY"] = "ruby";
+    DependencyLanguage["GO"] = "go";
+    DependencyLanguage["JVM"] = "jvm";
+})(DependencyLanguage || (exports.DependencyLanguage = DependencyLanguage = {}));
+// List from https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository
+var DependencyLicense;
+(function (DependencyLicense) {
+    DependencyLicense["AFL3"] = "AFL-3.0";
+    DependencyLicense["APACHE2"] = "Apache-2.0";
+    DependencyLicense["ARTISTIC2"] = "Artistic-2.0";
+    DependencyLicense["BSL1"] = "BSL-1.0";
+    DependencyLicense["BSD2CLAUSE"] = "BSD-2-Clause";
+    DependencyLicense["BSD3CLAUSE"] = "BSD-3-Clause";
+    DependencyLicense["BSD3CLAUSECLEAR"] = "BSD-3-Clause-Clear";
+    DependencyLicense["BSD4CLAUSE"] = "BSD-4-Clause";
+    DependencyLicense["ZEROBSD"] = "0BSD";
+    DependencyLicense["CC"] = "CC";
+    DependencyLicense["CC0_1_0"] = "CC0-1.0";
+    DependencyLicense["CC_BY_4_0"] = "CC-BY-4.0";
+    DependencyLicense["CC_BY_SA_4_0"] = "CC-BY-SA-4.0";
+    DependencyLicense["WTFPL"] = "WTFPL";
+    DependencyLicense["ECL2_0"] = "ECL-2.0";
+    DependencyLicense["EPL1_0"] = "EPL-1.0";
+    DependencyLicense["EPL2_0"] = "EPL-2.0";
+    DependencyLicense["EUPL1_1"] = "EUPL-1.1";
+    DependencyLicense["AGPL3_0"] = "AGPL-3.0";
+    DependencyLicense["GPL"] = "GPL";
+    DependencyLicense["GPL2_0"] = "GPL-2.0";
+    DependencyLicense["GPL3_0"] = "GPL-3.0";
+    DependencyLicense["LGPL"] = "LGPL";
+    DependencyLicense["LGPL2_1"] = "LGPL-2.1";
+    DependencyLicense["LGPL3_0"] = "LGPL-3.0";
+    DependencyLicense["ISC"] = "ISC";
+    DependencyLicense["LPPL_1_3C"] = "LPPL-1.3c";
+    DependencyLicense["MS_PL"] = "MS-PL";
+    DependencyLicense["MIT"] = "MIT";
+    DependencyLicense["MPL_2_0"] = "MPL-2.0";
+    DependencyLicense["OSL_3_0"] = "OSL-3.0";
+    DependencyLicense["POSTGRESQL"] = "PostgreSQL";
+    DependencyLicense["OFL_1_1"] = "OFL-1.1";
+    DependencyLicense["NCSA"] = "NCSA";
+    DependencyLicense["UNLICENSE"] = "Unlicense";
+    DependencyLicense["ZLIB"] = "Zlib";
+})(DependencyLicense || (exports.DependencyLicense = DependencyLicense = {}));
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAQX;AARD,WAAY,kBAAkB;IAC5B,kCAAY,CAAA;IACZ,mCAAa,CAAA;IACb,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,mCAAa,CAAA;IACb,+BAAS,CAAA;IACT,iCAAW,CAAA;AACb,CAAC,EARW,kBAAkB,kCAAlB,kBAAkB,QAQ7B;AAED,uJAAuJ;AACvJ,IAAY,iBAqCX;AArCD,WAAY,iBAAiB;IAC3B,qCAAgB,CAAA;IAChB,2CAAsB,CAAA;IACtB,+CAA0B,CAAA;IAC1B,qCAAgB,CAAA;IAChB,gDAA2B,CAAA;IAC3B,gDAA2B,CAAA;IAC3B,2DAAsC,CAAA;IACtC,gDAA2B,CAAA;IAC3B,qCAAgB,CAAA;IAChB,8BAAS,CAAA;IACT,wCAAmB,CAAA;IACnB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;IAC7B,oCAAe,CAAA;IACf,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,kCAAa,CAAA;IACb,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,gCAAW,CAAA;IACX,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,kCAAa,CAAA;IACb,4CAAuB,CAAA;IACvB,kCAAa,CAAA;AACf,CAAC,EArCW,iBAAiB,iCAAjB,iBAAiB,QAqC5B"}

package/dist/commands/sbom/upload.js

@@ -20,7 +20,6 @@ const clipanion_1 = require("clipanion");
 const tags_1 = require("../../helpers/tags");
 const api_1 = require("./api");
 const payload_1 = require("./payload");
-const sbom_intake_1 = require("./protobuf/sbom_intake");
 const validation_1 = require("./validation");
 class UploadSbomCommand extends clipanion_1.Command {
     constructor() {
@@ -32,6 +31,7 @@ class UploadSbomCommand extends clipanion_1.Command {
         this.debug = clipanion_1.Option.Boolean('--debug');
         this.config = {
             apiKey: process_1.default.env.DATADOG_API_KEY || process_1.default.env.DD_API_KEY,
+            appKey: process_1.default.env.DATADOG_APP_KEY || process_1.default.env.DD_APP_KEY || '',
             env: process_1.default.env.DD_ENV,
             envVarTags: process_1.default.env.DD_TAGS,
         };
@@ -60,33 +60,32 @@ class UploadSbomCommand extends clipanion_1.Command {
                 this.context.stderr.write('API key not defined\n');
                 return 1;
             }
-            const api = (0, api_1.getApiHelper)(this.config.apiKey);
-            const spanTags = yield (0, tags_1.getSpanTags)(this.config, this.tags);
+            // Get the API helper to send the payload
+            const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
+            const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags);
             const validator = (0, validation_1.getValidator)();
             for (const basePath of this.basePaths) {
                 if (this.debug) {
                     this.context.stdout.write(`Processing file ${basePath}\n`);
                 }
                 if ((0, validation_1.validateSbomFile)(basePath, validator, !!this.debug)) {
-                    // Get the payload to upload
-                    const payloadData = {
-                        filePath: basePath,
-                        content: JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8')),
-                    };
-                    // If debug mode is activated, we write the payload in a file
-                    if (this.debug) {
-                        const debugFilePath = `${basePath}.payload.pbytes`;
-                        this.context.stdout.write(`Writing payload for debugging in: ${debugFilePath}\n`);
-                        const payloadBytes = sbom_intake_1.SBOMPayload.toJSON((0, payload_1.generatePayload)(payloadData, service, spanTags));
-                        fs_1.default.writeFileSync(debugFilePath, JSON.stringify(payloadBytes));
-                    }
+                    const filePath = basePath;
+                    const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
                     // Upload content
                     try {
-                        const response = yield api((0, payload_1.generatePayload)(payloadData, service, spanTags));
+                        const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags);
+                        if (!scaPayload) {
+                            console.log(`Cannot generate payload for file ${filePath}`);
+                            continue;
+                        }
+                        const startTimeMs = Date.now();
+                        const response = yield api(scaPayload);
+                        const endTimeMs = Date.now();
                         if (this.debug) {
                             this.context.stdout.write(`Upload done, status: ${response.status}\n`);
                         }
-                        this.context.stdout.write(`File ${basePath} successfully uploaded\n`);
+                        const apiTimeMs = endTimeMs - startTimeMs;
+                        this.context.stdout.write(`File ${basePath} successfully uploaded in ${apiTimeMs} ms\n`);
                     }
                     catch (error) {
                         process_1.default.stderr.write(`Error while writing the payload: ${error.message}\n`);