fix: Json result adheres to filters for cmd get-report(aws,gcp,azure)

Signed-off-by: Darren Murray <[email protected]>

cli/cmd/compliance.go

@@ -189,12 +189,8 @@ func complianceReportSummaryTable(summaries []api.ComplianceSummary) [][]string
 	}
 }
 
-func complianceReportRecommendationsTable(recommendations []api.ComplianceRecommendation) ([][]string, string) {
+func complianceReportRecommendationsTable(recommendations []api.ComplianceRecommendation) [][]string {
 	out := [][]string{}
-	var filteredOutput string
-	if complianceFiltersEnabled() {
-		recommendations, filteredOutput = filterRecommendations(recommendations)
-	}
 	for _, recommend := range recommendations {
 		out = append(out, []string{
 			recommend.RecID,
@@ -211,7 +207,7 @@ func complianceReportRecommendationsTable(recommendations []api.ComplianceRecomm
 		return severityOrder(out[i][3]) < severityOrder(out[j][3])
 	})
 
-	return out, filteredOutput
+	return out
 }
 
 func buildComplianceReportTable(detailsTable, summaryTable, recommendationsTable [][]string, filteredOutput string) string {

cli/cmd/compliance_aws.go

@@ -159,12 +159,18 @@ To run an ad-hoc compliance assessment of an AWS account:
 				return errors.New("there is no data found in the report")
 			}
 
+			report := response.Data[0]
+			filteredOutput := ""
+
+			if complianceFiltersEnabled() {
+				report.Recommendations, filteredOutput = filterRecommendations(report.Recommendations)
+			}
+
 			if cli.JSONOutput() {
-				return cli.OutputJSON(response.Data[0])
+				return cli.OutputJSON(report)
 			}
 
-			report := response.Data[0]
-			recommendations, filteredOutput := complianceReportRecommendationsTable(report.Recommendations)
+			recommendations := complianceReportRecommendationsTable(report.Recommendations)
 			cli.OutputHuman("\n")
 			cli.OutputHuman(
 				buildComplianceReportTable(

cli/cmd/compliance_azure.go

@@ -188,12 +188,18 @@ To run an ad-hoc compliance assessment use the command:
 				return errors.New("there is no data found in the report")
 			}
 
+			report := response.Data[0]
+			filteredOutput := ""
+
+			if complianceFiltersEnabled() {
+				report.Recommendations, filteredOutput = filterRecommendations(report.Recommendations)
+			}
+
 			if cli.JSONOutput() {
-				return cli.OutputJSON(response.Data[0])
+				return cli.OutputJSON(report)
 			}
 
-			report := response.Data[0]
-			recommendations, filteredOutput := complianceReportRecommendationsTable(report.Recommendations)
+			recommendations := complianceReportRecommendationsTable(report.Recommendations)
 			cli.OutputHuman("\n")
 			cli.OutputHuman(
 				buildComplianceReportTable(

cli/cmd/compliance_gcp.go

@@ -158,13 +158,19 @@ To run an ad-hoc compliance assessment use the command:
 				return errors.New("there is no data found in the report")
 			}
 
+			report := response.Data[0]
+			filteredOutput := ""
+
+			if complianceFiltersEnabled() {
+				report.Recommendations, filteredOutput = filterRecommendations(report.Recommendations)
+			}
+
 			if cli.JSONOutput() {
-				return cli.OutputJSON(response.Data[0])
+				return cli.OutputJSON(report)
 			}
 
-			report := response.Data[0]
+			recommendations := complianceReportRecommendationsTable(report.Recommendations)
 			cli.OutputHuman("\n")
-			recommendations, filteredOutput := complianceReportRecommendationsTable(report.Recommendations)
 			cli.OutputHuman(
 				buildComplianceReportTable(
 					complianceGcpReportDetailsTable(&report),

integration/compliance_aws_test.go

@@ -84,3 +84,14 @@ func TestComplianceAwsGetReportDetails(t *testing.T) {
 	assert.Contains(t, out.String(), "ASSESSED",
 		"STDOUT table headers changed, please check")
 }
+
+func TestComplianceAwsGetReportFiltersWithJsonOutput(t *testing.T) {
+	account := os.Getenv("LW_INT_TEST_AWS_ACC")
+	out, err, exitcode := LaceworkCLIWithTOMLConfig("compliance", "aws", "get-report", account, "--severity", "critical", "--json")
+	severities := []string{"\"severity\": 2","\"severity\": 3","\"severity\": 4", "\"severity\": 5"}
+	assert.Empty(t, err.String(), "STDERR should be empty")
+	assert.Equal(t, 0, exitcode, "EXITCODE is not the expected one")
+	// When critical severity filter is set, other severities should not be returned in json result
+	assert.NotContains(t, severities, out.String(),
+		"Json output does not adhere to severity filter")
+}