admin/aquasecurity-trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2026-01-31 05:43:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: move enum into items for array-type fields in JSON Schema (#10039)

Browse Source
This commit is contained in:
Teppei Fukuda
2026-01-13 11:50:07 +04:00
committed by GitHub
parent c5b8fef197
commit 4e06c3df5b
2 changed files with 113 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
magefiles/config_schema.go
View File

@@ -107,9 +107,15 @@ func schemaFromFlag(f flag.Flagger) (*jsonschema.Schema, error) {
// Add enum if Values is set
if values := f.GetValues(); len(values) > 0 {
schema.Enum = make([]any, len(values))
enumValues := make([]any, len(values))
for i, v := range values {
schema.Enum[i] = v
enumValues[i] = v
}
// For array types, enum should be in items, not at the array level
if schema.Type == schemaTypeArray && schema.Items != nil {
schema.Items.Enum = enumValues
} else {
schema.Enum = enumValues
}
}

210
schema/trivy-config.json
View File

@@ -163,13 +163,13 @@
},
"image-config-scanners": {
"items": {
"type": "string"
"type": "string",
"enum": [
"misconfig",
"secret"
]
},
"type": "array",
"enum": [
"misconfig",
"secret"
],
"description": "comma-separated list of what security issues to detect on container image configurations"
},
"removed-pkgs": {
@@ -200,15 +200,15 @@
},
"source": {
"items": {
"type": "string"
"type": "string",
"enum": [
"docker",
"containerd",
"podman",
"remote"
]
},
"type": "array",
"enum": [
"docker",
"containerd",
"podman",
"remote"
],
"description": "image source(s) to use, in priority order"
},
"max-size": {
@@ -471,23 +471,23 @@
},
"render-cause": {
"items": {
"type": "string"
"type": "string",
"enum": [
"terraform",
"ansible"
]
},
"type": "array",
"enum": [
"terraform",
"ansible"
],
"description": "specify configuration types for which the rendered causes will be shown in the table report"
},
"raw-config-scanners": {
"items": {
"type": "string"
"type": "string",
"enum": [
"terraform"
]
},
"type": "array",
"enum": [
"terraform"
],
"description": "specify the types of scanners that will also scan raw configurations. For example, scanners will scan a non-adapted configuration into a shared state"
}
},
@@ -543,27 +543,27 @@
},
"types": {
"items": {
"type": "string"
"type": "string",
"enum": [
"os",
"library"
]
},
"type": "array",
"enum": [
"os",
"library"
],
"description": "list of package types"
},
"relationships": {
"items": {
"type": "string"
"type": "string",
"enum": [
"unknown",
"root",
"workspace",
"direct",
"indirect"
]
},
"type": "array",
"enum": [
"unknown",
"root",
"workspace",
"direct",
"indirect"
],
"description": "list of package relationships"
}
},
@@ -709,16 +709,16 @@
},
"severity": {
"items": {
"type": "string"
"type": "string",
"enum": [
"UNKNOWN",
"LOW",
"MEDIUM",
"HIGH",
"CRITICAL"
]
},
"type": "array",
"enum": [
"UNKNOWN",
"LOW",
"MEDIUM",
"HIGH",
"CRITICAL"
],
"description": "severities of security issues to be displayed"
},
"scan": {
@@ -751,15 +751,15 @@
},
"scanners": {
"items": {
"type": "string"
"type": "string",
"enum": [
"vuln",
"misconfig",
"secret",
"license"
]
},
"type": "array",
"enum": [
"vuln",
"misconfig",
"secret",
"license"
],
"description": "comma-separated list of what security issues to detect"
},
"file-patterns": {
@@ -775,13 +775,13 @@
},
"sbom-sources": {
"items": {
"type": "string"
"type": "string",
"enum": [
"oci",
"rekor"
]
},
"type": "array",
"enum": [
"oci",
"rekor"
],
"description": "[EXPERIMENTAL] try to retrieve SBOM from the specified sources"
},
"rekor-url": {
@@ -813,13 +813,13 @@
},
"table-mode": {
"items": {
"type": "string"
"type": "string",
"enum": [
"summary",
"detailed"
]
},
"type": "array",
"enum": [
"summary",
"detailed"
],
"description": "[EXPERIMENTAL] tables that will be displayed in 'table' format"
},
"repository": {
@@ -856,19 +856,19 @@
},
"ignore-status": {
"items": {
"type": "string"
"type": "string",
"enum": [
"unknown",
"not_affected",
"affected",
"fixed",
"under_investigation",
"will_not_fix",
"fix_deferred",
"end_of_life"
]
},
"type": "array",
"enum": [
"unknown",
"not_affected",
"affected",
"fixed",
"under_investigation",
"will_not_fix",
"fix_deferred",
"end_of_life"
],
"description": "comma-separated list of vulnerability status to ignore"
},
"vex": {
@@ -884,43 +884,43 @@
},
"severity-source": {
"items": {
"type": "string"
"type": "string",
"enum": [
"nvd",
"redhat",
"redhat-oval",
"debian",
"ubuntu",
"alpine",
"amazon",
"oracle-oval",
"suse-cvrf",
"photon",
"arch-linux",
"alma",
"rocky",
"cbl-mariner",
"azure",
"ruby-advisory-db",
"php-security-advisories",
"nodejs-security-wg",
"ghsa",
"glad",
"aqua",
"osv",
"k8s",
"wolfi",
"chainguard",
"bitnami",
"govulndb",
"julia",
"echo",
"minimos",
"rootio",
"auto"
]
},
"type": "array",
"enum": [
"nvd",
"redhat",
"redhat-oval",
"debian",
"ubuntu",
"alpine",
"amazon",
"oracle-oval",
"suse-cvrf",
"photon",
"arch-linux",
"alma",
"rocky",
"cbl-mariner",
"azure",
"ruby-advisory-db",
"php-security-advisories",
"nodejs-security-wg",
"ghsa",
"glad",
"aqua",
"osv",
"k8s",
"wolfi",
"chainguard",
"bitnami",
"govulndb",
"julia",
"echo",
"minimos",
"rootio",
"auto"
],
"description": "order of data sources for selecting vulnerability severity level"
}
},