diff --git a/cautils/display.go b/cautils/display.go index d82e9114..155124d1 100644 --- a/cautils/display.go +++ b/cautils/display.go @@ -51,8 +51,8 @@ func ErrorDisplay(str string) { if IsSilent() { return } - SuccessDisplay(os.Stdout, "[Error] ") - SimpleDisplay(os.Stdout, fmt.Sprintf("%s\n", str)) + FailureDisplay(os.Stderr, "[Error] ") + SimpleDisplay(os.Stderr, fmt.Sprintf("%s\n", str)) } diff --git a/clihandler/cmd/framework.go b/clihandler/cmd/framework.go index 03d2e1d2..e3533794 100644 --- a/clihandler/cmd/framework.go +++ b/clihandler/cmd/framework.go @@ -90,7 +90,8 @@ var frameworkCmd = &cobra.Command{ cautils.SetSilentMode(scanInfo.Silent) err := clihandler.ScanCliSetup(&scanInfo) if err != nil { - return err + fmt.Fprintf(os.Stderr, "error: %v\n", err) + os.Exit(1) } return nil }, diff --git a/clihandler/initcli.go b/clihandler/initcli.go index d8ccf8b1..0c6900da 100644 --- a/clihandler/initcli.go +++ b/clihandler/initcli.go @@ -122,7 +122,7 @@ func ScanCliSetup(scanInfo *cautils.ScanInfo) error { interfaces.report.DisplayReportURL() adjustedFailThreshold := float32(scanInfo.FailThreshold) / 100 - if score < adjustedFailThreshold { + if score >= adjustedFailThreshold { return fmt.Errorf("Scan score is below threshold") } diff --git a/resultshandling/printer/jsonprinter.go b/resultshandling/printer/jsonprinter.go index 01acad7e..7f2cc8a5 100644 --- a/resultshandling/printer/jsonprinter.go +++ b/resultshandling/printer/jsonprinter.go @@ -21,7 +21,7 @@ func (jsonPrinter *JsonPrinter) SetWriter(outputFile string) { } func (jsonPrinter *JsonPrinter) Score(score float32) { - fmt.Printf("\nFinal score: %d", int(score*100)) + fmt.Printf("\nOverall risk-score (0- Excellent, 100- All failed): %d\n", int(score)) } func (jsonPrinter *JsonPrinter) ActionPrint(opaSessionObj *cautils.OPASessionObj) { diff --git a/resultshandling/printer/junit.go b/resultshandling/printer/junit.go index 9c480b50..d7648a2d 100644 --- a/resultshandling/printer/junit.go +++ b/resultshandling/printer/junit.go @@ -22,7 +22,7 @@ func (junitPrinter *JunitPrinter) SetWriter(outputFile string) { } func (junitPrinter *JunitPrinter) Score(score float32) { - fmt.Printf("\nFinal score: %d", int(score*100)) + fmt.Printf("\nOverall risk-score (0- Excellent, 100- All failed): %d\n", int(score)) } func (junitPrinter *JunitPrinter) ActionPrint(opaSessionObj *cautils.OPASessionObj) { diff --git a/resultshandling/printer/prometheusprinter.go b/resultshandling/printer/prometheusprinter.go index a211f55e..97ba7290 100644 --- a/resultshandling/printer/prometheusprinter.go +++ b/resultshandling/printer/prometheusprinter.go @@ -25,7 +25,7 @@ func (prometheusPrinter *PrometheusPrinter) SetWriter(outputFile string) { } func (prometheusPrinter *PrometheusPrinter) Score(score float32) { - fmt.Printf("\n# Overall score out of 100\nkubescape_score %f\n", score*100) + fmt.Printf("\n# Overall risk-score (0- Excellent, 100- All failed)\nkubescape_score %d\n", int(score)) } func (printer *PrometheusPrinter) printResources(allResources map[string]workloadinterface.IMetadata, resourcesIDs *reporthandling.ResourcesIDs, frameworkName, controlName string) {