oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-04 08:26:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update CycloneDX to use syft namespace and output multiple CPEs (#849)

Browse Source
This commit is contained in:
Keith Zantow
2022-03-01 17:37:52 -05:00
committed by GitHub
parent d2f28e0eb1
commit edac8c7bf7
14 changed files with 715 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/formats/cyclonedx13json/test-fixtures/snapshot/TestCycloneDxDirectoryEncoder.golden
+28 -20
View File
@@ -1,10 +1,10 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.3",
"serialNumber": "urn:uuid:326afa86-5620-4a80-8f2b-7f283b954b9b",
"serialNumber": "urn:uuid:195a66a2-6d39-472e-b62b-0cafb9bfedd4",
"version": 1,
"metadata": {
"timestamp": "2022-02-10T17:19:38-05:00",
"timestamp": "2022-02-25T12:54:25-05:00",
"tools": [
{
"vendor": "anchore",
@@ -35,23 +35,23 @@
"purl": "a-purl-2",
"properties": [
{
"name": "foundBy",
"name": "syft:package:foundBy",
"value": "the-cataloger-1"
},
{
"name": "language",
"name": "syft:package:language",
"value": "python"
},
{
"name": "type",
"value": "python"
},
{
"name": "metadataType",
"name": "syft:package:metadataType",
"value": "PythonPackageMetadata"
},
{
"name": "path",
"name": "syft:package:type",
"value": "python"
},
{
"name": "syft:location:0:path",
"value": "/some/path/pkg1"
}
]
@@ -64,20 +64,24 @@
"purl": "a-purl-2",
"properties": [
{
"name": "foundBy",
"name": "syft:package:foundBy",
"value": "the-cataloger-2"
},
{
"name": "type",
"value": "deb"
},
{
"name": "metadataType",
"name": "syft:package:metadataType",
"value": "DpkgMetadata"
},
{
"name": "path",
"name": "syft:package:type",
"value": "deb"
},
{
"name": "syft:location:0:path",
"value": "/some/path/pkg1"
},
{
"name": "syft:metadata:installedSize",
"value": "0"
}
]
},
@@ -93,15 +97,19 @@
},
"properties": [
{
"name": "prettyName",
"name": "syft:distro:id",
"value": "debian"
},
{
"name": "id",
"name": "syft:distro:idLike:0",
"value": "like!"
},
{
"name": "syft:distro:prettyName",
"value": "debian"
},
{
"name": "versionID",
"name": "syft:distro:versionID",
"value": "1.2.3"
}
]
internal/formats/cyclonedx13json/test-fixtures/snapshot/TestCycloneDxImageEncoder.golden
+32 -24
View File
@@ -1,10 +1,10 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.3",
"serialNumber": "urn:uuid:761a2036-0f25-4787-bf28-f5e9a7d9a0bf",
"serialNumber": "urn:uuid:78116a1b-b709-4734-8411-d0e339308edd",
"version": 1,
"metadata": {
"timestamp": "2022-02-10T17:19:38-05:00",
"timestamp": "2022-02-25T12:54:25-05:00",
"tools": [
{
"vendor": "anchore",
@@ -35,28 +35,28 @@
"purl": "a-purl-1",
"properties": [
{
"name": "foundBy",
"name": "syft:package:foundBy",
"value": "the-cataloger-1"
},
{
"name": "language",
"name": "syft:package:language",
"value": "python"
},
{
"name": "type",
"value": "python"
},
{
"name": "metadataType",
"name": "syft:package:metadataType",
"value": "PythonPackageMetadata"
},
{
"name": "path",
"value": "/somefile-1.txt"
"name": "syft:package:type",
"value": "python"
},
{
"name": "layerID",
"name": "syft:location:0:layerID",
"value": "sha256:41e7295da66c405eb3a4df29188dcf80f622f9304d487033a86d4a22e3f01abe"
},
{
"name": "syft:location:0:path",
"value": "/somefile-1.txt"
}
]
},
@@ -68,24 +68,28 @@
"purl": "a-purl-2",
"properties": [
{
"name": "foundBy",
"name": "syft:package:foundBy",
"value": "the-cataloger-2"
},
{
"name": "type",
"value": "deb"
},
{
"name": "metadataType",
"name": "syft:package:metadataType",
"value": "DpkgMetadata"
},
{
"name": "path",
"name": "syft:package:type",
"value": "deb"
},
{
"name": "syft:location:0:layerID",
"value": "sha256:68a2c166dcb3acf6b7303e995ca1fe7d794bd3b5852a0b4048f9c96b796086aa"
},
{
"name": "syft:location:0:path",
"value": "/somefile-2.txt"
},
{
"name": "layerID",
"value": "sha256:68a2c166dcb3acf6b7303e995ca1fe7d794bd3b5852a0b4048f9c96b796086aa"
"name": "syft:metadata:installedSize",
"value": "0"
}
]
},
@@ -101,15 +105,19 @@
},
"properties": [
{
"name": "prettyName",
"name": "syft:distro:id",
"value": "debian"
},
{
"name": "id",
"name": "syft:distro:idLike:0",
"value": "like!"
},
{
"name": "syft:distro:prettyName",
"value": "debian"
},
{
"name": "versionID",
"name": "syft:distro:versionID",
"value": "1.2.3"
}
]