From f6295308cd0aad6a24a3448eb30d0aa734fbba29 Mon Sep 17 00:00:00 2001 From: dwertent Date: Mon, 13 Dec 2021 14:06:07 +0200 Subject: [PATCH] hot-fix eks failing resources --- go.mod | 2 +- go.sum | 4 ++-- opaprocessor/processorhandler.go | 10 ++++++++++ resultshandling/printer/summeryhelpers.go | 10 ++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 73376811..b218c096 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/armosec/armoapi-go v0.0.23 - github.com/armosec/k8s-interface v0.0.32 + github.com/armosec/k8s-interface v0.0.35 github.com/armosec/opa-utils v0.0.62 github.com/armosec/rbac-utils v0.0.8 github.com/armosec/utils-go v0.0.3 diff --git a/go.sum b/go.sum index fc854e14..6123fc1c 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/armosec/armoapi-go v0.0.23/go.mod h1:iaVVGyc23QGGzAdv4n+szGQg3Rbpixn9 github.com/armosec/k8s-interface v0.0.8/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM= github.com/armosec/k8s-interface v0.0.19/go.mod h1:0ztwEWLez2lpMMKHbs0DoZV64S0YIA4s72vCs9iAAiE= github.com/armosec/k8s-interface v0.0.26/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU= -github.com/armosec/k8s-interface v0.0.32 h1:dvSDRTXVZWrHyWOgu1QDrd4M2De4KYClrnB/k5Dq5fk= -github.com/armosec/k8s-interface v0.0.32/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU= +github.com/armosec/k8s-interface v0.0.35 h1:8kfQT7MxNMPb5HL3Sv3PriI4eVQzogECbBzckso/HkA= +github.com/armosec/k8s-interface v0.0.35/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU= github.com/armosec/opa-utils v0.0.62 h1:C/VN1HUDoa0BX2CTSqgjuKEIlb/rkIwGY2/UlvfS154= github.com/armosec/opa-utils v0.0.62/go.mod h1:P63qZDPG3vjPtSQqwx2N4Nfm8VaboDul7R7kmnUvvWc= github.com/armosec/rbac-utils v0.0.1/go.mod h1:pQ8CBiij8kSKV7aeZm9FMvtZN28VgA7LZcYyTWimq40= diff --git a/opaprocessor/processorhandler.go b/opaprocessor/processorhandler.go index c2c0eb0b..92995b0d 100644 --- a/opaprocessor/processorhandler.go +++ b/opaprocessor/processorhandler.go @@ -195,6 +195,16 @@ func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule) (*reporth opap.AllResources[inputResources[i].GetID()] = inputResources[i] } + failedResources := workloadinterface.ListMapToMeta(ruleReport.GetFailedResources()) + warningResources := workloadinterface.ListMapToMeta(ruleReport.GetWarnignResources()) + + for i := range failedResources { + opap.AllResources[failedResources[i].GetID()] = failedResources[i] + } + + for i := range warningResources { + opap.AllResources[warningResources[i].GetID()] = warningResources[i] + } return &ruleReport, err } diff --git a/resultshandling/printer/summeryhelpers.go b/resultshandling/printer/summeryhelpers.go index e9a8ae60..a2053278 100644 --- a/resultshandling/printer/summeryhelpers.go +++ b/resultshandling/printer/summeryhelpers.go @@ -51,10 +51,12 @@ func newListWorkloadsSummary(allResources map[string]workloadinterface.IMetadata workloadsSummary := []WorkloadSummary{} for _, i := range resourcesIDs { - workloadsSummary = append(workloadsSummary, WorkloadSummary{ - resource: allResources[i], - status: status, - }) + if r, ok := allResources[i]; ok { + workloadsSummary = append(workloadsSummary, WorkloadSummary{ + resource: r, + status: status, + }) + } } return workloadsSummary }