From d01a7977aeeccb1ac800c2e7906fb62b9e9b680c Mon Sep 17 00:00:00 2001 From: David Wertenteil Date: Thu, 22 Feb 2024 14:26:51 +0200 Subject: [PATCH] Remove "%" from the print Signed-off-by: David Wertenteil --- core/pkg/resultshandling/printer/v2/pdf.go | 3 ++- .../resultshandling/printer/v2/prettyprinter.go | 17 ----------------- .../prettyprinter/tableprinter/utils/utils.go | 4 ++-- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/core/pkg/resultshandling/printer/v2/pdf.go b/core/pkg/resultshandling/printer/v2/pdf.go index 5e417170..fc351743 100644 --- a/core/pkg/resultshandling/printer/v2/pdf.go +++ b/core/pkg/resultshandling/printer/v2/pdf.go @@ -14,6 +14,7 @@ import ( "github.com/kubescape/go-logger/helpers" "github.com/kubescape/kubescape/v3/core/cautils" "github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer" + "github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils" "github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary" "github.com/johnfercher/maroto/pkg/color" @@ -168,7 +169,7 @@ func (pp *PdfPrinter) printHeader(m pdf.Maroto) { // printFramework prints the PDF frameworks after the PDF header func (pp *PdfPrinter) printFramework(m pdf.Maroto, frameworks []reportsummary.IFrameworkSummary) { m.Row(10, func() { - m.Text(frameworksScoresToString(frameworks), props.Text{ + m.Text(utils.FrameworksScoresToString(frameworks), props.Text{ Align: consts.Center, Size: 8, Family: consts.Arial, diff --git a/core/pkg/resultshandling/printer/v2/prettyprinter.go b/core/pkg/resultshandling/printer/v2/prettyprinter.go index 5b8273ca..44309787 100644 --- a/core/pkg/resultshandling/printer/v2/prettyprinter.go +++ b/core/pkg/resultshandling/printer/v2/prettyprinter.go @@ -321,23 +321,6 @@ func generateRelatedObjectsStr(workload WorkloadSummary) string { return relatedStr } -func frameworksScoresToString(frameworks []reportsummary.IFrameworkSummary) string { - if len(frameworks) == 1 { - if frameworks[0].GetName() != "" { - return fmt.Sprintf("Framework scanned: %s\n", frameworks[0].GetName()) - } - } else if len(frameworks) > 1 { - p := "Frameworks scanned: " - i := 0 - for ; i < len(frameworks)-1; i++ { - p += fmt.Sprintf("%s (compliance score: %.2f%%), ", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) - } - p += fmt.Sprintf("%s (compliance score: %.2f%%)\n", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) - return p - } - return "" -} - func getSeparator(sep string) string { s := "" for i := 0; i < 80; i++ { diff --git a/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils/utils.go b/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils/utils.go index 4b2201a5..ad433636 100644 --- a/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils/utils.go +++ b/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils/utils.go @@ -97,9 +97,9 @@ func FrameworksScoresToString(frameworks []reportsummary.IFrameworkSummary) stri p := "Frameworks scanned: " i := 0 for ; i < len(frameworks)-1; i++ { - p += fmt.Sprintf("%s (compliance score: %.2f%%), ", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) + p += fmt.Sprintf("%s (compliance score: %.2f), ", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) } - p += fmt.Sprintf("%s (compliance score: %.2f%%)\n", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) + p += fmt.Sprintf("%s (compliance score: %.2f)\n", frameworks[i].GetName(), frameworks[i].GetComplianceScore()) return p } return ""