mirror of
https://github.com/aquasecurity/trivy.git
synced 2025-12-05 20:40:16 -08:00
fix(report): hide empty table when all secrets/license/misconfigs are ignored (#7171)
Co-authored-by: knqyf263 <knqyf263@gmail.com>
This commit is contained in:
@@ -39,6 +39,12 @@ func NewPkgLicenseRenderer(result types.Result, isTerminal bool, severities []db
|
||||
}
|
||||
|
||||
func (r pkgLicenseRenderer) Render() string {
|
||||
// Trivy doesn't currently support showing suppressed licenses
|
||||
// So just skip this result
|
||||
if len(r.result.Licenses) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
r.setHeaders()
|
||||
r.setRows()
|
||||
|
||||
@@ -54,7 +60,12 @@ func (r pkgLicenseRenderer) Render() string {
|
||||
}
|
||||
|
||||
func (r pkgLicenseRenderer) setHeaders() {
|
||||
header := []string{"Package", "License", "Classification", "Severity"}
|
||||
header := []string{
|
||||
"Package",
|
||||
"License",
|
||||
"Classification",
|
||||
"Severity",
|
||||
}
|
||||
r.tableWriter.SetHeaders(header...)
|
||||
}
|
||||
|
||||
@@ -63,11 +74,17 @@ func (r pkgLicenseRenderer) setRows() {
|
||||
var row []string
|
||||
if r.isTerminal {
|
||||
row = []string{
|
||||
l.PkgName, l.Name, colorizeLicenseCategory(l.Category), ColorizeSeverity(l.Severity, l.Severity),
|
||||
l.PkgName,
|
||||
l.Name,
|
||||
colorizeLicenseCategory(l.Category),
|
||||
ColorizeSeverity(l.Severity, l.Severity),
|
||||
}
|
||||
} else {
|
||||
row = []string{
|
||||
l.PkgName, l.Name, string(l.Category), l.Severity,
|
||||
l.PkgName,
|
||||
l.Name,
|
||||
string(l.Category),
|
||||
l.Severity,
|
||||
}
|
||||
}
|
||||
r.tableWriter.AddRow(row...)
|
||||
@@ -109,6 +126,12 @@ func NewFileLicenseRenderer(result types.Result, isTerminal bool, severities []d
|
||||
}
|
||||
|
||||
func (r fileLicenseRenderer) Render() string {
|
||||
// Trivy doesn't currently support showing suppressed licenses
|
||||
// So just skip this result
|
||||
if len(r.result.Licenses) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
r.setHeaders()
|
||||
r.setRows()
|
||||
|
||||
@@ -124,7 +147,12 @@ func (r fileLicenseRenderer) Render() string {
|
||||
}
|
||||
|
||||
func (r fileLicenseRenderer) setHeaders() {
|
||||
header := []string{"Classification", "Severity", "License", "File Location"}
|
||||
header := []string{
|
||||
"Classification",
|
||||
"Severity",
|
||||
"License",
|
||||
"File Location",
|
||||
}
|
||||
r.tableWriter.SetHeaders(header...)
|
||||
}
|
||||
|
||||
@@ -148,11 +176,17 @@ func (r fileLicenseRenderer) setRows() {
|
||||
var row []string
|
||||
if r.isTerminal {
|
||||
row = []string{
|
||||
colorizeLicenseCategory(l.Category), ColorizeSeverity(l.Severity, l.Severity), l.Name, l.FilePath,
|
||||
colorizeLicenseCategory(l.Category),
|
||||
ColorizeSeverity(l.Severity, l.Severity),
|
||||
l.Name,
|
||||
l.FilePath,
|
||||
}
|
||||
} else {
|
||||
row = []string{
|
||||
string(l.Category), l.Severity, l.Name, l.FilePath,
|
||||
string(l.Category),
|
||||
l.Severity,
|
||||
l.Name,
|
||||
l.FilePath,
|
||||
}
|
||||
}
|
||||
r.tableWriter.AddRow(row...)
|
||||
|
||||
@@ -50,6 +50,11 @@ func NewMisconfigRenderer(result types.Result, severities []dbTypes.Severity, tr
|
||||
}
|
||||
|
||||
func (r *misconfigRenderer) Render() string {
|
||||
// Trivy doesn't currently support showing suppressed misconfigs
|
||||
// So just skip this result
|
||||
if len(r.result.Misconfigurations) == 0 {
|
||||
return ""
|
||||
}
|
||||
target := fmt.Sprintf("%s (%s)", r.result.Target, r.result.Type)
|
||||
RenderTarget(r.w, target, r.ansi)
|
||||
|
||||
|
||||
@@ -40,6 +40,11 @@ func NewSecretRenderer(target string, secrets []types.DetectedSecret, ansi bool,
|
||||
}
|
||||
|
||||
func (r *secretRenderer) Render() string {
|
||||
// Trivy doesn't currently support showing suppressed secrets
|
||||
// So just skip this result
|
||||
if len(r.secrets) == 0 {
|
||||
return ""
|
||||
}
|
||||
target := r.target + " (secrets)"
|
||||
RenderTarget(r.w, target, r.ansi)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user