@datadog/datadog-ci 2.47.0 → 2.48.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 (12) hide show
  1. package/dist/commands/sbom/json-schema/spdx/spdx.schema.json +428 -198
  2. package/dist/commands/sbom/language.js +5 -1
  3. package/dist/commands/sbom/language.js.map +1 -1
  4. package/dist/commands/sbom/renderer.d.ts +2 -2
  5. package/dist/commands/sbom/renderer.js +7 -1
  6. package/dist/commands/sbom/renderer.js.map +1 -1
  7. package/dist/commands/sbom/upload.js +2 -1
  8. package/dist/commands/sbom/upload.js.map +1 -1
  9. package/dist/commands/sbom/validation.d.ts +5 -0
  10. package/dist/commands/sbom/validation.js +23 -10
  11. package/dist/commands/sbom/validation.js.map +1 -1
  12. package/package.json +1 -1
package/dist/commands/sbom/json-schema/spdx/spdx.schema.json CHANGED
@@ -1,337 +1,495 @@
1
1
  {
2
2
  "$schema": "http://json-schema.org/draft-07/schema#",
3
3
  "$id": "http://cyclonedx.org/schema/spdx.schema.json",
4
- "$comment": "v1.0-3.12",
4
+ "$comment": "v1.0-3.24.0",
5
5
  "type": "string",
6
6
  "enum": [
7
- "AFL-2.0",
7
+ "0BSD",
8
+ "3D-Slicer-1.0",
8
9
  "AAL",
10
+ "Abstyles",
11
+ "AdaCore-doc",
9
12
  "Adobe-2006",
10
- "AFL-3.0",
13
+ "Adobe-Display-PostScript",
14
+ "Adobe-Glyph",
15
+ "Adobe-Utopia",
11
16
  "ADSL",
12
- "0BSD",
13
- "Afmparse",
17
+ "AFL-1.1",
14
18
  "AFL-1.2",
15
- "AGPL-1.0-or-later",
19
+ "AFL-2.0",
16
20
  "AFL-2.1",
17
- "AFL-1.1",
21
+ "AFL-3.0",
22
+ "Afmparse",
18
23
  "AGPL-1.0",
19
- "Adobe-Glyph",
20
- "AMDPLPA",
24
+ "AGPL-1.0-only",
25
+ "AGPL-1.0-or-later",
26
+ "AGPL-3.0",
27
+ "AGPL-3.0-only",
28
+ "AGPL-3.0-or-later",
21
29
  "Aladdin",
22
- "ANTLR-PD",
30
+ "AMD-newlib",
31
+ "AMDPLPA",
23
32
  "AML",
24
- "Apache-1.0",
33
+ "AML-glslang",
34
+ "AMPAS",
35
+ "ANTLR-PD",
25
36
  "ANTLR-PD-fallback",
26
- "Abstyles",
27
- "AGPL-1.0-only",
37
+ "any-OSI",
38
+ "Apache-1.0",
39
+ "Apache-1.1",
40
+ "Apache-2.0",
28
41
  "APAFML",
42
+ "APL-1.0",
43
+ "App-s2p",
29
44
  "APSL-1.0",
30
45
  "APSL-1.1",
46
+ "APSL-1.2",
31
47
  "APSL-2.0",
32
- "AGPL-3.0-only",
33
- "Apache-1.1",
34
- "Apache-2.0",
35
- "APL-1.0",
36
- "Bahyph",
48
+ "Arphic-1999",
37
49
  "Artistic-1.0",
38
- "AMPAS",
50
+ "Artistic-1.0-cl8",
51
+ "Artistic-1.0-Perl",
52
+ "Artistic-2.0",
53
+ "ASWF-Digital-Assets-1.0",
54
+ "ASWF-Digital-Assets-1.1",
55
+ "Baekmuk",
56
+ "Bahyph",
39
57
  "Barr",
40
- "AGPL-3.0-or-later",
41
- "BlueOak-1.0.0",
58
+ "bcrypt-Solar-Designer",
42
59
  "Beerware",
43
- "Artistic-1.0-cl8",
60
+ "Bitstream-Charter",
61
+ "Bitstream-Vera",
62
+ "BitTorrent-1.0",
63
+ "BitTorrent-1.1",
44
64
  "blessing",
65
+ "BlueOak-1.0.0",
66
+ "Boehm-GC",
45
67
  "Borceux",
46
- "BSD-2-Clause-NetBSD",
68
+ "Brian-Gladman-2-Clause",
69
+ "Brian-Gladman-3-Clause",
47
70
  "BSD-1-Clause",
48
- "BSD-2-Clause-Patent",
49
- "BitTorrent-1.0",
71
+ "BSD-2-Clause",
72
+ "BSD-2-Clause-Darwin",
73
+ "BSD-2-Clause-first-lines",
50
74
  "BSD-2-Clause-FreeBSD",
75
+ "BSD-2-Clause-NetBSD",
76
+ "BSD-2-Clause-Patent",
77
+ "BSD-2-Clause-Views",
78
+ "BSD-3-Clause",
79
+ "BSD-3-Clause-acpica",
51
80
  "BSD-3-Clause-Attribution",
52
- "BSD-2-Clause",
53
- "APSL-1.2",
81
+ "BSD-3-Clause-Clear",
82
+ "BSD-3-Clause-flex",
83
+ "BSD-3-Clause-HP",
54
84
  "BSD-3-Clause-LBNL",
55
- "Artistic-2.0",
56
- "BSD-3-Clause-No-Nuclear-License-2014",
57
85
  "BSD-3-Clause-Modification",
58
- "BSD-4-Clause-Shortened",
59
- "BSD-3-Clause",
60
- "BSD-3-Clause-Open-MPI",
61
- "BitTorrent-1.1",
86
+ "BSD-3-Clause-No-Military-License",
87
+ "BSD-3-Clause-No-Nuclear-License",
88
+ "BSD-3-Clause-No-Nuclear-License-2014",
62
89
  "BSD-3-Clause-No-Nuclear-Warranty",
63
- "BSD-Source-Code",
90
+ "BSD-3-Clause-Open-MPI",
91
+ "BSD-3-Clause-Sun",
92
+ "BSD-4-Clause",
93
+ "BSD-4-Clause-Shortened",
94
+ "BSD-4-Clause-UC",
95
+ "BSD-4.3RENO",
96
+ "BSD-4.3TAHOE",
97
+ "BSD-Advertising-Acknowledgement",
98
+ "BSD-Attribution-HPND-disclaimer",
99
+ "BSD-Inferno-Nettverk",
64
100
  "BSD-Protection",
65
- "AGPL-3.0",
66
- "BUSL-1.1",
67
- "Artistic-1.0-Perl",
101
+ "BSD-Source-beginning-file",
102
+ "BSD-Source-Code",
103
+ "BSD-Systemics",
104
+ "BSD-Systemics-W3Works",
68
105
  "BSL-1.0",
69
- "BSD-2-Clause-Views",
70
- "CAL-1.0-Combined-Work-Exception",
71
- "CATOSL-1.1",
106
+ "BUSL-1.1",
72
107
  "bzip2-1.0.5",
73
108
  "bzip2-1.0.6",
109
+ "C-UDA-1.0",
110
+ "CAL-1.0",
111
+ "CAL-1.0-Combined-Work-Exception",
112
+ "Caldera",
113
+ "Caldera-no-preamble",
114
+ "Catharon",
115
+ "CATOSL-1.1",
116
+ "CC-BY-1.0",
117
+ "CC-BY-2.0",
74
118
  "CC-BY-2.5",
119
+ "CC-BY-2.5-AU",
120
+ "CC-BY-3.0",
75
121
  "CC-BY-3.0-AT",
76
- "C-UDA-1.0",
122
+ "CC-BY-3.0-AU",
123
+ "CC-BY-3.0-DE",
124
+ "CC-BY-3.0-IGO",
125
+ "CC-BY-3.0-NL",
77
126
  "CC-BY-3.0-US",
78
- "CC-BY-1.0",
127
+ "CC-BY-4.0",
79
128
  "CC-BY-NC-1.0",
80
129
  "CC-BY-NC-2.0",
81
130
  "CC-BY-NC-2.5",
82
- "CC-BY-2.0",
131
+ "CC-BY-NC-3.0",
132
+ "CC-BY-NC-3.0-DE",
83
133
  "CC-BY-NC-4.0",
84
134
  "CC-BY-NC-ND-1.0",
85
135
  "CC-BY-NC-ND-2.0",
86
- "CC-BY-NC-3.0",
87
- "CC-BY-NC-ND-3.0-IGO",
136
+ "CC-BY-NC-ND-2.5",
88
137
  "CC-BY-NC-ND-3.0",
89
- "BSD-3-Clause-No-Nuclear-License",
138
+ "CC-BY-NC-ND-3.0-DE",
139
+ "CC-BY-NC-ND-3.0-IGO",
90
140
  "CC-BY-NC-ND-4.0",
141
+ "CC-BY-NC-SA-1.0",
91
142
  "CC-BY-NC-SA-2.0",
143
+ "CC-BY-NC-SA-2.0-DE",
144
+ "CC-BY-NC-SA-2.0-FR",
145
+ "CC-BY-NC-SA-2.0-UK",
92
146
  "CC-BY-NC-SA-2.5",
93
147
  "CC-BY-NC-SA-3.0",
148
+ "CC-BY-NC-SA-3.0-DE",
149
+ "CC-BY-NC-SA-3.0-IGO",
94
150
  "CC-BY-NC-SA-4.0",
95
151
  "CC-BY-ND-1.0",
96
- "BSD-3-Clause-Clear",
152
+ "CC-BY-ND-2.0",
97
153
  "CC-BY-ND-2.5",
98
154
  "CC-BY-ND-3.0",
155
+ "CC-BY-ND-3.0-DE",
99
156
  "CC-BY-ND-4.0",
100
157
  "CC-BY-SA-1.0",
101
- "CC-BY-SA-2.0-UK",
102
158
  "CC-BY-SA-2.0",
159
+ "CC-BY-SA-2.0-UK",
103
160
  "CC-BY-SA-2.1-JP",
104
- "CC-BY-ND-2.0",
105
- "CC-BY-SA-3.0-AT",
161
+ "CC-BY-SA-2.5",
106
162
  "CC-BY-SA-3.0",
163
+ "CC-BY-SA-3.0-AT",
164
+ "CC-BY-SA-3.0-DE",
165
+ "CC-BY-SA-3.0-IGO",
107
166
  "CC-BY-SA-4.0",
108
- "CC-BY-SA-2.5",
109
- "CC-BY-3.0",
110
- "CDDL-1.0",
111
- "CC0-1.0",
112
- "CC-BY-NC-ND-2.5",
113
- "CC-BY-NC-SA-1.0",
114
- "Caldera",
115
- "CDLA-Permissive-1.0",
116
- "CC-BY-4.0",
117
167
  "CC-PDDC",
118
- "BSD-4-Clause-UC",
119
- "BSD-4-Clause",
120
- "CAL-1.0",
168
+ "CC0-1.0",
169
+ "CDDL-1.0",
121
170
  "CDDL-1.1",
122
- "CERN-OHL-1.2",
171
+ "CDL-1.0",
172
+ "CDLA-Permissive-1.0",
173
+ "CDLA-Permissive-2.0",
174
+ "CDLA-Sharing-1.0",
175
+ "CECILL-1.0",
176
+ "CECILL-1.1",
177
+ "CECILL-2.0",
178
+ "CECILL-2.1",
179
+ "CECILL-B",
180
+ "CECILL-C",
123
181
  "CERN-OHL-1.1",
182
+ "CERN-OHL-1.2",
124
183
  "CERN-OHL-P-2.0",
125
184
  "CERN-OHL-S-2.0",
126
- "CECILL-1.1",
127
- "CECILL-2.0",
128
- "CECILL-1.0",
185
+ "CERN-OHL-W-2.0",
186
+ "CFITSIO",
187
+ "check-cvs",
188
+ "checkmk",
189
+ "ClArtistic",
190
+ "Clips",
191
+ "CMU-Mach",
192
+ "CMU-Mach-nodoc",
193
+ "CNRI-Jython",
129
194
  "CNRI-Python",
130
195
  "CNRI-Python-GPL-Compatible",
196
+ "COIL-1.0",
197
+ "Community-Spec-1.0",
198
+ "Condor-1.1",
131
199
  "copyleft-next-0.3.0",
132
- "CPAL-1.0",
133
200
  "copyleft-next-0.3.1",
201
+ "Cornell-Lossless-JPEG",
202
+ "CPAL-1.0",
134
203
  "CPL-1.0",
135
- "ClArtistic",
136
- "CECILL-C",
137
- "CNRI-Jython",
138
- "Condor-1.1",
139
204
  "CPOL-1.02",
205
+ "Cronyx",
206
+ "Crossword",
207
+ "CrystalStacker",
208
+ "CUA-OPL-1.0",
209
+ "Cube",
140
210
  "curl",
211
+ "cve-tou",
212
+ "D-FSL-1.0",
213
+ "DEC-3-Clause",
141
214
  "diffmark",
142
- "Crossword",
143
- "Dotseqn",
215
+ "DL-DE-BY-2.0",
216
+ "DL-DE-ZERO-2.0",
144
217
  "DOC",
145
- "DSDP",
218
+ "Dotseqn",
146
219
  "DRL-1.0",
220
+ "DRL-1.1",
221
+ "DSDP",
222
+ "dtoa",
223
+ "dvipdfm",
147
224
  "ECL-1.0",
148
225
  "ECL-2.0",
149
226
  "eCos-2.0",
150
- "CrystalStacker",
151
- "CERN-OHL-W-2.0",
152
- "D-FSL-1.0",
227
+ "EFL-1.0",
228
+ "EFL-2.0",
153
229
  "eGenix",
154
- "EPICS",
230
+ "Elastic-2.0",
155
231
  "Entessa",
232
+ "EPICS",
156
233
  "EPL-1.0",
157
- "EFL-2.0",
158
- "CUA-OPL-1.0",
159
- "etalab-2.0",
160
- "EUPL-1.0",
234
+ "EPL-2.0",
161
235
  "ErlPL-1.1",
236
+ "etalab-2.0",
162
237
  "EUDatagrid",
238
+ "EUPL-1.0",
163
239
  "EUPL-1.1",
164
- "Cube",
165
- "dvipdfm",
166
- "FreeBSD-DOC",
240
+ "EUPL-1.2",
167
241
  "Eurosym",
168
- "FSFAP",
242
+ "Fair",
243
+ "FBM",
244
+ "FDK-AAC",
245
+ "Ferguson-Twofish",
246
+ "Frameworx-1.0",
247
+ "FreeBSD-DOC",
169
248
  "FreeImage",
170
- "FSFULLR",
249
+ "FSFAP",
250
+ "FSFAP-no-warranty-disclaimer",
171
251
  "FSFUL",
252
+ "FSFULLR",
253
+ "FSFULLRWD",
254
+ "FTL",
255
+ "Furuseth",
256
+ "fwlw",
257
+ "GCR-docs",
172
258
  "GD",
259
+ "GFDL-1.1",
173
260
  "GFDL-1.1-invariants-only",
174
- "EUPL-1.2",
175
- "EPL-2.0",
261
+ "GFDL-1.1-invariants-or-later",
262
+ "GFDL-1.1-no-invariants-only",
176
263
  "GFDL-1.1-no-invariants-or-later",
177
264
  "GFDL-1.1-only",
178
265
  "GFDL-1.1-or-later",
179
- "GFDL-1.1",
180
- "FTL",
181
- "GFDL-1.2-invariants-or-later",
182
- "GFDL-1.1-invariants-or-later",
266
+ "GFDL-1.2",
183
267
  "GFDL-1.2-invariants-only",
268
+ "GFDL-1.2-invariants-or-later",
269
+ "GFDL-1.2-no-invariants-only",
270
+ "GFDL-1.2-no-invariants-or-later",
184
271
  "GFDL-1.2-only",
185
272
  "GFDL-1.2-or-later",
186
- "GFDL-1.2",
187
- "GFDL-1.2-no-invariants-only",
273
+ "GFDL-1.3",
188
274
  "GFDL-1.3-invariants-only",
189
- "GFDL-1.3-no-invariants-only",
190
275
  "GFDL-1.3-invariants-or-later",
191
- "GFDL-1.2-no-invariants-or-later",
192
- "Fair",
193
- "Frameworx-1.0",
276
+ "GFDL-1.3-no-invariants-only",
277
+ "GFDL-1.3-no-invariants-or-later",
278
+ "GFDL-1.3-only",
279
+ "GFDL-1.3-or-later",
194
280
  "Giftware",
195
- "GFDL-1.1-no-invariants-only",
196
281
  "GL2PS",
197
- "Glulxe",
198
282
  "Glide",
199
- "gnuplot",
283
+ "Glulxe",
200
284
  "GLWTPL",
285
+ "gnuplot",
286
+ "GPL-1.0",
287
+ "GPL-1.0+",
201
288
  "GPL-1.0-only",
202
289
  "GPL-1.0-or-later",
203
- "GPL-1.0",
204
- "GFDL-1.3-only",
290
+ "GPL-2.0",
291
+ "GPL-2.0+",
205
292
  "GPL-2.0-only",
206
293
  "GPL-2.0-or-later",
207
294
  "GPL-2.0-with-autoconf-exception",
208
- "GPL-2.0+",
209
- "GFDL-1.3",
210
- "GPL-1.0+",
211
- "CDLA-Sharing-1.0",
212
- "GPL-2.0-with-classpath-exception",
213
- "GPL-2.0-with-GCC-exception",
214
295
  "GPL-2.0-with-bison-exception",
296
+ "GPL-2.0-with-classpath-exception",
215
297
  "GPL-2.0-with-font-exception",
216
- "GPL-2.0",
217
- "CECILL-2.1",
298
+ "GPL-2.0-with-GCC-exception",
218
299
  "GPL-3.0",
219
300
  "GPL-3.0+",
220
- "GPL-3.0-with-autoconf-exception",
221
301
  "GPL-3.0-only",
302
+ "GPL-3.0-or-later",
303
+ "GPL-3.0-with-autoconf-exception",
304
+ "GPL-3.0-with-GCC-exception",
305
+ "Graphics-Gems",
306
+ "gSOAP-1.3b",
307
+ "gtkbook",
308
+ "Gutmann",
309
+ "HaskellReport",
310
+ "hdparm",
222
311
  "Hippocratic-2.1",
312
+ "HP-1986",
313
+ "HP-1989",
223
314
  "HPND",
315
+ "HPND-DEC",
316
+ "HPND-doc",
317
+ "HPND-doc-sell",
318
+ "HPND-export-US",
319
+ "HPND-export-US-acknowledgement",
320
+ "HPND-export-US-modify",
321
+ "HPND-export2-US",
322
+ "HPND-Fenneberg-Livingston",
323
+ "HPND-INRIA-IMAG",
324
+ "HPND-Intel",
325
+ "HPND-Kevlin-Henney",
326
+ "HPND-Markus-Kuhn",
327
+ "HPND-merchantability-variant",
328
+ "HPND-MIT-disclaimer",
329
+ "HPND-Pbmplus",
330
+ "HPND-sell-MIT-disclaimer-xserver",
331
+ "HPND-sell-regexpr",
332
+ "HPND-sell-variant",
333
+ "HPND-sell-variant-MIT-disclaimer",
334
+ "HPND-sell-variant-MIT-disclaimer-rev",
335
+ "HPND-UC",
336
+ "HPND-UC-export-US",
224
337
  "HTMLTIDY",
225
- "GPL-3.0-with-GCC-exception",
226
- "HaskellReport",
227
- "GPL-3.0-or-later",
338
+ "IBM-pibs",
228
339
  "ICU",
340
+ "IEC-Code-Components-EULA",
341
+ "IJG",
342
+ "IJG-short",
229
343
  "ImageMagick",
230
344
  "iMatix",
231
- "IBM-pibs",
232
- "Intel-ACPI",
233
- "Intel",
345
+ "Imlib2",
234
346
  "Info-ZIP",
347
+ "Inner-Net-2.0",
348
+ "Intel",
349
+ "Intel-ACPI",
350
+ "Interbase-1.0",
235
351
  "IPA",
236
- "IJG",
352
+ "IPL-1.0",
237
353
  "ISC",
354
+ "ISC-Veillard",
355
+ "Jam",
238
356
  "JasPer-2.0",
357
+ "JPL-image",
239
358
  "JPNIC",
240
359
  "JSON",
360
+ "Kastrup",
361
+ "Kazlib",
362
+ "Knuth-CTAN",
241
363
  "LAL-1.2",
242
364
  "LAL-1.3",
243
365
  "Latex2e",
366
+ "Latex2e-translated-notice",
244
367
  "Leptonica",
245
- "HPND-sell-variant",
368
+ "LGPL-2.0",
369
+ "LGPL-2.0+",
246
370
  "LGPL-2.0-only",
247
371
  "LGPL-2.0-or-later",
248
- "Imlib2",
249
- "IPL-1.0",
372
+ "LGPL-2.1",
373
+ "LGPL-2.1+",
250
374
  "LGPL-2.1-only",
251
375
  "LGPL-2.1-or-later",
252
- "LGPL-2.0+",
253
- "LGPL-2.0",
254
- "CECILL-B",
255
- "LGPL-3.0-or-later",
376
+ "LGPL-3.0",
377
+ "LGPL-3.0+",
256
378
  "LGPL-3.0-only",
379
+ "LGPL-3.0-or-later",
257
380
  "LGPLLR",
258
- "libpng-2.0",
259
381
  "Libpng",
382
+ "libpng-2.0",
260
383
  "libselinux-1.0",
261
- "LGPL-3.0+",
262
- "EFL-1.0",
263
384
  "libtiff",
264
- "GFDL-1.3-no-invariants-or-later",
265
- "LiLiQ-Rplus-1.1",
266
- "LiLiQ-R-1.1",
267
- "LPL-1.0",
385
+ "libutil-David-Nugent",
268
386
  "LiLiQ-P-1.1",
387
+ "LiLiQ-R-1.1",
388
+ "LiLiQ-Rplus-1.1",
389
+ "Linux-man-pages-1-para",
390
+ "Linux-man-pages-copyleft",
391
+ "Linux-man-pages-copyleft-2-para",
392
+ "Linux-man-pages-copyleft-var",
269
393
  "Linux-OpenIB",
394
+ "LOOP",
395
+ "LPD-document",
396
+ "LPL-1.0",
397
+ "LPL-1.02",
270
398
  "LPPL-1.0",
399
+ "LPPL-1.1",
271
400
  "LPPL-1.2",
272
401
  "LPPL-1.3a",
273
- "LPL-1.02",
274
402
  "LPPL-1.3c",
403
+ "lsof",
404
+ "Lucida-Bitmap-Fonts",
405
+ "LZMA-SDK-9.11-to-9.20",
406
+ "LZMA-SDK-9.22",
407
+ "Mackerras-3-Clause",
408
+ "Mackerras-3-Clause-acknowledgment",
409
+ "magaz",
410
+ "mailprio",
275
411
  "MakeIndex",
276
- "LGPL-2.1+",
277
- "LPPL-1.1",
278
- "MIT-CMU",
412
+ "Martin-Birgmeier",
413
+ "McPhee-slideshow",
414
+ "metamail",
415
+ "Minpack",
279
416
  "MirOS",
280
- "MIT-advertising",
281
- "MIT-Modern-Variant",
282
417
  "MIT",
418
+ "MIT-0",
419
+ "MIT-advertising",
420
+ "MIT-CMU",
283
421
  "MIT-enna",
284
- "MIT-open-group",
285
422
  "MIT-feh",
423
+ "MIT-Festival",
424
+ "MIT-Khronos-old",
425
+ "MIT-Modern-Variant",
426
+ "MIT-open-group",
427
+ "MIT-testregex",
428
+ "MIT-Wu",
286
429
  "MITNFA",
287
- "MPL-1.0",
430
+ "MMIXware",
431
+ "Motosoto",
432
+ "MPEG-SSG",
433
+ "mpi-permissive",
288
434
  "mpich2",
435
+ "MPL-1.0",
436
+ "MPL-1.1",
289
437
  "MPL-2.0",
290
438
  "MPL-2.0-no-copyleft-exception",
439
+ "mplus",
440
+ "MS-LPL",
441
+ "MS-PL",
291
442
  "MS-RL",
292
443
  "MTLL",
293
- "MPL-1.1",
444
+ "MulanPSL-1.0",
294
445
  "MulanPSL-2.0",
295
- "Motosoto",
446
+ "Multics",
296
447
  "Mup",
297
- "MulanPSL-1.0",
298
448
  "NAIST-2003",
449
+ "NASA-1.3",
299
450
  "Naumen",
300
- "Multics",
301
451
  "NBPL-1.0",
452
+ "NCBI-PD",
453
+ "NCGL-UK-2.0",
454
+ "NCL",
302
455
  "NCSA",
303
456
  "Net-SNMP",
304
457
  "NetCDF",
305
- "NASA-1.3",
458
+ "Newsletr",
306
459
  "NGPL",
307
- "NIST-PD-fallback",
460
+ "NICTA-1.0",
308
461
  "NIST-PD",
309
- "Newsletr",
462
+ "NIST-PD-fallback",
463
+ "NIST-Software",
464
+ "NLOD-1.0",
465
+ "NLOD-2.0",
310
466
  "NLPL",
311
467
  "Nokia",
312
468
  "NOSL",
313
469
  "Noweb",
314
- "NLOD-1.0",
315
470
  "NPL-1.0",
316
- "NCGL-UK-2.0",
471
+ "NPL-1.1",
472
+ "NPOSL-3.0",
317
473
  "NRL",
318
- "NTP-0",
319
474
  "NTP",
320
- "GFDL-1.3-or-later",
475
+ "NTP-0",
321
476
  "Nunit",
322
477
  "O-UDA-1.0",
323
- "NPL-1.1",
478
+ "OAR",
324
479
  "OCCT-PL",
480
+ "OCLC-2.0",
481
+ "ODbL-1.0",
325
482
  "ODC-By-1.0",
483
+ "OFFIS",
484
+ "OFL-1.0",
326
485
  "OFL-1.0-no-RFN",
327
- "OCLC-2.0",
328
486
  "OFL-1.0-RFN",
329
- "OFL-1.0",
487
+ "OFL-1.1",
330
488
  "OFL-1.1-no-RFN",
331
489
  "OFL-1.1-RFN",
332
- "OFL-1.1",
333
- "OGDL-Taiwan-1.0",
334
490
  "OGC-1.0",
491
+ "OGDL-Taiwan-1.0",
492
+ "OGL-Canada-2.0",
335
493
  "OGL-UK-1.0",
336
494
  "OGL-UK-2.0",
337
495
  "OGL-UK-3.0",
@@ -339,152 +497,214 @@
339
497
  "OLDAP-1.1",
340
498
  "OLDAP-1.2",
341
499
  "OLDAP-1.3",
342
- "OGL-Canada-2.0",
343
- "OLDAP-2.0.1",
500
+ "OLDAP-1.4",
344
501
  "OLDAP-2.0",
502
+ "OLDAP-2.0.1",
345
503
  "OLDAP-2.1",
504
+ "OLDAP-2.2",
346
505
  "OLDAP-2.2.1",
347
506
  "OLDAP-2.2.2",
348
- "OLDAP-2.2",
349
- "ODbL-1.0",
350
- "OLDAP-2.4",
351
- "OLDAP-1.4",
352
507
  "OLDAP-2.3",
508
+ "OLDAP-2.4",
509
+ "OLDAP-2.5",
510
+ "OLDAP-2.6",
353
511
  "OLDAP-2.7",
354
512
  "OLDAP-2.8",
513
+ "OLFL-1.3",
355
514
  "OML",
515
+ "OpenPBS-2.3",
356
516
  "OpenSSL",
357
- "OLDAP-2.6",
517
+ "OpenSSL-standalone",
518
+ "OpenVision",
358
519
  "OPL-1.0",
520
+ "OPL-UK-3.0",
521
+ "OPUBL-1.0",
522
+ "OSET-PL-2.1",
359
523
  "OSL-1.0",
360
524
  "OSL-1.1",
361
525
  "OSL-2.0",
362
- "OSET-PL-2.1",
363
526
  "OSL-2.1",
527
+ "OSL-3.0",
528
+ "PADL",
364
529
  "Parity-6.0.0",
365
530
  "Parity-7.0.0",
366
531
  "PDDL-1.0",
367
532
  "PHP-3.0",
368
- "OSL-3.0",
533
+ "PHP-3.01",
534
+ "Pixar",
535
+ "pkgconf",
369
536
  "Plexus",
370
- "MS-PL",
371
- "PolyForm-Small-Business-1.0.0",
537
+ "pnmstitch",
372
538
  "PolyForm-Noncommercial-1.0.0",
539
+ "PolyForm-Small-Business-1.0.0",
540
+ "PostgreSQL",
541
+ "PPL",
373
542
  "PSF-2.0",
374
543
  "psfrag",
375
- "PostgreSQL",
376
544
  "psutils",
545
+ "Python-2.0",
546
+ "Python-2.0.1",
547
+ "python-ldap",
377
548
  "Qhull",
378
549
  "QPL-1.0",
550
+ "QPL-1.0-INRIA-2004",
551
+ "radvd",
379
552
  "Rdisc",
380
- "Python-2.0",
553
+ "RHeCos-1.1",
381
554
  "RPL-1.1",
382
555
  "RPL-1.5",
383
- "RHeCos-1.1",
556
+ "RPSL-1.0",
384
557
  "RSA-MD",
385
558
  "RSCPL",
386
559
  "Ruby",
387
560
  "SAX-PD",
561
+ "SAX-PD-2.0",
388
562
  "Saxpath",
389
563
  "SCEA",
390
- "Sendmail-8.23",
564
+ "SchemeReport",
391
565
  "Sendmail",
566
+ "Sendmail-8.23",
392
567
  "SGI-B-1.0",
393
568
  "SGI-B-1.1",
394
569
  "SGI-B-2.0",
570
+ "SGI-OpenGL",
571
+ "SGP4",
395
572
  "SHL-0.5",
396
573
  "SHL-0.51",
397
574
  "SimPL-2.0",
398
- "SISSL-1.2",
399
575
  "SISSL",
576
+ "SISSL-1.2",
577
+ "SL",
400
578
  "Sleepycat",
401
579
  "SMLNJ",
402
580
  "SMPPL",
403
581
  "SNIA",
582
+ "snprintf",
583
+ "softSurfer",
584
+ "Soundex",
404
585
  "Spencer-86",
405
586
  "Spencer-94",
406
587
  "Spencer-99",
407
588
  "SPL-1.0",
589
+ "ssh-keyscan",
408
590
  "SSH-OpenSSH",
409
- "PHP-3.01",
410
591
  "SSH-short",
411
- "MIT-0",
412
- "RPSL-1.0",
413
- "SWL",
592
+ "SSLeay-standalone",
593
+ "SSPL-1.0",
594
+ "StandardML-NJ",
414
595
  "SugarCRM-1.1.3",
596
+ "Sun-PPP",
597
+ "Sun-PPP-2000",
598
+ "SunPro",
599
+ "SWL",
600
+ "swrule",
601
+ "Symlinks",
602
+ "TAPR-OHL-1.0",
415
603
  "TCL",
416
604
  "TCP-wrappers",
417
- "SSPL-1.0",
605
+ "TermReadKey",
606
+ "TGPPL-1.0",
607
+ "threeparttable",
418
608
  "TMate",
419
- "TOSL",
420
609
  "TORQUE-1.1",
421
- "TAPR-OHL-1.0",
610
+ "TOSL",
611
+ "TPDL",
612
+ "TPL-1.0",
613
+ "TTWL",
614
+ "TTYP0",
615
+ "TU-Berlin-1.0",
616
+ "TU-Berlin-2.0",
617
+ "UCAR",
422
618
  "UCL-1.0",
619
+ "ulem",
620
+ "UMich-Merit",
621
+ "Unicode-3.0",
423
622
  "Unicode-DFS-2015",
424
623
  "Unicode-DFS-2016",
425
624
  "Unicode-TOU",
426
- "TU-Berlin-1.0",
427
- "UPL-1.0",
625
+ "UnixCrypt",
428
626
  "Unlicense",
429
- "VOSTROM",
627
+ "UPL-1.0",
628
+ "URT-RLE",
430
629
  "Vim",
630
+ "VOSTROM",
431
631
  "VSL-1.0",
432
- "W3C-20150513",
433
632
  "W3C",
434
633
  "W3C-19980720",
435
- "Wsuipa",
634
+ "W3C-20150513",
635
+ "w3m",
436
636
  "Watcom-1.0",
637
+ "Widget-Workshop",
638
+ "Wsuipa",
437
639
  "WTFPL",
640
+ "wxWindows",
438
641
  "X11",
642
+ "X11-distribute-modifications-variant",
643
+ "Xdebug-1.03",
439
644
  "Xerox",
645
+ "Xfig",
440
646
  "XFree86-1.1",
441
647
  "xinetd",
648
+ "xkeyboard-config-Zinoviev",
649
+ "xlock",
442
650
  "Xnet",
443
651
  "xpp",
444
652
  "XSkat",
653
+ "xzoom",
445
654
  "YPL-1.0",
446
655
  "YPL-1.1",
447
656
  "Zed",
657
+ "Zeeff",
448
658
  "Zend-2.0",
449
- "TU-Berlin-2.0",
659
+ "Zimbra-1.3",
450
660
  "Zimbra-1.4",
451
- "zlib-acknowledgement",
452
661
  "Zlib",
662
+ "zlib-acknowledgement",
453
663
  "ZPL-1.1",
454
664
  "ZPL-2.0",
455
665
  "ZPL-2.1",
456
- "wxWindows",
457
- "Zimbra-1.3",
458
- "gSOAP-1.3b",
459
- "Interbase-1.0",
460
- "LGPL-2.1",
461
- "LGPL-3.0",
462
- "NPOSL-3.0",
463
- "OLDAP-2.5",
464
- "StandardML-NJ",
465
666
  "389-exception",
667
+ "Asterisk-exception",
668
+ "Asterisk-linking-protocols-exception",
466
669
  "Autoconf-exception-2.0",
467
670
  "Autoconf-exception-3.0",
671
+ "Autoconf-exception-generic",
672
+ "Autoconf-exception-generic-3.0",
673
+ "Autoconf-exception-macro",
674
+ "Bison-exception-1.24",
468
675
  "Bison-exception-2.2",
469
676
  "Bootloader-exception",
470
677
  "Classpath-exception-2.0",
471
678
  "CLISP-exception-2.0",
679
+ "cryptsetup-OpenSSL-exception",
472
680
  "DigiRule-FOSS-exception",
473
681
  "eCos-exception-2.0",
474
682
  "Fawkes-Runtime-exception",
475
683
  "FLTK-exception",
684
+ "fmt-exception",
476
685
  "Font-exception-2.0",
477
686
  "freertos-exception-2.0",
478
687
  "GCC-exception-2.0",
688
+ "GCC-exception-2.0-note",
479
689
  "GCC-exception-3.1",
690
+ "Gmsh-exception",
691
+ "GNAT-exception",
692
+ "GNOME-examples-exception",
693
+ "GNU-compiler-exception",
480
694
  "gnu-javamail-exception",
695
+ "GPL-3.0-interface-exception",
481
696
  "GPL-3.0-linking-exception",
482
697
  "GPL-3.0-linking-source-exception",
483
698
  "GPL-CC-1.0",
699
+ "GStreamer-exception-2005",
700
+ "GStreamer-exception-2008",
484
701
  "i2p-gpl-java-exception",
702
+ "KiCad-libraries-exception",
485
703
  "LGPL-3.0-linking-exception",
704
+ "libpri-OpenH323-exception",
486
705
  "Libtool-exception",
487
706
  "Linux-syscall-note",
707
+ "LLGPL",
488
708
  "LLVM-exception",
489
709
  "LZMA-exception",
490
710
  "mif-exception",
@@ -493,15 +713,25 @@
493
713
  "OCCT-exception-1.0",
494
714
  "OpenJDK-assembly-exception-1.0",
495
715
  "openvpn-openssl-exception",
716
+ "PCRE2-exception",
496
717
  "PS-or-PDF-font-exception-20170817",
718
+ "QPL-1.0-INRIA-2004-exception",
497
719
  "Qt-GPL-exception-1.0",
498
720
  "Qt-LGPL-exception-1.1",
499
721
  "Qwt-exception-1.0",
722
+ "RRDtool-FLOSS-exception-2.0",
723
+ "SANE-exception",
500
724
  "SHL-2.0",
501
725
  "SHL-2.1",
726
+ "stunnel-exception",
727
+ "SWI-exception",
502
728
  "Swift-exception",
729
+ "Texinfo-exception",
503
730
  "u-boot-exception-2.0",
731
+ "UBDL-exception",
504
732
  "Universal-FOSS-exception-1.0",
505
- "WxWindows-exception-3.1"
733
+ "vsftpd-openssl-exception",
734
+ "WxWindows-exception-3.1",
735
+ "x11vnc-openssl-exception"
506
736
  ]
507
737
  }
