From 8c6a171553bdbc8efa6451299751617c391bc32b Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 21 Jun 2017 19:15:39 +0100 Subject: [PATCH] refactor: extract a couple of heavily used constants --- render/container.go | 3 +++ render/detailed/summary.go | 4 ++-- render/pod.go | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/render/container.go b/render/container.go index 81d348320..247a99f81 100644 --- a/render/container.go +++ b/render/container.go @@ -17,6 +17,9 @@ const ( IP = "IP" ) +// UncontainedIDPrefix is the prefix of uncontained pseudo nodes +var UncontainedIDPrefix = MakePseudoNodeID(UncontainedID) + // ContainerRenderer is a Renderer which produces a renderable container // graph by merging the process graph and the container topology. // NB We only want processes in container _or_ processes with network connections diff --git a/render/detailed/summary.go b/render/detailed/summary.go index 17868e362..773039a26 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -163,7 +163,7 @@ func pseudoNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) { } // try rendering it as an uncontained node - if strings.HasPrefix(n.ID, render.MakePseudoNodeID(render.UncontainedID)) { + if strings.HasPrefix(n.ID, render.UncontainedIDPrefix) { base.Label = render.UncontainedMajor base.LabelMinor = report.ExtractHostID(n) base.Shape = report.Square @@ -172,7 +172,7 @@ func pseudoNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) { } // try rendering it as an unmanaged node - if strings.HasPrefix(n.ID, render.MakePseudoNodeID(render.UnmanagedID)) { + if strings.HasPrefix(n.ID, render.UnmanagedIDPrefix) { base.Label = render.UnmanagedMajor base.Shape = report.Square base.Stack = true diff --git a/render/pod.go b/render/pod.go index b77adc7a0..fcd553c47 100644 --- a/render/pod.go +++ b/render/pod.go @@ -14,6 +14,9 @@ const ( UnmanagedMajor = "Unmanaged" ) +// UnmanagedIDPrefix is the prefix of unmanaged pseudo nodes +var UnmanagedIDPrefix = MakePseudoNodeID(UnmanagedID) + func renderKubernetesTopologies(rpt report.Report) bool { return len(rpt.Pod.Nodes)+len(rpt.Service.Nodes)+len(rpt.Deployment.Nodes)+len(rpt.ReplicaSet.Nodes)+len(rpt.DaemonSet.Nodes) >= 1 } @@ -149,7 +152,7 @@ func Map2Parent( ) MapFunc { return func(n report.Node, _ report.Networks) report.Nodes { // Uncontained becomes Unmanaged/whatever if noParentsPseudoID is set - if noParentsPseudoID != "" && strings.HasPrefix(n.ID, MakePseudoNodeID(UncontainedID)) { + if noParentsPseudoID != "" && strings.HasPrefix(n.ID, UncontainedIDPrefix) { id := MakePseudoNodeID(noParentsPseudoID, report.ExtractHostID(n)) node := NewDerivedPseudoNode(id, n) return report.Nodes{id: node}