feat: Add the origin field to the output format of syftjson (#1327)

* moved the relevant fields to the Metadata field

Signed-off-by: Asaf Greenholts <asaf@cidersecurity.io>

* added metadata types

Signed-off-by: Asaf Greenholts <asaf@cidersecurity.io>

* Added hashes to metadata of packge-lock.json and Pipfile.lock

Signed-off-by: Asaf Greenholts <asaf@cidersecurity.io>

* move package metadata types to "pkg" package

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* re-generate json schema to include new npm, python, and binary metadatas

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

Signed-off-by: Asaf Greenholts <asaf@cidersecurity.io>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Co-authored-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Asi Greenholts
2023-01-12 15:03:05 -05:00
committed by GitHub
co-authored by Alex Goodman
parent 85bddaa43d
commit 260cb4c72d
13 changed files with 595 additions and 314 deletions
+113
View File
@@ -200,6 +200,25 @@
"files"
]
},
"BinaryMetadata": {
"properties": {
"classifier": {
"type": "string"
},
"realPath": {
"type": "string"
},
"virtualPath": {
"type": "string"
}
},
"type": "object",
"required": [
"classifier",
"realPath",
"virtualPath"
]
},
"CargoPackageMetadata": {
"properties": {
"name": {
@@ -766,6 +785,29 @@
},
"type": "object"
},
"MixLockMetadata": {
"properties": {
"name": {
"type": "string"
},
"version": {
"type": "string"
},
"pkgHash": {
"type": "string"
},
"pkgHashExt": {
"type": "string"
}
},
"type": "object",
"required": [
"name",
"version",
"pkgHash",
"pkgHashExt"
]
},
"NpmPackageJSONMetadata": {
"properties": {
"name": {
@@ -814,6 +856,21 @@
"private"
]
},
"NpmPackageLockJSONMetadata": {
"properties": {
"resolved": {
"type": "string"
},
"integrity": {
"type": "string"
}
},
"type": "object",
"required": [
"resolved",
"integrity"
]
},
"Package": {
"properties": {
"id": {
@@ -869,6 +926,9 @@
{
"$ref": "#/$defs/ApkMetadata"
},
{
"$ref": "#/$defs/BinaryMetadata"
},
{
"$ref": "#/$defs/CargoPackageMetadata"
},
@@ -905,9 +965,15 @@
{
"$ref": "#/$defs/KbPackageMetadata"
},
{
"$ref": "#/$defs/MixLockMetadata"
},
{
"$ref": "#/$defs/NpmPackageJSONMetadata"
},
{
"$ref": "#/$defs/NpmPackageLockJSONMetadata"
},
{
"$ref": "#/$defs/PhpComposerJSONMetadata"
},
@@ -917,6 +983,12 @@
{
"$ref": "#/$defs/PythonPackageMetadata"
},
{
"$ref": "#/$defs/PythonPipfileLockMetadata"
},
{
"$ref": "#/$defs/RebarLockMetadata"
},
{
"$ref": "#/$defs/RpmMetadata"
}
@@ -1291,6 +1363,47 @@
"sitePackagesRootPath"
]
},
"PythonPipfileLockMetadata": {
"properties": {
"hashes": {
"items": {
"type": "string"
},
"type": "array"
},
"index": {
"type": "string"
}
},
"type": "object",
"required": [
"hashes",
"index"
]
},
"RebarLockMetadata": {
"properties": {
"name": {
"type": "string"
},
"version": {
"type": "string"
},
"pkgHash": {
"type": "string"
},
"pkgHashExt": {
"type": "string"
}
},
"type": "object",
"required": [
"name",
"version",
"pkgHash",
"pkgHashExt"
]
},
"Relationship": {
"properties": {
"parent": {