package/dist/commands/sbom/language.js CHANGED
@@ -6,7 +6,11 @@ const types_1 = require("./types");
6
6
  // the bom-ref or the purl property of the SBOM.
7
7
  const getLanguageFromComponent = (component) => {
8
8
  const componentName = component['name'];
9
+ let purlDisplay = 'N/A';
9
10
  if (component['bom-ref']) {
11
+ if (component['purl']) {
12
+ purlDisplay = component['purl'];
13
+ }
10
14
  if (component['bom-ref'].includes('pkg:npm') || component['purl'].includes('pkg:npm')) {
11
15
  return types_1.DependencyLanguage.NPM;
12
16
  }
@@ -32,7 +36,7 @@ const getLanguageFromComponent = (component) => {
32
36
  return types_1.DependencyLanguage.DOTNET;
33
37
  }
34
38
  }
35
- console.debug(`language for component ${componentName} not found`);
39
+ console.debug(`language not detected for ${componentName} with due to purl (${purlDisplay})`);
36
40
  return undefined;
37
41
  };
38
42
  exports.getLanguageFromComponent = getLanguageFromComponent;
package/dist/commands/sbom/language.js.map CHANGED
@@ -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,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"}
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,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACrB,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;SAChC;QAED,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,6BAA6B,aAAa,sBAAsB,WAAW,GAAG,CAAC,CAAA;IAE7F,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAvCY,QAAA,wBAAwB,4BAuCpC"}
package/dist/commands/sbom/renderer.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { Dependency } from './types';
1
+ import { Dependency, ScaRequest } from './types';
2
2
  export declare const renderInvalidFile: (sbomReport: string) => string;
