Skip to content

Commit b64cfe3

Browse files
committed
wip
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 6d297a2 commit b64cfe3

21 files changed

+608
-160
lines changed

tests/_data/models.js

+73-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,17 @@ module.exports.createComplexStructure = function () {
6262
})
6363
]),
6464
services: new Models.ServiceRepository([
65-
new Models.Service('sbom-generator-service')
65+
new Models.Service('sbom-generator-service', {
66+
group: 'Service service group',
67+
version: '1',
68+
externalReferences: new Models.ExternalReferenceRepository([
69+
new Models.ExternalReference(
70+
'https://example.com/sbom-generator-service/',
71+
Enums.ExternalReferenceType.Website,
72+
{ comment: 'the service that made this' }
73+
)
74+
])
75+
})
6676
])
6777
}),
6878
authors: new Models.OrganizationalContactRepository([
@@ -313,7 +323,6 @@ module.exports.createComplexStructure = function () {
313323
service.bomRef.value = 'some-service'
314324
service.provider = new Models.OrganizationalEntity({ name: 'Service Provider' })
315325
service.group = 'acme'
316-
service.version = '1.2+service-version'
317326
service.description = 'this is a test service'
318327
service.externalReferences.add(new Models.ExternalReference(
319328
'https://localhost/service/docs',
@@ -599,3 +608,65 @@ module.exports.createComplexStructure = function () {
599608

600609
return bom
601610
}
611+
612+
613+
/**
614+
* @returns {Models.Bom}
615+
*/
616+
module.exports.createAllTools = function () {
617+
const bomSerialNumberRaw = '8fd9e244-73b6-4cd3-ab3a-a0fefdee5c9e'
618+
const bom = new Models.Bom({
619+
version: 7,
620+
serialNumber: `urn:uuid:${bomSerialNumberRaw}`,
621+
})
622+
bom.metadata.tools.components.push(
623+
new Models.Component(
624+
Enums.ComponentType.Application,
625+
'Component tool name', {
626+
group: 'Component tool group',
627+
version: '0.8.15',
628+
hashes: new Models.HashDictionary([
629+
[Enums.HashAlgorithm.MD5, '974e5cc07da6e4536bffd935fd4ddc61'],
630+
[Enums.HashAlgorithm['SHA-1'], '2aae6c35c94fcfb415dbe95f408b9ce91ee846ed']
631+
])
632+
}))
633+
bom.metadata.tools.services.push(
634+
new Models.Service('sbom-generator-service', {
635+
group: 'Service tool group',
636+
version: '1',
637+
externalReferences: new Models.ExternalReferenceRepository([
638+
new Models.ExternalReference(
639+
'https://example.com/sbom-generator-service/',
640+
Enums.ExternalReferenceType.Website,
641+
{ comment: 'the service that made this' }
642+
)
643+
])
644+
})
645+
)
646+
bom.metadata.tools.tools.push(
647+
new Models.Tool({
648+
vendor: 'Tool tool vendor',
649+
name: 'Tool tool name',
650+
version: '0.8.15',
651+
hashes: new Models.HashDictionary([
652+
[Enums.HashAlgorithm.MD5, 'f32a26e2a3a8aa338cd77b6e1263c535'],
653+
[Enums.HashAlgorithm['SHA-1'], '829c3804401b0727f70f73d4415e162400cbe57b']
654+
])
655+
})
656+
)
657+
bom.metadata.tools.tools.push(
658+
new Models.Tool({
659+
vendor: 'Tool tool vendor',
660+
name: 'Tool other tool',
661+
version: '', // empty string, not undefined
662+
externalReferences: new Models.ExternalReferenceRepository([
663+
new Models.ExternalReference(
664+
'https://cyclonedx.org/tool-center/',
665+
Enums.ExternalReferenceType.Website,
666+
{ comment: 'the tools that made this' }
667+
)
668+
])
669+
})
670+
)
671+
return bom
672+
}

tests/_data/normalizeResults/json_sortedLists_spec1.2.json

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.3.json

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.4.json

+15-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.5.json

+17-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.6.json

+17-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/xml_sortedLists_spec1.2.json

+24-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/xml_sortedLists_spec1.3.json

+24-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)