From 26598797b7ad6281eb4415cc702b719f07c11dfa Mon Sep 17 00:00:00 2001
From: ramanan-ravi <ramanan@deepfence.io>
Date: Tue, 23 Apr 2024 22:29:52 +0530
Subject: [PATCH] Remove unused fields from scan status

---
 scanner/scanner.go | 15 +++------------
 util/type.go       | 18 ------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/scanner/scanner.go b/scanner/scanner.go
index 59bc975..8371838 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -159,18 +159,9 @@ func (c *ComplianceScanner) RunComplianceScan() error {
 func (c *ComplianceScanner) PublishScanStatus(scanMsg string, status string, extras map[string]interface{}) error {
 	scanMsg = strings.ReplaceAll(scanMsg, "\n", " ")
 	scanLog := map[string]interface{}{
-		"scan_id":                c.config.ScanID,
-		"time_stamp":             util.GetIntTimestamp(),
-		"@timestamp":             util.GetDatetimeNow(),
-		"scan_message":           scanMsg,
-		"scan_status":            status,
-		"type":                   util.ComplianceScanLogs,
-		"node_name":              c.config.NodeName,
-		"node_id":                c.config.NodeID,
-		"node_type":              "host",
-		"host_name":              c.config.NodeName,
-		"compliance_check_types": c.config.ComplianceCheckTypes,
-		"masked":                 false,
+		"scan_id":      c.config.ScanID,
+		"scan_message": scanMsg,
+		"scan_status":  status,
 	}
 	for k, v := range extras {
 		scanLog[k] = v
diff --git a/util/type.go b/util/type.go
index 025970a..d12c1aa 100644
--- a/util/type.go
+++ b/util/type.go
@@ -42,21 +42,3 @@ type ComplianceDoc struct {
 	ComplianceCheckType   string `json:"compliance_check_type"`
 	ScanID                string `json:"scan_id"`
 }
-
-type ComplianceScanLog struct {
-	Type                  string         `json:"type"`
-	TimeStamp             int64          `json:"time_stamp"`
-	Timestamp             string         `json:"@timestamp"`
-	Masked                bool           `json:"masked"`
-	NodeID                string         `json:"node_id"`
-	NodeType              string         `json:"node_type"`
-	KubernetesClusterName string         `json:"kubernetes_cluster_name"`
-	KubernetesClusterID   string         `json:"kubernetes_cluster_id"`
-	NodeName              string         `json:"node_name"`
-	ScanStatus            string         `json:"scan_status"`
-	ScanMessage           string         `json:"scan_message"`
-	ComplianceCheckType   string         `json:"compliance_check_type"`
-	TotalChecks           int            `json:"total_checks"`
-	Result                map[string]int `json:"result"`
-	ScanID                string         `json:"scan_id"`
-}