3
3
  export declare const renderInvalidPayload: (sbomReport: string) => string;
4
4
  export declare const renderDuplicateUpload: (sha: string, env: string, service: string) => string;
5
5
  export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
6
6
  export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
7
- export declare const renderUploading: (sbomReport: string) => string;
7
+ export declare const renderUploading: (sbomReport: string, scaRequest: ScaRequest) => string;
8
8
  export declare const renderSuccessfulCommand: (duration: number) => string;
9
9
  export declare const renderPayloadWarning: (dependencies: Dependency[]) => string;
package/dist/commands/sbom/renderer.js CHANGED
@@ -59,7 +59,13 @@ const renderFailedUpload = (sbomReport, error) => {
59
59
  return fullStr;
60
60
  };
61
61
  exports.renderFailedUpload = renderFailedUpload;
62
- const renderUploading = (sbomReport) => `Uploading SBOM report in ${sbomReport}\n`;
62
+ const renderUploading = (sbomReport, scaRequest) => {
63
+ const languages = new Set();
64
+ for (const dep of scaRequest.dependencies) {
65
+ languages.add(dep.language.toString());
66
+ }
67
+ return `Uploading SBOM report in ${sbomReport} (${scaRequest.dependencies.length} dependencies detected for languages ${Array.from(languages).join(',')})\nUpload for repository ${scaRequest.repository.url}, branch ${scaRequest.commit.branch}\n`;
68
+ };
63
69
  exports.renderUploading = renderUploading;
