Merge pull request #263 from dwertent/master

Hot fix - adding failed resources to the all-list of resources
This commit is contained in:
David Wertenteil
2021-12-13 14:18:55 +02:00
committed by GitHub
4 changed files with 19 additions and 7 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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=
+10
View File
@@ -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
}
+6 -4
View File
@@ -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
}