@datadog/datadog-ci 2.32.1 → 2.32.3

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 (35) hide show
  1. package/dist/commands/git-metadata/api.js +1 -1
  2. package/dist/commands/git-metadata/api.js.map +1 -1
  3. package/dist/commands/git-metadata/upload.js +2 -1
  4. package/dist/commands/git-metadata/upload.js.map +1 -1
  5. package/dist/commands/react-native/xcode.d.ts +1 -0
  6. package/dist/commands/react-native/xcode.js +38 -5
  7. package/dist/commands/react-native/xcode.js.map +1 -1
  8. package/dist/commands/sbom/language.js +1 -1
  9. package/dist/commands/sbom/language.js.map +1 -1
  10. package/dist/commands/sbom/license.js +0 -4
  11. package/dist/commands/sbom/license.js.map +1 -1
  12. package/dist/commands/sbom/payload.js +76 -0
  13. package/dist/commands/sbom/payload.js.map +1 -1
  14. package/dist/commands/sbom/renderer.js +1 -1
  15. package/dist/commands/sbom/renderer.js.map +1 -1
  16. package/dist/commands/sbom/types.d.ts +23 -0
  17. package/dist/commands/sbom/upload.js.map +1 -1
  18. package/dist/commands/synthetics/api.d.ts +9 -3
  19. package/dist/commands/synthetics/api.js +28 -17
  20. package/dist/commands/synthetics/api.js.map +1 -1
  21. package/dist/commands/synthetics/batch.d.ts +3 -0
  22. package/dist/commands/synthetics/batch.js +180 -0
  23. package/dist/commands/synthetics/batch.js.map +1 -0
  24. package/dist/commands/synthetics/errors.d.ts +8 -1
  25. package/dist/commands/synthetics/errors.js +14 -1
  26. package/dist/commands/synthetics/errors.js.map +1 -1
  27. package/dist/commands/synthetics/interfaces.d.ts +6 -6
  28. package/dist/commands/synthetics/reporters/default.d.ts +2 -2
  29. package/dist/commands/synthetics/reporters/default.js +4 -2
  30. package/dist/commands/synthetics/reporters/default.js.map +1 -1
  31. package/dist/commands/synthetics/run-tests-lib.js +3 -0
  32. package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
  33. package/dist/commands/synthetics/utils/public.js +11 -130
  34. package/dist/commands/synthetics/utils/public.js.map +1 -1
  35. package/package.json +1 -1
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getBaseIntakeUrl = exports.apiHost = exports.datadogSite = void 0;
4
- exports.datadogSite = process.env.DATADOG_SITE || 'datadoghq.com';
4
+ exports.datadogSite = process.env.DATADOG_SITE || process.env.DD_SITE || 'datadoghq.com';
5
5
  exports.apiHost = 'api.' + exports.datadogSite;