64
70
  const renderSuccessfulCommand = (duration) => {
65
71
  let fullStr = '';
package/dist/commands/sbom/renderer.js.map CHANGED
@@ -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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"}
package/dist/commands/sbom/upload.js CHANGED
@@ -103,7 +103,8 @@ class UploadSbomCommand extends clipanion_1.Command {
103
103
  return 1;
104
104
  }
105
105
  this.context.stdout.write((0, renderer_2.renderPayloadWarning)(scaPayload.dependencies));
106
- this.context.stdout.write((0, renderer_2.renderUploading)(basePath));
106
+ scaPayload.dependencies = (0, validation_1.filterInvalidDependencies)(scaPayload.dependencies);
107
+ this.context.stdout.write((0, renderer_2.renderUploading)(basePath, scaPayload));
107
108
  yield api(scaPayload);
108
109
  if (this.debug) {
109
110
  this.context.stdout.write(`Upload done for ${basePath}.\n`);
package/dist/commands/sbom/upload.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;AAG7B,iCAA+D;AAC/D,yCAAyC;AAEzC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,6CAAsG;AAEtG,gDAAmD;AAEnD,+BAAkC;AAClC,uCAAyC;AACzC,yCASmB;AAEnB,6CAA6G;AAE7G,MAAa,iBAAkB,SAAQ,mBAAO;IAA9C;;;QAYU,aAAQ,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;QAC1B,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAClD,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAClC,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7B,UAAK,GAAG,kBAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACjC,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QAEhD,WAAM,GAAG;YACf,MAAM,EAAE,iBAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAO,CAAC,GAAG,CAAC,UAAU;YAC7D,MAAM,EAAE,iBAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;YACnE,GAAG,EAAE,iBAAO,CAAC,GAAG,CAAC,MAAM;YACvB,UAAU,EAAE,iBAAO,CAAC,GAAG,CAAC,OAAO;YAC/B,IAAI,EAAE,iBAAO,CAAC,GAAG,CAAC,wBAAY,CAAC;SAChC,CAAA;QAEO,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,eAAU,GAAG;YACnB,IAAI,EAAE,MAAA,IAAA,eAAS,EAAC,iBAAO,CAAC,GAAG,CAAC,wBAAY,CAAC,CAAC,mCAAI,KAAK;YACnD,eAAe,EAAE,MAAA,IAAA,eAAS,EAAC,iBAAO,CAAC,GAAG,CAAC,qCAAyB,CAAC,CAAC,mCAAI,KAAK;SAC5E,CAAA;IAiHH,CAAC;IA/GC;;;OAGG;IACU,OAAO;;;YAClB,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;YAEtG,MAAM,OAAO,GAAW,IAAI,CAAC,OAAO,CAAA;YAEpC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAA;YAE5B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBAE/C,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAA;gBAE/F,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAA;gBAE/F,OAAO,CAAC,CAAA;aACT;YAED,yCAAyC;YACzC,MAAM,GAAG,GAA6D,IAAA,kBAAY,EAChF,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAA;YAED,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEtE,iEAAiE;YACjE,MAAM,gBAAgB,GAAG,IAAA,gCAAyB,EAAC,IAAI,CAAC,CAAA;YACxD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,gBAAgB,CAAC,CAAC,CAAA;gBAE9D,OAAO,CAAC,CAAA;aACT;YAED,MAAM,SAAS,GAAQ,IAAA,yBAAY,GAAE,CAAA;YAErC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;YAE9B,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,QAAQ,IAAI,CAAC,CAAA;aAC3D;YAED,IAAI,CAAC,IAAA,0CAA6B,EAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACrE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,mHAAmH,CACpH,CAAA;aACF;YACD,IAAI,CAAC,IAAA,gDAAmC,EAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,QAAQ,CAAC,CAAC,CAAA;gBAEtD,OAAO,CAAC,CAAA;aACT;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;YAE1E,iBAAiB;YACjB,IAAI;gBACF,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;gBAE3E,IAAI,CAAC,UAAU,EAAE;oBACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,+BAAoB,EAAC,QAAQ,CAAC,CAAC,CAAA;oBAEzD,OAAO,CAAC,CAAA;iBACT;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,+BAAoB,EAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAA;gBAExE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC,CAAA;gBAEpD,MAAM,GAAG,CAAC,UAAU,CAAC,CAAA;gBACrB,IAAI,IAAI,CAAC,KAAK,EAAE;oBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,QAAQ,KAAK,CAAC,CAAA;iBAC5D;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;oBACvB,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;wBAClC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAO,CAAC,IAAI,eAAe,CAAA;wBAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;wBAE3E,OAAO,CAAC,CAAA;qBACT;oBAED,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;wBAClC,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAkB,CAAC,IAAI,eAAe,CAAA;wBACjE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,EAAC,aAAa,CAAC,CAAC,CAAA;wBAE/D,OAAO,CAAC,CAAA;qBACT;iBACF;gBAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;gBAE9D,OAAO,CAAC,CAAA;aACT;YAED,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,CAAA;YACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,YAAY,CAAC,CAAC,CAAA;YAEhE,OAAO,CAAC,CAAA;;KACT;;AAhJH,8CAiJC;AAhJe,uBAAK,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,AAAvB,CAAuB;AAE5B,uBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,iBAAiB;IAC3B,WAAW,EAAE,+BAA+B;IAC5C,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE,CAAC,CAAC,gCAAgC,EAAE,uDAAuD,CAAC,CAAC;CACxG,CAAC,AAPiB,CAOjB"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
package/dist/commands/sbom/validation.d.ts CHANGED
@@ -19,4 +19,9 @@ export declare const validateSbomFileAgainstSchema: (path: string, ajv: Ajv, deb
19
19
  * @param debug - if we need to show debug information
20
20
  */
21
21
  export declare const validateFileAgainstToolRequirements: (path: string, debug: boolean) => boolean;
22
+ /**
23
+ * Filter invalid dependencies if some data is not compliant to what we expect.
24
+ * @param dependencies
25
+ */
26
+ export declare const filterInvalidDependencies: (dependencies: Dependency[]) => Dependency[];
22
27
  export declare const validateDependencyName: (dependency: Dependency) => boolean;
package/dist/commands/sbom/validation.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.validateDependencyName = exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
6
+ exports.validateDependencyName = exports.filterInvalidDependencies = exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
7
7
  const fs_1 = __importDefault(require("fs"));
8
8
  const ajv_1 = __importDefault(require("ajv"));
9
9
  const ajv_formats_1 = __importDefault(require("ajv-formats"));
@@ -117,15 +117,6 @@ const validateFileAgainstToolRequirements = (path, debug) => {
117
117
  }
118
118
  return false;
119
119
  }
120
- else {
121
- try {
122
- packageurl_js_1.PackageURL.fromString(component['purl']);
123
- }
124
- catch (purlError) {
125
- process.stderr.write(`invalid purl ${component['purl']} for component ${component['name']}: ${purlError.message}\n`);
126
- return false;
127
- }
128
- }
129
120
  }
130
121
  }
