github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-21 18:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed service map returning nil values (#975)

Browse Source
This commit is contained in:
RoyUP9 2022-04-06 13:12:38 +03:00 committed by GitHub
parent 491da24c63
commit cf5c03d45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/pkg/servicemap/servicemap.go
View File

@ -224,7 +224,8 @@ func (s *defaultServiceMap) GetStatus() ServiceMapStatus {
} }
func (s *defaultServiceMap) GetNodes() []ServiceMapNode { func (s *defaultServiceMap) GetNodes() []ServiceMapNode {
var nodes []ServiceMapNode nodes := []ServiceMapNode{}
for i, n := range s.graph.Nodes { for i, n := range s.graph.Nodes {
nodes = append(nodes, ServiceMapNode{ nodes = append(nodes, ServiceMapNode{
Id: n.id, Id: n.id,
@ -234,11 +235,13 @@ func (s *defaultServiceMap) GetNodes() []ServiceMapNode {
Count: n.count, Count: n.count,
}) })
} }
return nodes return nodes
} }
func (s *defaultServiceMap) GetEdges() []ServiceMapEdge { func (s *defaultServiceMap) GetEdges() []ServiceMapEdge {
var edges []ServiceMapEdge edges := []ServiceMapEdge{}
for u, m := range s.graph.Edges { for u, m := range s.graph.Edges {
for v := range m { for v := range m {
for _, p := range s.graph.Edges[u][v].data { for _, p := range s.graph.Edges[u][v].data {
@ -263,6 +266,7 @@ func (s *defaultServiceMap) GetEdges() []ServiceMapEdge {
} }
} }
} }
return edges return edges
} }

4
agent/pkg/servicemap/servicemap_test.go
View File

@ -403,10 +403,10 @@ func (s *ServiceMapEnabledSuite) TestServiceMap() {
assert.Equal(0, status.EdgeCount) assert.Equal(0, status.EdgeCount)
// Nodes after reset // Nodes after reset
assert.Equal([]ServiceMapNode(nil), nodes) assert.Equal([]ServiceMapNode{}, nodes)
// Edges after reset // Edges after reset
assert.Equal([]ServiceMapEdge(nil), edges) assert.Equal([]ServiceMapEdge{}, edges)
} }
func TestServiceMapSuite(t *testing.T) { func TestServiceMapSuite(t *testing.T) {