6
6
  const getBaseIntakeUrl = () => {
7
7
  if (process.env.DATADOG_SOURCEMAP_INTAKE_URL) {
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/api.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,eAAe,CAAA;AAEzD,QAAA,OAAO,GAAG,MAAM,GAAG,mBAAW,CAAA;AAEpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;QAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;KAChD;IAED,OAAO,2BAA2B,GAAG,mBAAW,CAAA;AAClD,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/api.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AAEhF,QAAA,OAAO,GAAG,MAAM,GAAG,mBAAW,CAAA;AAEpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;QAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;KAChD;IAED,OAAO,2BAA2B,GAAG,mBAAW,CAAA;AAClD,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B"}
@@ -70,7 +70,8 @@ class UploadCommand extends clipanion_1.Command {
70
70
  this.logger.warn('Option --git-sync is deprecated as it is now the default behavior');
71
71
  }
72
72
  const metricsLogger = (0, metrics_1.getMetricsLogger)({
73
- datadogSite: process.env.DATADOG_SITE,
73
+ apiKey: this.config.apiKey,
74
+ datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
74
75
  defaultTags: [`cli_version:${this.cliVersion}`],
75
76
  prefix: 'datadog.ci.report_commits.',
76
77
  });
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
@@ -28,4 +28,5 @@ export declare class XCodeCommand extends Command {
28
28
  */
29
29
  private shouldComposeHermesSourcemaps;
30
30
  private shouldUploadSourcemaps;
31
+ private shouldBundleRNCode;
31
32
  }
@@ -235,7 +235,36 @@ class XCodeCommand extends clipanion_1.Command {
235
235
  const podfileLockContent = (0, fs_1.readFileSync)(podfileLockPath).toString();
236
236
  return !!podfileLockContent.match('hermes-engine');
237
237
  };
238
- this.shouldUploadSourcemaps = () => process.env.CONFIGURATION === 'Release' || this.force;
238
+ this.shouldUploadSourcemaps = () => {
239
+ var _a;
240
+ // If we did not bundle the RN code, we won't have anything to upload.
241
+ if (!this.shouldBundleRNCode()) {
242
+ return false;
243
+ }
244
+ if (this.force) {
245
+ return true;
246
+ }
247
+ // We don't upload sourcemaps if the configuration is "Debug"
248
+ return !((_a = process.env.CONFIGURATION) === null || _a === void 0 ? void 0 : _a.includes('Debug'));
249
+ };
250
+ this.shouldBundleRNCode = () => {
251
+ var _a, _b;
252
+ if (this.force) {
253
+ return true;
254
+ }
255
+ // We keep the same logic and order than react-native-xcode.sh script from RN.
256
+ if (!!process.env.SKIP_BUNDLING) {
257
+ return false;
258
+ }
259
+ if ((_a = process.env.CONFIGURATION) === null || _a === void 0 ? void 0 : _a.includes('Debug')) {
260
+ // We don't build for simulators in debug mode but we do for real devices.
261
+ // See https://github.com/DataDog/expo-datadog/issues/31
262
+ if ((_b = process.env.PLATFORM_NAME) === null || _b === void 0 ? void 0 : _b.includes('simulator')) {
263
+ return !!process.env.FORCE_BUNDLING;
264
+ }
265
+ }
266
+ return true;
267
+ };
239
268
  }
240
269
  execute() {
241
270
  return __awaiter(this, void 0, void 0, function* () {
@@ -273,13 +302,17 @@ class XCodeCommand extends clipanion_1.Command {
273
302
  if (releaseVersion === null || buildVersion === null) {
274
303
  return 1;
275
304
  }
276
- if (!this.shouldUploadSourcemaps()) {
277
- this.context.stdout.write(`Build configuration ${process.env.CONFIGURATION} is not Release, skipping sourcemaps upload`);
278
- return 0;
279
- }
280
305
  // Run bundle script
281
306
  try {
307
+ if (!this.shouldBundleRNCode()) {
308
+ this.context.stdout.write(`Skipping bundling and sourcemaps upload.`);
309
+ return 0;
310
+ }
282
311
  yield this.bundleReactNativeCodeAndImages();
312
+ if (!this.shouldUploadSourcemaps()) {
313
+ this.context.stdout.write(`Build configuration ${process.env.CONFIGURATION} is not Release, skipping sourcemaps upload.`);
314
+ return 0;
315
+ }
283
316
  /**
284
317
  * Because of a bug in React Native (https://github.com/facebook/react-native/issues/34212), the composition
285
318
  * of the 2 Hermes sourcemaps is not done correctly. Therefore we need to do the composition ourselves to
@@ -1 +1 @@
1
- {"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,iDAAmC;AACnC,2BAA2C;AAC3C,+BAAwB;AAExB,yCAA8C;AAE9C,+CAA8C;AAE9C,qCAAsC;AACtC,mCAA6C;AAE7C;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,IAAI;QACF,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAE5D,oEAAoE;QACpE,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAA;KAC9D;IAAC,OAAO,KAAK,EAAE;QACd,+FAA+F;QAC/F,IAAI,IAAA,eAAU,EAAC,2CAA2C,CAAC,EAAE;YAC3D,OAAO,8BAA8B,CAAA;SACtC;QAED,0CAA0C;QAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;YAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;SAChD;QAED,4EAA4E;QAC5E,OAAO,2BAA2B,CAAA;KACnC;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;AAE5C,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,GAAG,kBAAkB,EAAE,gCAAgC,CAAA;AAE1F,MAAa,YAAa,SAAQ,mBAAO;IAAzC;;QAsBU,0BAAqB,GAAG,kBAAM,CAAC,MAAM,CAC3C,2BAA2B,EAC3B,GAAG,eAAe,iCAAiC,CACpD,CAAA;QACO,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACtC,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAC5C,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,UAAK,GAAG,kBAAM,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAClD,yBAAoB,GAAG,kBAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACjE,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEpC,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAA,CAAC,aAAa;QAkI3D,mCAA8B,GAAG,GAAS,EAAE;YAClD,MAAM,oBAAoB,GAAG,IAAA,qBAAK,EAAC,IAAI,CAAC,UAAU,IAAI,oBAAoB,EAAE,EAAE,EAAE,EAAE;gBAChF,GAAG,EAAE,IAAI,CAAC,4CAA4C,EAAE;gBACxD,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAChD,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBAC1E,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,iDAA4C,GAAG,GAAG,EAAE;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;YAEvB;;;;eAIG;YACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;gBACxC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAA;aACxB;YAED,OAAO,GAAG,CAAA;QACZ,CAAC,CAAA;QAEO,4BAAuB,GAAG,CAAO,kBAA0B,EAAE,EAAE;YACrE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE;gBAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yGAAyG,CAC1G,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,wGAAwG,CACzG,CAAA;gBAED,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAA;aACF;YAED,MAAM,mCAAmC,GAAG,IAAA,qBAAK,EAC/C,IAAI,CAAC,qBAAqB,EAC1B;gBACE,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,oBAAoB;gBAC1D,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,oBAAoB;gBAC3G,IAAI;gBACJ,kBAAkB;aACnB,EACD;gBACE,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CACF,CAAA;YACD,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YACF,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAC/D,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBACzF,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,oBAAe,GAAG,GAAkB,EAAE;YAC5C,IAAI;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;gBAE1D,OAAO,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;aACjF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;oBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,CAC1F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,8EAA8E,IAAI,CAAC,aAAa,KAAK,CACtG,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gIAAgI,CACjI,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;QAC5C,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAG,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxC,OAAO,IAAI,CAAA;aACZ;YAED,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,gBAAgB,CAAA;QAC/D,CAAC,CAAA;QAEO,kBAAa,GAAG,CAAC,YAAoB,EAAmB,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;aAC7C;YAED,OAAO,IAAA,kBAAU,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACtE,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAkB,EAAE;YAC9C,IAAI;gBACF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;gBAEvE,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAA;aACvF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;oBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;oBAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,2FAA2F,CAC5F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,IAAI,CAAC,aAAa,KAAK,CACjH,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,0HAA0H,CAC3H,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;QACtC,CAAC,CAAA;QAEO,0BAAqB,GAAG,GAAG,EAAE;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC9B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aACvC;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;gBACnC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACjE,MAAM,uBAAuB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,oBAAoB,CAAC,GAAG,CAAC,CAAA;gBACnG,IAAI,uBAAuB,KAAK,CAAC,EAAE;oBACjC,OAAO,IAAI,CAAA;iBACZ;gBAED,OAAO,cAAc,CAAC,uBAAuB,CAAC,CAAA;aAC/C;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED;;;;WAIG;QACK,kCAA6B,GAAG,GAAY,EAAE;YACpD;;;eAGG;YACH,MAAM,kBAAkB,GAAG,IAAA,6BAAqB,EAAC,GAAG,eAAe,eAAe,CAAC,CAAA;YACnF,IAAI,CAAC,kBAAkB,EAAE;gBACvB,OAAO,KAAK,CAAA;aACb;YACD,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAChD,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE;gBACtB,OAAO,KAAK,CAAA;aACb;YAED;;;;eAIG;YACH,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,OAAO,CAAA;aACxD;YAED;;;;eAIG;YACH,IAAI,IAAA,eAAU,EAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,qCAAqC,CAAC,EAAE;gBAC7E,OAAO,IAAI,CAAA;aACZ;YAED;;;;;;eAMG;YACH,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAe,CAAA;YAC3E,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;gBAChC,OAAO,KAAK,CAAA;aACb;YACD,MAAM,kBAAkB,GAAG,IAAA,iBAAY,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;YAEnE,OAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACpD,CAAC,CAAA;QAEO,2BAAsB,GAAG,GAAY,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAA;IACvG,CAAC;IAxWc,OAAO;;YAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAA;YAEpG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAChF,IAAI,CAAC,aAAa,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aAChF;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4FAA4F,CAC7F,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAA;gBAC9F,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAA;gBAC7G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gGAAgG,CACjG,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAA;gBAC3G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,+GAA+G,CAChH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAA;YACvD,IAAI,CAAC,kBAAkB,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAA;gBACtE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,iKAAiK,CAClK,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uHAAuH,CACxH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,IAAI,CAAC,cAAc,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;gBACxE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4KAA4K,CAC7K,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;YAC3C,IAAI,cAAc,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE;gBACpD,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;gBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uBAAuB,OAAO,CAAC,GAAG,CAAC,aAAa,6CAA6C,CAC9F,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,oBAAoB;YACpB,IAAI;gBACF,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAA;gBAE3C;;;;mBAIG;gBACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;oBAClE,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAA;iBACvD;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAA;gBAEzF,OAAO,CAAC,CAAA;aACT;YAED,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAA;aACzF;YAED,sCAAsC;YACtC,MAAM,GAAG,GAAG,IAAI,eAAG,EAAE,CAAA;YACrB,GAAG,CAAC,QAAQ,CAAC,sBAAa,CAAC,CAAA;YAE3B,MAAM,aAAa,GAAG;gBACpB,cAAc;gBACd,QAAQ;gBACR,YAAY;gBACZ,KAAK;gBACL,mBAAmB;gBACnB,cAAc;gBACd,iBAAiB;gBACjB,YAAY;gBACZ,WAAW;gBACX,IAAI,CAAC,OAAO;gBACZ,UAAU;gBACV,cAAc;gBACd,aAAa;gBACb,kBAAkB;aACnB,CAAA;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aAChD;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;aACpC;YACD,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;aAC3D;YACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;aAC/C;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;aAChC;YAED,OAAO,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;KAAA;;AAnKH,oCA6YC;AA5Ye,kBAAK,GAAG,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,AAA9B,CAA8B;AAEnC,kBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,8EAA8E;IAC3F,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR;YACE,0CAA0C;YAC1C,wVAAwV;SACzV;QACD;YACE,2CAA2C;YAC3C,4OAA4O;SAC7O;KACF;CACF,CAAC,AAjBiB,CAiBjB"}
1
+ {"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ const types_1 = require("./types");
7
7
  const getLanguageFromComponent = (component) => {
8
8
  const componentName = component['name'];
9
9
  if (component['bom-ref']) {
10
- if (component['bom-ref'].includes('pkg:npm')) {
10
+ if (component['bom-ref'].includes('pkg:npm') || component['purl'].includes('pkg:npm')) {
11
11
  return types_1.DependencyLanguage.NPM;
12
12
  }
13
13
  if (component['purl'].includes('pkg:composer')) {
@@ -1 +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,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;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"}
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"}
@@ -87,7 +87,6 @@ exports.getLicensesFromString = getLicensesFromString;
87
87
  const getLicensesFromComponent = (component) => {
88
88
  var _a;
89
89
  const elementsForLicense = ['id', 'name'];
90
- const componentName = component['name'];
91
90
  const licensesSet = new Set();
92
91
  // Get the "licenses" attribute of the SBOM component.
93
92
  if (component['licenses']) {
@@ -108,9 +107,6 @@ const getLicensesFromComponent = (component) => {
108
107
  }
109
108
  }
110
109
  }
111
- if (licensesSet.size === 0) {
112
- console.log(`license for component ${componentName} not found`);
113
- }
114
110
  return Array.from(licensesSet);
115
111
  };
116
112
  exports.getLicensesFromComponent = getLicensesFromComponent;
@@ -1 +1 @@
1
- {"version":3,"file":"license.js","sourceRoot":"","sources":["../../../src/commands/sbom/license.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AAEzC,uGAAuG;AACvG,+JAA+J;AAC/J,MAAM,oBAAoB,GAAG,CAAC,CAAS,EAAiC,EAAE;IACxE,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,SAAS,CAAA;KACjB;IAED,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC,OAAO,CAAA;QAClC,KAAK,YAAY,CAAC;QAClB,KAAK,UAAU,CAAC;QAChB,KAAK,6BAA6B,CAAC;QACnC,KAAK,0CAA0C,CAAC;QAChD,KAAK,oBAAoB,CAAC;QAC1B,KAAK,2BAA2B,CAAC;QACjC,KAAK,iCAAiC,CAAC;QACvC,KAAK,4BAA4B;YAC/B,OAAO,yBAAiB,CAAC,OAAO,CAAA;QAClC,KAAK,cAAc;YACjB,OAAO,yBAAiB,CAAC,UAAU,CAAA;QACrC,KAAK,cAAc;YACjB,OAAO,yBAAiB,CAAC,UAAU,CAAA;QACrC,KAAK,SAAS;YACZ,OAAO,yBAAiB,CAAC,IAAI,CAAA;QAC/B,KAAK,KAAK;YACR,OAAO,yBAAiB,CAAC,OAAO,CAAA;QAClC,KAAK,SAAS,CAAC;QACf,KAAK,4BAA4B,CAAC;QAClC,KAAK,qCAAqC;YACxC,OAAO,yBAAiB,CAAC,MAAM,CAAA;QACjC,KAAK,gCAAgC,CAAC;QACtC,KAAK,6BAA6B;YAChC,OAAO,yBAAiB,CAAC,MAAM,CAAA;QACjC,KAAK,QAAQ,CAAC;QACd,KAAK,8CAA8C;YACjD,OAAO,yBAAiB,CAAC,MAAM,CAAA;QACjC,KAAK,QAAQ;YACX,OAAO,yBAAiB,CAAC,MAAM,CAAA;QACjC,KAAK,KAAK;YACR,OAAO,yBAAiB,CAAC,GAAG,CAAA;QAC9B,KAAK,KAAK,CAAC;QACX,KAAK,iBAAiB,CAAC;QACvB,KAAK,aAAa;YAChB,OAAO,yBAAiB,CAAC,GAAG,CAAA;QAC9B,KAAK,SAAS,CAAC;QACf,KAAK,qCAAqC;YACxC,OAAO,yBAAiB,CAAC,OAAO,CAAA;QAClC,KAAK,WAAW;YACd,OAAO,yBAAiB,CAAC,SAAS,CAAA;QACpC,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC,IAAI,CAAA;KAChC;IAED,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;IAE9C,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,sFAAsF;AACtF,2FAA2F;AACpF,MAAM,qBAAqB,GAAG,CAAC,CAAS,EAAuB,EAAE;IACtE,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,EAAE,CAAA;KACV;IACD,MAAM,QAAQ,GAAwB,EAAE,CAAA;IAExC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClC,KAAK,MAAM,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC/C,MAAM,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1C,IAAI,CAAC,EAAE;gBACL,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;KACF;SAAM;QACL,MAAM,GAAG,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACnC,IAAI,GAAG,EAAE;YACP,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACnB;KACF;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AArBY,QAAA,qBAAqB,yBAqBjC;AAED,qGAAqG;AACrG,oGAAoG;AACpG,yCAAyC;AAClC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAuB,EAAE;;IAC9E,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAEzC,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IACvC,MAAM,WAAW,GAA2B,IAAI,GAAG,EAAE,CAAA;IAErD,sDAAsD;IACtD,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE;QACzB,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE;YAC3C,KAAK,MAAM,EAAE,IAAI,kBAAkB,EAAE;gBACnC,uDAAuD;gBACvD,IAAI,MAAA,OAAO,CAAC,SAAS,CAAC,0CAAG,EAAE,CAAC,EAAE;oBAC5B,KAAK,MAAM,CAAC,IAAI,IAAA,6BAAqB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;wBAC7D,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;qBACnB;iBACF;aACF;YACD,8CAA8C;YAC9C,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;gBACzB,KAAK,MAAM,CAAC,IAAI,IAAA,6BAAqB,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE;oBAC5D,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;iBACnB;aACF;SACF;KACF;IAED,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,yBAAyB,aAAa,YAAY,CAAC,CAAA;KAChE;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AAChC,CAAC,CAAA;AA/BY,QAAA,wBAAwB,4BA+BpC"}
1
+ {"version":3,"file":"license.js","sourceRoot":"","sources":["../../../src/commands/sbom/license.ts"],"names":[],"mappings":"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"}
@@ -32,6 +32,62 @@ const crypto_1 = __importDefault(require("crypto"));
32
32
  const tags_1 = require("../../helpers/tags");
33
33
  const language_1 = require("./language");
34
34
  const license_1 = require("./license");
35
+ // Parse a location from the file generated by osv-scanner into a location that can be
36
+ // sent to our API.
37
+ const parseLocation = (location) => {
38
+ if (!location) {
39
+ return undefined;
40
+ }
41
+ if (!location.file_name ||
42
+ !location.line_start ||
43
+ !location.line_end ||
44
+ !location.column_start ||
45
+ !location.column_end) {
46
+ return undefined;
47
+ }
48
+ if (location.line_end < location.line_start) {
49
+ return undefined;
50
+ }
51
+ if (location.line_end === location.line_start && location.column_end <= location.column_start) {
52
+ return undefined;
53
+ }
54
+ // check location values
55
+ if (location.line_start <= 0 || location.line_end <= 0 || location.column_start <= 0 || location.column_end <= 0) {
56
+ return undefined;
57
+ }
58
+ return {
59
+ file_name: location.file_name,
60
+ start: {
61
+ line: location.line_start,
62
+ col: location.column_start,
63
+ },
64
+ end: {
65
+ line: location.line_end,
66
+ col: location.column_end,
67
+ },
68
+ };
69
+ };
70
+ // Parse all locations from the OSV scanner. If one fails to be parse, it's set to undefined
71
+ const parseLocationsString = (locations) => {
72
+ try {
73
+ const parsed = JSON.parse(locations);
74
+ const res = {
75
+ block: parseLocation(parsed['block']),
76
+ namespace: parseLocation(parsed['namespace']),
77
+ name: parseLocation(parsed['name']),
78
+ version: parseLocation(parsed['version']),
79
+ };
80
+ // if block is not defined, the API fails and we should rather ignore the payload
81
+ if (!res.block) {
82
+ return undefined;
83
+ }
84
+ return res;
85
+ }
86
+ catch (e) {
87
+ console.error(`error when parsing locations: ${e}`);
88
+ }
89
+ return undefined;
90
+ };
35
91
  // Generate the payload we send to the API
36
92
  // jsonContent is the SBOM file content read from disk
37
93
  // tags are the list of tags we retrieved
@@ -62,6 +118,25 @@ const generatePayload = (jsonContent, tags, service, env) => {
62
118
  console.error(`cannot find purl for component ${component['name']}`);
63
119
  continue;
64
120
  }
121
+ const locations = [];
122
+ // Extract the unique location strings from the file.
123
+ const locationsStrings = new Set();
124
+ if (component['evidence'] && component['evidence']['occurrences']) {
125
+ for (const occ of component['evidence']['occurrences']) {
126
+ if (occ['location']) {
127
+ const loc = occ['location'];
128
+ if (!locationsStrings.has(loc)) {
129
+ locationsStrings.add(loc);
130
+ }
131
+ }
132
+ }
133
+ }
134
+ for (const l of locationsStrings) {
135
+ const loc = parseLocationsString(l);
136
+ if (loc) {
137
+ locations.push(loc);
138
+ }
139
+ }
65
140
  const dependency = {
66
141
  name: component['name'],
67
142
  group: component['group'] || undefined,
@@ -69,6 +144,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
69
144
  language: lang,
70
145
  licenses: (0, license_1.getLicensesFromComponent)(component),
71
146
  purl,
147
+ locations,
72
148
  };
73
149
  dependencies.push(dependency);
74
150
  }
@@ -1 +1 @@
1
- {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,oDAA2B;AAG3B,6CAM2B;AAE3B,yCAAmD;AACnD,uCAAkD;AAGlD,0CAA0C;AAC1C,sDAAsD;AACtD,yCAAyC;AAClC,MAAM,eAAe,GAAG,CAC7B,WAAgB,EAChB,IAAc,EACd,OAAe,EACf,GAAW,EACa,EAAE;IAC1B,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,IAAI,GAAuB,SAAS,CAAC,MAAM,CAAC,CAAA;gBAElD,IAAI,CAAC,IAAI,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;oBACpE,SAAQ;iBACT;gBAED,MAAM,UAAU,GAAe;oBAC7B,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;oBACvB,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS;oBACtC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;oBAC7B,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAA,kCAAwB,EAAC,SAAS,CAAC;oBAC7C,IAAI;iBACL,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;QACZ,OAAO;QACP,GAAG;KACJ,CAAA;AACH,CAAC,CAAA;AAtEY,QAAA,eAAe,mBAsE3B"}
1
+ {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ const ICONS = {
15
15
  const renderInvalidFile = (sbomReport) => {
16
16
  const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
17
17
  let fullStr = '';
18
- fullStr += chalk_1.default.red(`${ICONS.FAILED} Invalid SARIF report file ${reportPath}.\n`);
18
+ fullStr += chalk_1.default.red(`${ICONS.FAILED} Invalid SBOM report file ${reportPath}.\n`);
19
19
  fullStr += chalk_1.default.red(`The report is not a valid SBOM or is not compliant with our json schema.\n`);
20
20
  return fullStr;
21
21
  };
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
@@ -46,6 +46,28 @@ export declare enum DependencyLicense {
46
46
  UNLICENSE = "Unlicense",
47
47
  ZLIB = "Zlib"
48
48
  }
49
+ export interface LocationFromFile {
50
+ file_name: string;
51
+ line_start: number;
52
+ line_end: number;
53
+ column_start: number;
54
+ column_end: number;
55
+ }
56
+ export interface Position {
57
+ line: number;
58
+ col: number;
59
+ }
60
+ export interface Location {
61
+ file_name: string;
62
+ start: Position;
63
+ end: Position;
64
+ }
65
+ export interface Locations {
66
+ block: undefined | Location;
67
+ namespace: undefined | Location;
68
+ name: undefined | Location;
69
+ version: undefined | Location;
70
+ }
49
71
  export interface Dependency {
50
72
  name: string;
51
73
  version: string;
@@ -53,6 +75,7 @@ export interface Dependency {
53
75
  language: DependencyLanguage;
54
76
  licenses: DependencyLicense[];
55
77
  purl: string;
78
+ locations: undefined | Locations[];
56
79
  }
57
80
  export interface CommitInformation {
58
81
  author_name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
@@ -11,10 +11,16 @@ export declare class EndpointError extends Error {
11
11
  }
12
12
  export declare const formatBackendErrors: (requestError: AxiosError<BackendError>) => string;
13
13
  export declare const completeMultipartMobileApplicationUpload: (request: (args: AxiosRequestConfig) => AxiosPromise<void>) => (applicationId: string, uploadId: string, key: string, uploadPartResponses: MobileApplicationUploadPartResponse[]) => Promise<void>;
14
- export declare const isForbiddenError: (error: AxiosError | EndpointError) => boolean;
15
- export declare const isNotFoundError: (error: AxiosError | EndpointError) => boolean;
14
+ export type RetryPolicy = {
15
+ retryOn404?: boolean | undefined;
16
+ retryOn429?: boolean | undefined;
17
+ };
18
+ export declare const determineRetryDelay: (retries: number, error: Error, retryPolicy?: RetryPolicy) => number | undefined;
19
+ export declare const isForbiddenError: (error: Error) => boolean;
20
+ export declare const isNotFoundError: (error: Error) => boolean;
21
+ export declare const isTooManyRequestsError: (error: Error) => boolean;
16
22
  export declare const isNodeError: (error: unknown) => error is NodeJS.ErrnoException;
17
- export declare const is5xxError: (error: AxiosError | EndpointError) => boolean | 0 | undefined;
23
+ export declare const is5xxError: (error: Error) => boolean;
18
24
  export declare const apiConstructor: (configuration: APIConfiguration) => {
19
25
  getBatch: (batchId: string) => Promise<Batch>;
20
26
  getMobileApplicationPresignedURLs: (applicationId: string, appSize: number, parts: MobileApplicationUploadPart[]) => Promise<MultipartPresignedUrlsResponse>;
@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isNotFoundError = exports.isForbiddenError = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
12
+ exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isTooManyRequestsError = exports.isNotFoundError = exports.isForbiddenError = exports.determineRetryDelay = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
13
13
  const querystring_1 = require("querystring");
14
+ const axios_1 = require("axios");
14
15
  const utils_1 = require("../../helpers/utils");
15
16
  const errors_1 = require("./errors");
16
17
  const run_tests_command_1 = require("./run-tests-command");
@@ -18,6 +19,8 @@ const public_1 = require("./utils/public");
18
19
  const MAX_RETRIES = 3;
19
20
  const DELAY_BETWEEN_RETRIES = 500; // In ms
20
21
  const LARGE_DELAY_BETWEEN_RETRIES = 1000; // In ms
22
+ // SYNTH-13709: Use the `Retry-After` header.
23
+ const DELAY_BETWEEN_429_RETRIES = 5000; // In ms
21
24
  class EndpointError extends Error {
22
25
  constructor(message, status) {
23
26
  super(message);
@@ -52,13 +55,13 @@ const triggerTests = (request) => (data) => __awaiter(void 0, void 0, void 0, fu
52
55
  headers: { 'X-Trigger-App': public_1.ciTriggerApp },
53
56
  method: 'POST',
54
57
  url: '/synthetics/tests/trigger/ci',
55
- }, request);
58
+ }, request, { retryOn429: true });
56
59
  return resp.data;
57
60
  });
58
61
  const getTest = (request) => (testId) => __awaiter(void 0, void 0, void 0, function* () {
59
62
  const resp = yield retryRequest({
60
63
  url: `/synthetics/tests/${testId}`,
61
- }, request);
64
+ }, request, { retryOn429: true });
62
65
  return resp.data;
63
66
  });
64
67
  const searchTests = (request) => (query) => __awaiter(void 0, void 0, void 0, function* () {
@@ -79,7 +82,10 @@ const getSyntheticsOrgSettings = (request) => () => __awaiter(void 0, void 0, vo
79
82
  return resp.data;
80
83
  });
81
84
  const getBatch = (request) => (batchId) => __awaiter(void 0, void 0, void 0, function* () {
82
- const resp = yield retryRequest({ url: `/synthetics/ci/batch/${batchId}` }, request, retryOn5xxOr404Errors);
85
+ const resp = yield retryRequest({ url: `/synthetics/ci/batch/${batchId}` }, request, {
86
+ retryOn404: true,
87
+ retryOn429: true,
88
+ });
83
89
  const serverBatch = resp.data.data;
84
90
  return {
85
91
  results: serverBatch.results.filter((r) => r.status !== 'skipped' || r.selective_rerun),
@@ -92,7 +98,7 @@ const pollResults = (request) => (resultIds) => __awaiter(void 0, void 0, void 0
92
98
  result_ids: JSON.stringify(resultIds),
93
99
  },
94
100
  url: '/synthetics/tests/poll_results',
95
- }, request, retryOn5xxOr404Errors);
101
+ }, request, { retryOn404: true, retryOn429: true });
96
102
  return resp.data.results;
97
103
  });
98
104
  const getTunnelPresignedURL = (request) => (testIds) => __awaiter(void 0, void 0, void 0, function* () {
@@ -165,37 +171,42 @@ const createMobileVersion = (request) => (version) => __awaiter(void 0, void 0,
165
171
  }, request);
166
172
  return resp.data;
167
173
  });
168
- const retryOn5xxErrors = (retries, error) => {
169
- // Retry on Node.js errors for both retry policies.
174
+ const retryWithJitter = (delay = DELAY_BETWEEN_429_RETRIES) => delay + Math.floor(Math.random() * delay);
175
+ const determineRetryDelay = (retries, error, retryPolicy = { retryOn404: false, retryOn429: false }) => {
176
+ // Always retry on Node.js errors
170
177
  if (retries < MAX_RETRIES && (0, exports.isNodeError)(error)) {
171
178
  return LARGE_DELAY_BETWEEN_RETRIES;
172
179
  }
180
+ // Always retry on 5xx
173
181
  if (retries < MAX_RETRIES && (0, exports.is5xxError)(error)) {
174
182
  return DELAY_BETWEEN_RETRIES;
175
183
  }
176
- };
177
- const retryOn5xxOr404Errors = (retries, error) => {
178
- const retryOn5xxDelay = retryOn5xxErrors(retries, error);
179
- if (retryOn5xxDelay) {
180
- return retryOn5xxDelay;
181
- }
182
- if (retries < MAX_RETRIES && (0, exports.isNotFoundError)(error)) {
184
+ // Retry on 404
185
+ if (retryPolicy.retryOn404 && retries < MAX_RETRIES && (0, exports.isNotFoundError)(error)) {
183
186
  return DELAY_BETWEEN_RETRIES;
184
187
  }
188
+ // Retry on 429
189
+ if (retryPolicy.retryOn429 && retries < MAX_RETRIES && (0, exports.isTooManyRequestsError)(error)) {
190
+ return retryWithJitter(DELAY_BETWEEN_429_RETRIES);
191
+ }
185
192
  };
186
- const getErrorHttpStatus = (error) => { var _a; return 'status' in error ? error.status : (_a = error.response) === null || _a === void 0 ? void 0 : _a.status; };
193
+ exports.determineRetryDelay = determineRetryDelay;
194
+ const isEndpointError = (error) => error instanceof EndpointError;
195
+ const getErrorHttpStatus = (error) => { var _a; return isEndpointError(error) ? error.status : (0, axios_1.isAxiosError)(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined; };
187
196
  const isForbiddenError = (error) => getErrorHttpStatus(error) === 403;
188
197
  exports.isForbiddenError = isForbiddenError;
189
198
  const isNotFoundError = (error) => getErrorHttpStatus(error) === 404;
190
199
  exports.isNotFoundError = isNotFoundError;
200
+ const isTooManyRequestsError = (error) => getErrorHttpStatus(error) === 429;
201
+ exports.isTooManyRequestsError = isTooManyRequestsError;
191
202
  const isNodeError = (error) => !!error && 'code' in error;
192
203
  exports.isNodeError = isNodeError;
193
204
  const is5xxError = (error) => {
194
205
  const statusCode = getErrorHttpStatus(error);
195
- return statusCode && statusCode >= 500 && statusCode <= 599;
206
+ return statusCode && statusCode >= 500 && statusCode <= 599 ? true : false;
196
207
  };
197
208
  exports.is5xxError = is5xxError;
198
- const retryRequest = (args, request, retryPolicy = retryOn5xxErrors) => (0, public_1.retry)(() => request(args), retryPolicy);
209
+ const retryRequest = (args, request, statusCodesToRetryOn) => (0, public_1.retry)(() => request(args), (retries, e) => (0, exports.determineRetryDelay)(retries, e, statusCodesToRetryOn));
199
210
  const apiConstructor = (configuration) => {
200
211
  const { baseUrl, baseIntakeUrl, baseUnstableUrl, apiKey, appKey, proxyOpts } = configuration;
201
212
  const baseOptions = { apiKey, appKey, proxyOpts };
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { APIHelper } from './api';
2
+ import { MainReporter, Result, ResultDisplayInfo, Trigger } from './interfaces';
3
+ export declare const waitForBatchToFinish: (api: APIHelper, maxPollingTimeout: number, trigger: Trigger, resultDisplayInfo: ResultDisplayInfo, reporter: MainReporter) => Promise<Result[]>;