From d5d0da8ac3198e26aae1bf1126ffefc49457ec3c Mon Sep 17 00:00:00 2001 From: danielgrunbergerarmo Date: Wed, 18 Aug 2021 14:33:14 +0300 Subject: [PATCH] fix non-namespacd resources --- cautils/display.go | 1 + printer/printresults.go | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cautils/display.go b/cautils/display.go index 62f056ee..b7cc0181 100644 --- a/cautils/display.go +++ b/cautils/display.go @@ -16,6 +16,7 @@ var InfoDisplay = color.New(color.Bold, color.FgHiYellow).FprintfFunc() var InfoTextDisplay = color.New(color.Faint, color.FgHiYellow).FprintfFunc() var SimpleDisplay = color.New(color.Bold, color.FgHiWhite).FprintfFunc() var SuccessDisplay = color.New(color.Bold, color.FgHiGreen).FprintfFunc() +var DescriptionDisplay = color.New(color.Faint, color.FgWhite).FprintfFunc() var Spinner *spinner.Spinner diff --git a/printer/printresults.go b/printer/printresults.go index 4d87cb8e..21bd7de3 100644 --- a/printer/printresults.go +++ b/printer/printresults.go @@ -83,7 +83,7 @@ func (print *Printer) printSummery(controlName string, controlSummery *ControlSu cautils.SimpleDisplay(os.Stdout, "Summary - ") cautils.SuccessDisplay(os.Stdout, "Passed:%v ", controlSummery.TotalResources-controlSummery.TotalFailed) cautils.FailureDisplay(os.Stdout, "Failed:%v ", controlSummery.TotalFailed) - cautils.InfoDisplay(os.Stdout, "Total:%v\n", controlSummery.TotalResources) + cautils.InfoDisplay(os.Stdout, "Total:%v\n\n", controlSummery.TotalResources) } func (printer *Printer) printTitle(controlName string, controlSummery *ControlSummery) { @@ -96,7 +96,7 @@ func (printer *Printer) printTitle(controlName string, controlSummery *ControlSu cautils.FailureDisplay(os.Stdout, "failed %v\n", emoji.SadButRelievedFace) } - cautils.SimpleDisplay(os.Stdout, "Description: %s\n\n", controlSummery.Description) + cautils.DescriptionDisplay(os.Stdout, "Description: %s\n", controlSummery.Description) } func (printer *Printer) printResult(controlName string, controlSummery *ControlSummery) { @@ -104,7 +104,9 @@ func (printer *Printer) printResult(controlName string, controlSummery *ControlS indent := INDENT for ns, rsc := range controlSummery.WorkloadSummery { preIndent := indent - cautils.SimpleDisplay(os.Stdout, "%sNamespace %s\n", indent, ns) + if ns != "" { + cautils.SimpleDisplay(os.Stdout, "%sNamespace %s\n", indent, ns) + } preIndent2 := indent for r := range rsc { indent += indent