131
122
  }
@@ -138,6 +129,28 @@ const validateFileAgainstToolRequirements = (path, debug) => {
138
129
  return true;
139
130
  };
140
131
  exports.validateFileAgainstToolRequirements = validateFileAgainstToolRequirements;
132
+ /**
133
+ * Filter invalid dependencies if some data is not compliant to what we expect.
134
+ * @param dependencies
135
+ */
136
+ const filterInvalidDependencies = (dependencies) => {
137
+ const filteredDependencies = [];
138
+ for (const dep of dependencies) {
139
+ let isValid = true;
140
+ try {
141
+ packageurl_js_1.PackageURL.fromString(dep.purl);
142
+ }
143
+ catch (purlError) {
144
+ isValid = false;
145
+ process.stderr.write(`invalid purl ${dep.purl} for component ${dep.name}\n`);
146
+ }
147
+ if (isValid) {
148
+ filteredDependencies.push(dep);
149
+ }
150
+ }
151
+ return filteredDependencies;
152
+ };
153
+ exports.filterInvalidDependencies = filterInvalidDependencies;
141
154
  const pythonPackaNameRegex = new RegExp('^[a-zA-Z0-9][a-zA-Z0-9\\-_.]*[a-zA-Z0-9]$');
142
155
  const validateDependencyName = (dependency) => {
143
156
  if (dependency.language === types_1.DependencyLanguage.PYTHON && !pythonPackaNameRegex.test(dependency.name)) {
package/dist/commands/sbom/validation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datadog/datadog-ci",
3
- "version": "2.47.0",
3
+ "version": "2.48.0",
4
4
  "description": "Run datadog actions from the CI.",
5
5
  "repository": "https://github.com/DataDog/datadog-ci",
6
6
  "license": "Apache-2.0",