From 3006e6bcbf4f36489cf8483e43d92ee8c31dbd54 Mon Sep 17 00:00:00 2001 From: yiscah Date: Tue, 23 Nov 2021 09:07:37 +0200 Subject: [PATCH] add isKindToBeGrouped --- resultshandling/printer/prettyprinter.go | 2 +- resultshandling/printer/summeryhelpers.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resultshandling/printer/prettyprinter.go b/resultshandling/printer/prettyprinter.go index a29b9344..90e38703 100644 --- a/resultshandling/printer/prettyprinter.go +++ b/resultshandling/printer/prettyprinter.go @@ -138,7 +138,7 @@ func (printer *PrettyPrinter) printGroupedResources(workloads map[string][]Workl for ns, rsc := range workloads { preIndent := indent - if ns == "Group" || ns == "User" { + if isKindToBeGrouped(ns) { cautils.SimpleDisplay(printer.writer, "%s%ss\n", indent, ns) } else if ns != "" { cautils.SimpleDisplay(printer.writer, "%sNamespace %s\n", indent, ns) diff --git a/resultshandling/printer/summeryhelpers.go b/resultshandling/printer/summeryhelpers.go index 9f540fdf..c683c9b8 100644 --- a/resultshandling/printer/summeryhelpers.go +++ b/resultshandling/printer/summeryhelpers.go @@ -12,7 +12,7 @@ func groupByNamespaceOrKind(resources []WorkloadSummary, status func(workloadSum mapResources := make(map[string][]WorkloadSummary) for i := range resources { if status(&resources[i]) { - if resources[i].Namespace == "" && (resources[i].Kind == "Group" || resources[i].Kind == "User") { + if resources[i].Namespace == "" && isKindToBeGrouped(resources[i].Kind) { if r, ok := mapResources[resources[i].Kind]; ok { r = append(r, resources[i]) mapResources[resources[i].Kind] = r @@ -29,6 +29,14 @@ func groupByNamespaceOrKind(resources []WorkloadSummary, status func(workloadSum } return mapResources } + +func isKindToBeGrouped(kind string) bool { + if kind == "Group" || kind == "User" { + return true + } + return false +} + func listResultSummary(ruleReports []reporthandling.RuleReport) []WorkloadSummary { workloadsSummary := []WorkloadSummary{} track := map[string]bool{}