diff --git a/render/expected/expected.go b/render/expected/expected.go index f598e5cab5..313296dcae 100644 --- a/render/expected/expected.go +++ b/render/expected/expected.go @@ -47,8 +47,8 @@ var ( theIncomingInternetNode = func(adjacent string) render.RenderableNode { return render.RenderableNode{ ID: render.IncomingInternetID, - LabelMajor: render.TheInternetMajor, - LabelMinor: render.Incoming, + LabelMajor: render.InboundMajor, + LabelMinor: render.RequestsMinor, Pseudo: true, Node: report.MakeNode().WithAdjacent(adjacent), EdgeMetadata: report.EdgeMetadata{ @@ -62,8 +62,8 @@ var ( } theOutgoingInternetNode = render.RenderableNode{ ID: render.OutgoingInternetID, - LabelMajor: render.TheInternetMajor, - LabelMinor: render.Outgoing, + LabelMajor: render.OutboundMajor, + LabelMinor: render.RequestsMinor, Pseudo: true, Node: report.MakeNode(), EdgeMetadata: report.EdgeMetadata{}, @@ -378,8 +378,8 @@ var ( }, render.IncomingInternetID: { ID: render.IncomingInternetID, - LabelMajor: render.TheInternetMajor, - LabelMinor: render.Incoming, + LabelMajor: render.InboundMajor, + LabelMinor: render.RequestsMinor, Pseudo: true, Node: report.MakeNode().WithAdjacent(ServerHostRenderedID), EdgeMetadata: report.EdgeMetadata{}, diff --git a/render/mapping.go b/render/mapping.go index 8cc143d907..5a07ea6b0d 100644 --- a/render/mapping.go +++ b/render/mapping.go @@ -23,9 +23,9 @@ const ( TheInternetID = "theinternet" IncomingInternetID = "in-" + TheInternetID OutgoingInternetID = "out-" + TheInternetID - TheInternetMajor = "The Internet" - Incoming = "Incoming" - Outgoing = "Outgoing" + InboundMajor = "Inbound" + OutboundMajor = "Outbound" + RequestsMinor = "Requests" containersKey = "containers" podsKey = "pods" @@ -42,14 +42,16 @@ const ( type MapFunc func(RenderableNode, report.Networks) RenderableNodes func generateInternetNodeFor(m RenderableNode) RenderableNodes { - node := newDerivedPseudoNode("", TheInternetMajor, m) + node := newDerivedPseudoNode("", "", m) // emit one internet node for incoming, one for outgoing if len(m.Adjacency) > 0 { node.ID = IncomingInternetID - node.LabelMinor = Incoming + node.LabelMajor = InboundMajor + node.LabelMinor = RequestsMinor } else { node.ID = OutgoingInternetID - node.LabelMinor = Outgoing + node.LabelMajor = OutboundMajor + node.LabelMinor = RequestsMinor } return RenderableNodes{node.ID: node} } diff --git a/render/short_lived_connections_test.go b/render/short_lived_connections_test.go index 5f645f38c0..5ed20bc9b9 100644 --- a/render/short_lived_connections_test.go +++ b/render/short_lived_connections_test.go @@ -72,8 +72,8 @@ var ( want = (render.RenderableNodes{ render.IncomingInternetID: { ID: render.IncomingInternetID, - LabelMajor: render.TheInternetMajor, - LabelMinor: render.Incoming, + LabelMajor: render.InboundMajor, + LabelMinor: render.RequestsMinor, Pseudo: true, Node: report.MakeNode().WithAdjacent(containerID), Origins: report.MakeIDList(randomEndpointNodeID),