mirrors/policy-reporter
1
0
Fork 0
mirror of https://github.com/kyverno/policy-reporter.git synced 2024-12-14 11:57:32 +00:00
Code Activity

fix mapping logic for report labels

Browse source 
Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de>
This commit is contained in:
Frank Jogeleit 2023-01-21 10:36:45 +01:00
parent 676c8bf874
commit 91b4ba064c
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/sqlite3/store.go
View file

@ -1021,7 +1021,7 @@ func (s *policyReportStore) CountClusterResults(filter api.Filter) (int, error)
func (s *policyReportStore) FetchNamespacedReportLabels(filter api.Filter) (map[string][]string, error) {
list := make(map[string][]string)
where, args := generateFilterWhere(filter, []string{"sources"})
where, args := generateFilterWhere(filter, []string{"sources", "report_namespaces"})
if len(where) > 0 {
where = " AND " + where
}
@ -1043,12 +1043,21 @@ func (s *policyReportStore) FetchNamespacedReportLabels(filter api.Filter) (map[
}
for key, value := range labels {
if _, ok := list[key]; ok && !contains(value, list[key]) {
list[key] = append(list[key], value)
if value == "" {
continue
}
list[key] = []string{value}
_, ok := list[key]
contained := contains(value, list[key])
if ok && !contained {
list[key] = append(list[key], value)
continue
} else if ok && contained {
continue
} else if !ok {
list[key] = []string{value}
}
}
}
@ -1262,6 +1271,9 @@ func generateFilterWhere(filter api.Filter, active []string) (string, []interfac
var argCounter int
if contains("report_namespaces", active) {
argCounter, where, args = appendWhere(filter.Namespaces, "report.namespace", where, args, argCounter)
}
if contains("namespaces", active) {
argCounter, where, args = appendWhere(filter.Namespaces, "resource_namespace", where, args, argCounter)
}

2
pkg/sqlite3/store_test.go
View file

@ -645,7 +645,7 @@ func Test_PolicyReportStore(t *testing.T) {
})
t.Run("NamespacedLabels", func(t *testing.T) {
items, err := store.FetchNamespacedReportLabels(v1.Filter{Sources: []string{"Kyverno"}})
items, err := store.FetchNamespacedReportLabels(v1.Filter{Sources: []string{"Kyverno"}, Namespaces: []string{"test"}})
if err != nil {
t.Fatalf("Unexpected Error: %s", err)
}