Code changes and cleanups as requested by @arminc

reporter.go

@@ -15,15 +15,6 @@ type vulnerabilityReport struct {
 	Vulnerabilities []vulnerabilityInfo `json:"vulnerabilities"`
 }
 
-type ReportTableRow struct {
-	Severity    string
-	Feature     string
-	Details     string
-	Description string
-}
-
-type ReportTableData [][]ReportTableRow
-
 func sortBySeverity(vulnerabilities []vulnerabilityInfo) {
 	sort.Slice(vulnerabilities, func(i, j int) bool {
 		return SeverityMap[vulnerabilities[i].Severity] < SeverityMap[vulnerabilities[j].Severity]
@@ -96,13 +87,13 @@ func reportToConsole(imageName string, vulnerabilities []vulnerabilityInfo, unap
 			logger.Errorf("Image [%s] contains %d unapproved vulnerabilities", imageName, len(unapproved))
 			printTable(vulnerabilities, unapproved)
 		} else {
-			logger.Infof("Image [%s] contains %d unapproved vulnerabilities", imageName, len(unapproved))
+			logger.Infof("Image [%s] contains NO unapproved vulnerabilities", imageName)
 			if reportAll {
 				printTable(vulnerabilities, unapproved)
 			}
 		}
 	} else {
-		logger.Infof("Image [%s] contains %d total vulnerabilities", imageName, len(vulnerabilities))
+		logger.Infof("Image [%s] contains NO unapproved vulnerabilities", imageName)
 	}
 }
 

scanner.go

@@ -22,16 +22,6 @@ type scannerConfig struct {
 	reportAll          bool
 }
 
-var SeverityMap = map[string]int{
-	"Defcon1":    1,
-	"Critical":   2,
-	"High":       3,
-	"Medium":     4,
-	"Low":        5,
-	"Negligible": 6,
-	"Unknown":    7,
-}
-
 // scan orchestrates the scanning process of an image
 func scan(config scannerConfig) []string {
 	//Create a temporary folder where the docker image layers are going to be stored
@@ -69,8 +59,6 @@ func checkForUnapprovedVulnerabilities(imageName string, vulnerabilities []vulne
 		severity := vulnerabilities[i].Severity
 		vulnerable := true
 
-		// logger.Infof("%s %s %s %s", severity, SeverityMap[severity], whitelistThreshold, SeverityMap[whitelistThreshold])
-
 		//Check if the vulnerability has a severity less than our threshold severity
 		if SeverityMap[severity] > SeverityMap[whitelistThreshold] {
 			vulnerable = false

utils.go

@@ -20,6 +20,17 @@ const (
 	DebugColor   = "\033[0;36m%s\033[0m"
 )
 
+// Exported var used as mapping on CVE severity name to implied ranking
+var SeverityMap = map[string]int{
+	"Defcon1":    1,
+	"Critical":   2,
+	"High":       3,
+	"Medium":     4,
+	"Low":        5,
+	"Negligible": 6,
+	"Unknown":    7,
+}
+
 // listenForSignal listens for interactions and executes the desired code when it happens
 func listenForSignal(fn func(os.Signal)) {
 	signalChannel := make(chan os.Signal, 0)
@@ -89,23 +100,10 @@ func parseWhitelistFile(whitelistFile string) vulnerabilitiesWhitelist {
 
 // Validate that the given CVE severity threshold is a valid severity
 func validateThreshold(threshold string) {
-	valid := false
 	for severity := range SeverityMap {
 		if threshold == severity {
-			valid = true
-		}
-	}
-	if !valid {
-		logger.Fatalf("Invalid CVE severity threshold %s given", threshold)
-	}
-}
-
-func Filter(vs []string, f func(string) bool) []string {
-	vsf := make([]string, 0)
-	for _, v := range vs {
-		if f(v) {
-			vsf = append(vsf, v)
+			return
 		}
 	}
-	return vsf
+	logger.Fatalf("Invalid CVE severity threshold %s given", threshold)
 }