🐛 Let resolved policy tell you if something is a check

The output was using an off-handed way of trying to determine if something is a check. The reporting job type has this exact information. Fixes #1540
mondoohq · Jan 10, 2025 · 958283d · 958283d
1 parent 1e17bc1
commit 958283d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/cli/reporter/json.go b/cli/reporter/json.go
@@ -105,6 +105,11 @@ func ConvertToJSON(data *policy.ReportCollection, out iox.OutputHelper) error {
 			return errors.New("cannot find resolved pack for " + id + " in report")
 		}
 
+		reportingJobByQrId := map[string]*policy.ReportingJob{}
+		for _, job := range resolved.CollectorJob.ReportingJobs {
+			reportingJobByQrId[job.QrId] = job
+		}
+
 		results := report.RawResults()
 		pre2 := ""
 		for qid, query := range resolved.ExecutionJob.Queries {
@@ -114,8 +119,10 @@ func ConvertToJSON(data *policy.ReportCollection, out iox.OutputHelper) error {
 				continue
 			}
 			// checks
-			if _, ok := report.Scores[qid]; ok {
-				continue
+			if rj, ok := reportingJobByQrId[mrn]; ok {
+				if !(rj.Type == policy.ReportingJob_DATA_QUERY || rj.Type == policy.ReportingJob_CHECK_AND_DATA_QUERY) {
+					continue
+				}
 			}
 
 			out.WriteString(pre2 + llx.PrettyPrintString(mrn) + ":")

diff --git a/cli/reporter/proto.go b/cli/reporter/proto.go
@@ -69,6 +69,11 @@ func ConvertToProto(data *policy.ReportCollection) (*Report, error) {
 			return nil, errors.New("cannot find resolved pack for " + id + " in report")
 		}
 
+		reportingJobByQrId := map[string]*policy.ReportingJob{}
+		for _, job := range resolved.CollectorJob.ReportingJobs {
+			reportingJobByQrId[job.QrId] = job
+		}
+
 		results := report.RawResults()
 		if resolved.ExecutionJob == nil {
 			continue
@@ -81,8 +86,10 @@ func ConvertToProto(data *policy.ReportCollection) (*Report, error) {
 				continue
 			}
 			// checks
-			if _, ok := report.Scores[qid]; ok {
-				continue
+			if rj, ok := reportingJobByQrId[mrn]; ok {
+				if !(rj.Type == policy.ReportingJob_DATA_QUERY || rj.Type == policy.ReportingJob_CHECK_AND_DATA_QUERY) {
+					continue
+				}
 			}
 
 			buf := &bytes.Buffer{}