Review Feedback

Squash of:
- including children in topologies_test.go
- report.Node.Prune should prune children also
- rewrote ShortLivedInternetConnections test to express its intent
- adding tests for detail Summary rendering

experimental/graphviz/handlers.go

@@ -10,10 +10,11 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
 )
 
-func dot(w io.Writer, t report.Nodes) {
+func dot(w io.Writer, t detailed.NodeSummaries) {
 	fmt.Fprintf(w, "digraph G {\n")
 	fmt.Fprintf(w, "\toutputorder=edgesfirst;\n")
 	fmt.Fprintf(w, "\toverlap=scale;\n")

experimental/graphviz/render.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 
 	"github.com/weaveworks/scope/render"
+	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
 )
 
-func renderTo(rpt report.Report, topology string) (report.Nodes, error) {
+func renderTo(rpt report.Report, topology string) (detailed.NodeSummaries, error) {
 	renderer, ok := map[string]render.Renderer{
 		"processes":           render.FilterUnconnected(render.ProcessWithContainerNameRenderer),
 		"processes-by-name":   render.FilterUnconnected(render.ProcessNameRenderer),
@@ -16,7 +17,7 @@ func renderTo(rpt report.Report, topology string) (report.Nodes, error) {
 		"hosts":               render.HostRenderer,
 	}[topology]
 	if !ok {
-		return report.Nodes{}, fmt.Errorf("unknown topology %v", topology)
+		return detailed.NodeSummaries{}, fmt.Errorf("unknown topology %v", topology)
 	}
-	return renderer.Render(rpt), nil
+	return detailed.Summaries(renderer.Render(rpt)), nil
 }