From 569ccb7124ed1019d8a3100890b2ad05b655606c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Dec 2017 10:18:23 +0000 Subject: [PATCH 1/2] extract label from id when summarising un[contained,managed] I missed this in #2998. --- render/detailed/summary.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render/detailed/summary.go b/render/detailed/summary.go index d309c2835..41afde456 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -195,13 +195,13 @@ func pseudoNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary { case strings.HasPrefix(n.ID, render.UncontainedIDPrefix): // render as an uncontained node base.Label = render.UncontainedMajor - base.LabelMinor = report.ExtractHostID(n) + base.LabelMinor = n.ID[len(render.UncontainedIDPrefix):] base.Shape = report.Square base.Stack = true case strings.HasPrefix(n.ID, render.UnmanagedIDPrefix): // render as an unmanaged node base.Label = render.UnmanagedMajor - base.LabelMinor = report.ExtractHostID(n) + base.LabelMinor = n.ID[len(render.UnmanagedIDPrefix):] base.Shape = report.Square base.Stack = true default: From 0c6b5b3a2572a50e73c41498fb94a60f20956555 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Dec 2017 10:28:33 +0000 Subject: [PATCH 2/2] refactor: simplify summarisation of internet nodes --- render/detailed/summary.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/render/detailed/summary.go b/render/detailed/summary.go index 41afde456..1ac4b40c3 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -83,11 +83,6 @@ var renderers = map[string]func(BasicNodeSummary, report.Node) BasicNodeSummary{ report.Endpoint: nil, // Do not render } -var templates = map[string]struct{ Label, LabelMinor string }{ - render.IncomingInternetID: {render.InboundMajor, render.InboundMinor}, - render.OutgoingInternetID: {render.OutboundMajor, render.OutboundMinor}, -} - // For each report.Topology, map to a 'primary' API topology. This can then be used in a variety of places. var primaryAPITopology = map[string]string{ report.Process: "processes", @@ -181,11 +176,15 @@ func pseudoNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary { base.Rank = pseudoID switch { - case render.IsInternetNode(n): + case n.ID == render.IncomingInternetID: // render as an internet node - template := templates[n.ID] - base.Label = template.Label - base.LabelMinor = template.LabelMinor + base.Label = render.InboundMajor + base.LabelMinor = render.InboundMinor + base.Shape = report.Cloud + case n.ID == render.OutgoingInternetID: + // render as an internet node + base.Label = render.OutboundMajor + base.LabelMinor = render.OutboundMinor base.Shape = report.Cloud case strings.HasPrefix(n.ID, render.ServiceNodeIDPrefix): // render as a known service node