From 95a4c19dc6019a7baeeff8301ba472084b3c1b3c Mon Sep 17 00:00:00 2001 From: Moshe-Rappaport-CA Date: Mon, 29 Aug 2022 10:17:31 +0300 Subject: [PATCH] Handle with issues caused by updating opa-utils --- core/cautils/reportv2tov1.go | 4 +++- core/pkg/opaprocessor/processorhandler_test.go | 14 +++++++------- core/pkg/resultshandling/printer/v2/junit.go | 4 +++- .../resultshandling/printer/v2/prettyprinter.go | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/core/cautils/reportv2tov1.go b/core/cautils/reportv2tov1.go index 7d202391..23859d6d 100644 --- a/core/cautils/reportv2tov1.go +++ b/core/cautils/reportv2tov1.go @@ -56,7 +56,9 @@ func controlReportV2ToV1(opaSessionObj *OPASessionObj, frameworkName string, con rulesv1 := map[string]reporthandling.RuleReport{} - for _, resourceID := range crv2.ListResourcesIDs().All() { + iter := crv2.ListResourcesIDs().All() + for iter.HasNext() { + resourceID := iter.Next() if result, ok := opaSessionObj.ResourcesResult[resourceID]; ok { for _, rulev2 := range result.ListRulesOfControl(crv2.GetID(), "") { diff --git a/core/pkg/opaprocessor/processorhandler_test.go b/core/pkg/opaprocessor/processorhandler_test.go index 65099d17..c592e528 100644 --- a/core/pkg/opaprocessor/processorhandler_test.go +++ b/core/pkg/opaprocessor/processorhandler_test.go @@ -42,7 +42,7 @@ func TestProcessResourcesResult(t *testing.T) { assert.Equal(t, 1, len(opaSessionObj.ResourcesResult)) res := opaSessionObj.ResourcesResult[deployment.GetID()] - assert.Equal(t, 2, len(res.ListControlsIDs(nil).All())) + assert.Equal(t, 2, res.ListControlsIDs(nil).All().Len()) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Failed())) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Passed())) assert.True(t, res.GetStatus(nil).IsFailed()) @@ -51,8 +51,8 @@ func TestProcessResourcesResult(t *testing.T) { opap.updateResults() res = opaSessionObj.ResourcesResult[deployment.GetID()] - assert.Equal(t, 2, len(res.ListControlsIDs(nil).All())) - assert.Equal(t, 2, len(res.ListControlsIDs(nil).All())) + assert.Equal(t, 2, res.ListControlsIDs(nil).All().Len()) + assert.Equal(t, 2, res.ListControlsIDs(nil).All().Len()) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Failed())) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Passed())) assert.True(t, res.GetStatus(nil).IsFailed()) @@ -67,13 +67,13 @@ func TestProcessResourcesResult(t *testing.T) { assert.Equal(t, 0, summaryDetails.NumberOfResources().Passed()) // test resource listing - assert.Equal(t, 1, len(summaryDetails.ListResourcesIDs().All())) + assert.Equal(t, 1, summaryDetails.ListResourcesIDs().All().Len()) assert.Equal(t, 1, len(summaryDetails.ListResourcesIDs().Failed())) assert.Equal(t, 0, len(summaryDetails.ListResourcesIDs().Excluded())) assert.Equal(t, 0, len(summaryDetails.ListResourcesIDs().Passed())) // test control listing - assert.Equal(t, len(res.ListControlsIDs(nil).All()), summaryDetails.NumberOfControls().All()) + assert.Equal(t, res.ListControlsIDs(nil).All().Len(), summaryDetails.NumberOfControls().All()) assert.Equal(t, len(res.ListControlsIDs(nil).Passed()), summaryDetails.NumberOfControls().Passed()) assert.Equal(t, len(res.ListControlsIDs(nil).Failed()), summaryDetails.NumberOfControls().Failed()) assert.Equal(t, len(res.ListControlsIDs(nil).Excluded()), summaryDetails.NumberOfControls().Excluded()) @@ -83,7 +83,7 @@ func TestProcessResourcesResult(t *testing.T) { opap.updateResults() res = opaSessionObj.ResourcesResult[deployment.GetID()] - assert.Equal(t, 2, len(res.ListControlsIDs(nil).All())) + assert.Equal(t, 2, res.ListControlsIDs(nil).All().Len()) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Excluded())) assert.Equal(t, 1, len(res.ListControlsIDs(nil).Passed())) assert.True(t, res.GetStatus(nil).IsExcluded()) @@ -93,7 +93,7 @@ func TestProcessResourcesResult(t *testing.T) { // test resource listing summaryDetails = opaSessionObj.Report.SummaryDetails - assert.Equal(t, 1, len(summaryDetails.ListResourcesIDs().All())) + assert.Equal(t, 1, summaryDetails.ListResourcesIDs().All().Len()) assert.Equal(t, 1, len(summaryDetails.ListResourcesIDs().Failed())) assert.Equal(t, 0, len(summaryDetails.ListResourcesIDs().Excluded())) assert.Equal(t, 0, len(summaryDetails.ListResourcesIDs().Passed())) diff --git a/core/pkg/resultshandling/printer/v2/junit.go b/core/pkg/resultshandling/printer/v2/junit.go index e73df0ad..a7a53d57 100644 --- a/core/pkg/resultshandling/printer/v2/junit.go +++ b/core/pkg/resultshandling/printer/v2/junit.go @@ -155,7 +155,9 @@ func listTestsSuite(results *cautils.OPASessionObj) []JUnitTestSuite { func testsCases(results *cautils.OPASessionObj, controls reportsummary.IControlsSummaries, classname string) []JUnitTestCase { var testCases []JUnitTestCase - for _, cID := range controls.ListControlsIDs().All() { + iter := controls.ListControlsIDs().All() + for iter.HasNext() { + cID := iter.Next() testCase := JUnitTestCase{} control := results.Report.SummaryDetails.Controls.GetControl(reportsummary.EControlCriteriaID, cID) diff --git a/core/pkg/resultshandling/printer/v2/prettyprinter.go b/core/pkg/resultshandling/printer/v2/prettyprinter.go index 80e0cccf..5cee44fc 100644 --- a/core/pkg/resultshandling/printer/v2/prettyprinter.go +++ b/core/pkg/resultshandling/printer/v2/prettyprinter.go @@ -261,7 +261,7 @@ func controlCountersForSummary(counters reportsummary.ICounters) string { } func controlCountersForResource(l *helpersv1.AllLists) string { - return fmt.Sprintf("Controls: %d (Failed: %d, Excluded: %d)", len(l.All()), len(l.Failed()), len(l.Excluded())) + return fmt.Sprintf("Controls: %d (Failed: %d, Excluded: %d)", l.All().Len(), len(l.Failed()), len(l.Excluded())) } func getSeparator(sep string) string { s := ""