From 1d1344ebc1dc94f86afb309f4625ba90592c2f88 Mon Sep 17 00:00:00 2001 From: dwertent Date: Wed, 13 Oct 2021 20:33:26 +0300 Subject: [PATCH] fixed warning counter --- go.mod | 2 +- go.sum | 4 ++-- opaprocessor/processorhandlerutils.go | 1 + resultshandling/printer/printresults.go | 11 +++-------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 997c4cdc..26939a36 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( ) require ( - github.com/armosec/armoapi-go v0.0.5 + github.com/armosec/armoapi-go v0.0.6 github.com/armosec/k8s-interface v0.0.2 github.com/armosec/opa-utils v0.0.1 github.com/armosec/utils-go v0.0.3 diff --git a/go.sum b/go.sum index 09173d94..c5f7e2d7 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,8 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armosec/armoapi-go v0.0.2/go.mod h1:vIK17yoKbJRQyZXWWLe3AqfqCRITxW8qmSkApyq5xFs= -github.com/armosec/armoapi-go v0.0.5 h1:ylPEKGXvQoaSfUDwegBFMhG0IWUECX4Ma+csosXDJgA= -github.com/armosec/armoapi-go v0.0.5/go.mod h1:vIK17yoKbJRQyZXWWLe3AqfqCRITxW8qmSkApyq5xFs= +github.com/armosec/armoapi-go v0.0.6 h1:wpcFLDAuIMh0J2/duSfThYiwf2QUzfaD14mT26ArflE= +github.com/armosec/armoapi-go v0.0.6/go.mod h1:vIK17yoKbJRQyZXWWLe3AqfqCRITxW8qmSkApyq5xFs= github.com/armosec/k8s-interface v0.0.2 h1:Xw7HbQLNO9DN4NlD486VgXPwVpMFFxxwTlrVkcpsn5M= github.com/armosec/k8s-interface v0.0.2/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM= github.com/armosec/opa-utils v0.0.1 h1:RwaHWLK2dBnW57++mzttzGge2AQc//dwVP9bhO9BToI= diff --git a/opaprocessor/processorhandlerutils.go b/opaprocessor/processorhandlerutils.go index fcc442a8..afceb07c 100644 --- a/opaprocessor/processorhandlerutils.go +++ b/opaprocessor/processorhandlerutils.go @@ -98,6 +98,7 @@ func editRuleResponses(ruleResponses []opapolicy.RuleResponse) []opapolicy.RuleR // resource found -> remove from slice ruleResponses = removeFromSlice(ruleResponses, i) lenRuleResponses -= 1 + i -= 1 break } else { cleanRuleResponses(w) diff --git a/resultshandling/printer/printresults.go b/resultshandling/printer/printresults.go index 879dab30..80c89b04 100644 --- a/resultshandling/printer/printresults.go +++ b/resultshandling/printer/printresults.go @@ -45,12 +45,7 @@ func calculatePostureScore(postureReport *opapolicy.PostureReport) float32 { totalFailed := 0 for _, frameworkReport := range postureReport.FrameworkReports { for _, controlReport := range frameworkReport.ControlReports { - for _, ruleReport := range controlReport.RuleReports { - for _, ruleResponses := range ruleReport.RuleResponses { - totalFailed += len(ruleResponses.AlertObject.K8SApiObjects) - totalFailed += len(ruleResponses.AlertObject.ExternalObjects) - } - } + totalFailed += controlReport.GetNumberOfFailedResources() totalResources += controlReport.GetNumberOfResources() } } @@ -107,7 +102,7 @@ func (printer *Printer) SummarySetup(postureReport *opapolicy.PostureReport) { printer.summary[cr.Name] = ControlSummary{ TotalResources: cr.GetNumberOfResources(), - TotalFailed: len(workloadsSummary) - cr.GetNumberOfWarningResources(), + TotalFailed: cr.GetNumberOfFailedResources(), TotalWarnign: cr.GetNumberOfWarningResources(), WorkloadSummary: mapResources, Description: cr.Description, @@ -133,7 +128,7 @@ func (printer *Printer) PrintResults() { func (printer *Printer) printSummary(controlName string, controlSummary *ControlSummary) { cautils.SimpleDisplay(printer.writer, "Summary - ") - cautils.SuccessDisplay(printer.writer, "Passed:%v ", controlSummary.TotalResources-controlSummary.TotalFailed) + cautils.SuccessDisplay(printer.writer, "Passed:%v ", controlSummary.TotalResources-controlSummary.TotalFailed-controlSummary.TotalWarnign) cautils.WarningDisplay(printer.writer, "Excluded:%v ", controlSummary.TotalWarnign) cautils.FailureDisplay(printer.writer, "Failed:%v ", controlSummary.TotalFailed) cautils.InfoDisplay(printer.writer, "Total:%v\n", controlSummary.TotalResources)