Modified output json format

Signed-off-by: Eswar Rajan Subramanian <eswar@accuknox.com>

Author: seswarrajan

src/protobuf/v1/observability/observability.pb.go

@@ -16,10 +16,10 @@ message SysObsData {
 }
 
 message SysObsResponse {
-    string ClusterName = 1;
-    string ContainerName = 2;
-    string Namespace = 3;
-    string Labels = 4;
+    repeated string ClusterName = 1;
+    repeated string ContainerName = 2;
+    repeated string Namespace = 3;
+    repeated string Labels = 4;
     repeated SysProcessFileData ProcessFiles = 5;
 }
 

src/protobuf/v1/observability/observability.proto

@@ -6,28 +6,46 @@ import (
 	types "github.com/accuknox/auto-policy-discovery/src/types"
 )
 
-func convertWPFSToObservabilityData(wpfsSet map[types.WorkloadProcessFileSet][]string, policyNames []string) []types.SysObsProcessFileData {
+func addStrToArrIfNotDuplicate(strArr []string, value string) []string {
+
+	for _, str := range strArr {
+		if str == value {
+			return strArr
+		}
+	}
+
+	strArr = append(strArr, value)
+	return strArr
+}
+
+func convertWPFSToObservabilityData(wpfsSet map[types.WorkloadProcessFileSet][]string, policyNames []string) types.SysObservabilityData {
 	if len(wpfsSet) != len(policyNames) {
 		log.Error().Msgf("len(wpfsSet):%d != len(policyNames):%d", len(wpfsSet), len(policyNames))
-		return nil
+		return types.SysObservabilityData{}
 	}
 
-	var sysObsProcessFileData []types.SysObsProcessFileData
+	var sysObsObservabilityData types.SysObservabilityData
 
 	for wpfs, fsset := range wpfsSet {
 		var locSysObsProcessFileData types.SysObsProcessFileData
 
+		sysObsObservabilityData.ClusterName = addStrToArrIfNotDuplicate(sysObsObservabilityData.ClusterName, wpfs.ClusterName)
+		sysObsObservabilityData.ContainerName = addStrToArrIfNotDuplicate(sysObsObservabilityData.ContainerName, wpfs.ContainerName)
+		sysObsObservabilityData.Namespace = addStrToArrIfNotDuplicate(sysObsObservabilityData.Namespace, wpfs.Namespace)
+		sysObsObservabilityData.Labels = addStrToArrIfNotDuplicate(sysObsObservabilityData.Labels, wpfs.Labels)
+
 		locSysObsProcessFileData.FromSource = wpfs.FromSource
 		if wpfs.SetType == SYS_OP_PROCESS {
 			locSysObsProcessFileData.ProcessPaths = append(locSysObsProcessFileData.ProcessPaths, fsset...)
 		}
 		if wpfs.SetType == SYS_OP_FILE {
 			locSysObsProcessFileData.FilePaths = append(locSysObsProcessFileData.FilePaths, fsset...)
 		}
-		sysObsProcessFileData = append(sysObsProcessFileData, locSysObsProcessFileData)
+
+		sysObsObservabilityData.SysProcessFileData = append(sysObsObservabilityData.SysProcessFileData, locSysObsProcessFileData)
 	}
 
-	return sysObsProcessFileData
+	return sysObsObservabilityData
 }
 
 func convertSysObsDataToResponse(obsData types.SysObservabilityData) opb.SysObsResponse {
@@ -54,22 +72,16 @@ func convertSysObsDataToResponse(obsData types.SysObservabilityData) opb.SysObsR
 func GetSystemObsData(clusterName string, containerName string, namespace string, labels string) (opb.SysObsResponse, error) {
 
 	sysObsData := types.SysObservabilityData{}
-
 	wpfs := types.WorkloadProcessFileSet{}
+
 	wpfs.ClusterName = clusterName
 	wpfs.ContainerName = containerName
 	wpfs.Namespace = namespace
 	wpfs.Labels = labels
 
 	res, policyNames, _ := libs.GetWorkloadProcessFileSet(CfgDB, wpfs)
 
-	sysObsProcessFileData := convertWPFSToObservabilityData(res, policyNames)
-
-	sysObsData.ClusterName = clusterName
-	sysObsData.ContainerName = containerName
-	sysObsData.Labels = labels
-	sysObsData.Namespace = namespace
-	sysObsData.SysProcessFileData = sysObsProcessFileData
+	sysObsData = convertWPFSToObservabilityData(res, policyNames)
 
 	// Write Observability data to json file
 	libs.WriteSysObsDataToJsonFile(sysObsData)

src/systempolicy/observability.go

@@ -7,9 +7,9 @@ type SysObsProcessFileData struct {
 }
 
 type SysObservabilityData struct {
-	ClusterName        string                  `json:"clustername,omitempty"`
-	ContainerName      string                  `json:"containername,omitempty"`
-	Namespace          string                  `json:"namespace,omitempty"`
-	Labels             string                  `json:"labels,omitempty"`
+	ClusterName        []string                `json:"clustername,omitempty"`
+	ContainerName      []string                `json:"containername,omitempty"`
+	Namespace          []string                `json:"namespace,omitempty"`
+	Labels             []string                `json:"labels,omitempty"`
 	SysProcessFileData []SysObsProcessFileData `json:"process-files,omitempty"`
 }