From bf03b135dff5e4faa81cc7658d46d1f5c881da71 Mon Sep 17 00:00:00 2001 From: asafambar Date: Tue, 2 Jan 2024 11:58:14 +0200 Subject: [PATCH 1/3] Add types of file --- xray/services/utils/graph.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xray/services/utils/graph.go b/xray/services/utils/graph.go index d976d55a6..d7c7fb645 100644 --- a/xray/services/utils/graph.go +++ b/xray/services/utils/graph.go @@ -35,6 +35,8 @@ type GraphNode struct { Nodes []*GraphNode `json:"nodes,omitempty"` // Node parent (for internal use) Parent *GraphNode `json:"-"` + // Node file types (tar, jar, zip, pom) + Types []string `json:"_"` } func (currNode *GraphNode) NodeHasLoop() bool { From 331c91deca7ad27cf119fab1334fe4870145e862 Mon Sep 17 00:00:00 2001 From: asafambar Date: Tue, 2 Jan 2024 15:24:47 +0200 Subject: [PATCH 2/3] fix --- xray/services/utils/graph.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xray/services/utils/graph.go b/xray/services/utils/graph.go index d7c7fb645..9f51ee649 100644 --- a/xray/services/utils/graph.go +++ b/xray/services/utils/graph.go @@ -36,7 +36,7 @@ type GraphNode struct { // Node parent (for internal use) Parent *GraphNode `json:"-"` // Node file types (tar, jar, zip, pom) - Types []string `json:"_"` + Types []string `json:"-"` } func (currNode *GraphNode) NodeHasLoop() bool { From 574ce1a6bd8da09eb787ef8f8035055fd1885c92 Mon Sep 17 00:00:00 2001 From: asafambar Date: Tue, 2 Jan 2024 16:34:01 +0200 Subject: [PATCH 3/3] fix --- xray/services/utils/graph.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xray/services/utils/graph.go b/xray/services/utils/graph.go index 9f51ee649..f4d09a485 100644 --- a/xray/services/utils/graph.go +++ b/xray/services/utils/graph.go @@ -30,13 +30,13 @@ type OtherComponentIds struct { // Audit Graph Node type GraphNode struct { - Id string `json:"component_id,omitempty"` - // List of subcomponents. - Nodes []*GraphNode `json:"nodes,omitempty"` // Node parent (for internal use) Parent *GraphNode `json:"-"` // Node file types (tar, jar, zip, pom) - Types []string `json:"-"` + Types *[]string `json:"-"` + Id string `json:"component_id,omitempty"` + // List of subcomponents. + Nodes []*GraphNode `json:"nodes,omitempty"` } func (currNode *GraphNode) NodeHasLoop() bool {