oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'javascript_parser_fix_author' of https://github.com/anchore/syft into javascript_parser_fix_author

Browse Source
This commit is contained in:
Toure Dunnon 2020-10-23 16:49:51 -04:00
commit 7c42a7441c
2 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
schema/json/schema.json
View File

@ -53,62 +53,55 @@
"type": "integer" "type": "integer"
}, },
"files": { "files": {
"anyOf": [ "items": {
{ "anyOf": [
"type": "null" {
}, "type": "string"
{ },
"items": { {
"anyOf": [ "properties": {
{ "checksum": {
"type": "string" "type": "string"
}, },
{ "digest": {
"properties": { "properties": {
"checksum": { "algorithm": {
"type": "string" "type": "string"
}, },
"digest": { "value": {
"properties": {
"algorithm": {
"type": "string"
},
"value": {
"type": "string"
}
},
"required": [
"algorithm",
"value"
],
"type": "object"
},
"ownerGid": {
"type": "string"
},
"ownerUid": {
"type": "string"
},
"path": {
"type": "string"
},
"permissions": {
"type": "string"
},
"size": {
"type": "string" "type": "string"
} }
}, },
"required": [ "required": [
"path" "algorithm",
"value"
], ],
"type": "object" "type": "object"
},
"ownerGid": {
"type": "string"
},
"ownerUid": {
"type": "string"
},
"path": {
"type": "string"
},
"permissions": {
"type": "string"
},
"size": {
"type": "string"
} }
] },
}, "required": [
"type": "array" "path"
} ],
] "type": "object"
}
]
},
"type": "array"
}, },
"gitCommitOfApkPort": { "gitCommitOfApkPort": {
"type": "string" "type": "string"

4
syft/pkg/npm_metadata.go
View File

@ -2,9 +2,7 @@ package pkg
// NpmPackageJSONMetadata holds extra information that is used in pkg.Package // NpmPackageJSONMetadata holds extra information that is used in pkg.Package
type NpmPackageJSONMetadata struct { type NpmPackageJSONMetadata struct {
Name string `mapstructure:"name" json:"name"` Files []string `mapstructure:"files" json:"files,omitempty"`
Version string `mapstructure:"version" json:"version"`
Files []string `mapstructure:"files" json:"files"`
Author string `mapstructure:"author" json:"author"` Author string `mapstructure:"author" json:"author"`
Licenses []string `mapstructure:"licenses" json:"licenses"` Licenses []string `mapstructure:"licenses" json:"licenses"`
Homepage string `mapstructure:"homepage" json:"homepage"` Homepage string `mapstructure:"homepage" json:"homepage"`