From 387a68a3c7272abc7813f9837b83b0ccd0bab0b0 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 13 Jul 2017 14:23:46 +0100 Subject: [PATCH] tiny refactor: swap ConnectionJoin arg order to match the style of other render HoFs, which take their inputs last. --- render/container.go | 4 ++-- render/pod.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/render/container.go b/render/container.go index 0df54da50..679158225 100644 --- a/render/container.go +++ b/render/container.go @@ -39,7 +39,7 @@ var ContainerRenderer = MakeFilter( // This mapper brings in connections by joining with container // IPs. - ConnectionJoin(SelectContainer, MapContainer2IP), + ConnectionJoin(MapContainer2IP, SelectContainer), SelectContainer, ), @@ -53,7 +53,7 @@ const originalNodeTopology = "original_node_topology" // ConnectionJoin joins the given renderer with connections from the // endpoints topology, using the toIPs function to extract IPs from // the nodes. -func ConnectionJoin(r Renderer, toIPs func(report.Node) []string) Renderer { +func ConnectionJoin(toIPs func(report.Node) []string, r Renderer) Renderer { nodeToIP := func(n report.Node, _ report.Networks) report.Nodes { result := report.Nodes{} for _, ip := range toIPs(n) { diff --git a/render/pod.go b/render/pod.go index 26b144540..127aaaf98 100644 --- a/render/pod.go +++ b/render/pod.go @@ -49,7 +49,7 @@ var PodRenderer = ConditionalRenderer(renderKubernetesTopologies, ), ), selectPodsWithDeployments{}, - ConnectionJoin(SelectPod, MapPod2IP), + ConnectionJoin(MapPod2IP, SelectPod), ), ), )