Merge branch 'main' into adar-cntr-custom-images-dir-fix

Author: cx-adar-zandberg

internal/services/realtimeengine/iacrealtime/config.go

@@ -3,13 +3,14 @@ package iacrealtime
 import "github.com/checkmarx/ast-cli/internal/services/realtimeengine"
 
 type IacRealtimeResult struct {
-	SimilarityID      string                    `json:"SimilarityID"`
-	Title             string                    `json:"Title"`
-	Description       string                    `json:"Description"`
-	RemediationAdvice string                    `json:"RemediationAdvice"`
-	Severity          string                    `json:"Severity"`
-	FilePath          string                    `json:"FilePath"`
-	Locations         []realtimeengine.Location `json:"Locations"`
+	SimilarityID  string                    `json:"SimilarityID"`
+	Title         string                    `json:"Title"`
+	Description   string                    `json:"Description"`
+	ExpectedValue string                    `json:"ExpectedValue"`
+	ActualValue   string                    `json:"ActualValue"`
+	Severity      string                    `json:"Severity"`
+	FilePath      string                    `json:"FilePath"`
+	Locations     []realtimeengine.Location `json:"Locations"`
 }
 
 type IgnoredIacFinding struct {

internal/services/realtimeengine/iacrealtime/mapper.go

@@ -37,12 +37,13 @@ func (m *Mapper) ConvertKicsToIacResults(
 			lineIndex := m.getOrComputeLineIndex(fileContent, locLine, indexMap)
 
 			iacResult := IacRealtimeResult{
-				Title:             result.QueryName,
-				Description:       result.Description,
-				RemediationAdvice: loc.ExpectedValue,
-				Severity:          m.mapSeverity(result.Severity),
-				FilePath:          filePath,
-				SimilarityID:      loc.SimilarityID,
+				Title:         result.QueryName,
+				Description:   result.Description,
+				ExpectedValue: loc.ExpectedValue,
+				ActualValue:   loc.ActualValue,
+				Severity:      m.mapSeverity(result.Severity),
+				FilePath:      filePath,
+				SimilarityID:  loc.SimilarityID,
 				Locations: []realtimeengine.Location{
 					{
 						Line:       locLine,