Show OS name in cve report

Signed-off-by: Tamal Saha <[email protected]>

cmd/generate-cve-report/main.go

@@ -53,6 +53,7 @@ func main() {
 
 type CVEReport struct {
 	Ref      string
+	OS       string
 	Critical Stats
 	High     Stats
 	Medium   Stats
@@ -65,6 +66,20 @@ type Stats struct {
 	Other int
 }
 
+func (s Stats) PrettyPrint() string {
+	b, a := "0", "0"
+	if s.OS >= 0 {
+		b = strconv.Itoa(s.OS)
+	}
+	if s.Other >= 0 {
+		a = strconv.Itoa(s.Other)
+	}
+	if s.OS > 0 {
+		return fmt.Sprintf("**%s**, %s", b, a)
+	}
+	return fmt.Sprintf("%s, %s", b, a)
+}
+
 func (s Stats) String() string {
 	b, a := "0", "0"
 	if s.OS >= 0 {
@@ -91,6 +106,7 @@ func (r CVEReport) NoCVE() bool {
 func (r CVEReport) Headers() []string {
 	return []string{
 		"Image Ref",
+		"OS",
 		"Critical<br>(os, other)",
 		"High<br>(os, other)",
 		"Medium<br>(os, other)",
@@ -102,8 +118,9 @@ func (r CVEReport) Headers() []string {
 func (r CVEReport) Strings() []string {
 	return []string{
 		r.Ref,
-		r.Critical.String(),
-		r.High.String(),
+		r.OS,
+		r.Critical.PrettyPrint(),
+		r.High.PrettyPrint(),
 		r.Medium.String(),
 		r.Low.String(),
 		r.Unknown.String(),
@@ -154,6 +171,8 @@ func gatherReport(sh *shell.Session, ref string) (CVEReport, error) {
 }
 
 func setReport(report *trivy.SingleReport, result *CVEReport) {
+	result.OS = fmt.Sprintf("%s %s", report.Metadata.Os.Family, report.Metadata.Os.Name)
+
 	for _, rpt := range report.Results {
 		for _, tv := range rpt.Vulnerabilities {
 			switch tv.Severity {