From a13042aafe75d97f20446bd70d4d28599a5006d6 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Mon, 7 Dec 2015 13:27:08 +0000
Subject: [PATCH] [app] remove unused edge endpoint

---
 app/api_topology.go      | 19 -------------------
 app/api_topology_test.go | 26 --------------------------
 app/router.go            |  2 --
 3 files changed, 47 deletions(-)

diff --git a/app/api_topology.go b/app/api_topology.go
index d22a0a5d0..93911c084 100644
--- a/app/api_topology.go
+++ b/app/api_topology.go
@@ -8,7 +8,6 @@ import (
 	"github.com/gorilla/websocket"
 
 	"github.com/weaveworks/scope/render"
-	"github.com/weaveworks/scope/report"
 )
 
 const (
@@ -26,11 +25,6 @@ type APINode struct {
 	Node render.DetailedNode `json:"node"`
 }
 
-// APIEdge is returned by the /api/topology/*/*/* handlers.
-type APIEdge struct {
-	Metadata report.EdgeMetadata `json:"metadata"`
-}
-
 // Full topology.
 func handleTopology(rep Reporter, renderer render.Renderer, w http.ResponseWriter, r *http.Request) {
 	respondWith(w, http.StatusOK, APITopology{
@@ -70,19 +64,6 @@ func handleNode(rep Reporter, renderer render.Renderer, w http.ResponseWriter, r
 	respondWith(w, http.StatusOK, APINode{Node: render.MakeDetailedNode(rpt, node)})
 }
 
-// Individual edges.
-func handleEdge(rep Reporter, renderer render.Renderer, w http.ResponseWriter, r *http.Request) {
-	var (
-		vars     = mux.Vars(r)
-		localID  = vars["local"]
-		remoteID = vars["remote"]
-		rpt      = rep.Report()
-		metadata = renderer.EdgeMetadata(rpt, localID, remoteID)
-	)
-
-	respondWith(w, http.StatusOK, APIEdge{Metadata: metadata})
-}
-
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool { return true },
 }
diff --git a/app/api_topology_test.go b/app/api_topology_test.go
index eaf11aef6..2a216ce00 100644
--- a/app/api_topology_test.go
+++ b/app/api_topology_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/weaveworks/scope/app"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
-	"github.com/weaveworks/scope/report"
 	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
@@ -88,19 +87,6 @@ func TestAPITopologyApplications(t *testing.T) {
 		equals(t, false, node.Node.Pseudo)
 		// Let's not unit-test the specific content of the detail tables
 	}
-	{
-		body := getRawJSON(t, ts, fmt.Sprintf("/api/topology/applications/%s/%s", expected.ClientProcess1ID, expected.ServerProcessID))
-		var edge app.APIEdge
-		if err := json.Unmarshal(body, &edge); err != nil {
-			t.Fatalf("JSON parse error: %s", err)
-		}
-		if want, have := (report.EdgeMetadata{
-			EgressPacketCount: newu64(10),
-			EgressByteCount:   newu64(100),
-		}), edge.Metadata; !reflect.DeepEqual(want, have) {
-			t.Error(test.Diff(want, have))
-		}
-	}
 }
 
 func TestAPITopologyHosts(t *testing.T) {
@@ -130,18 +116,6 @@ func TestAPITopologyHosts(t *testing.T) {
 		equals(t, false, node.Node.Pseudo)
 		// Let's not unit-test the specific content of the detail tables
 	}
-	{
-		body := getRawJSON(t, ts, fmt.Sprintf("/api/topology/hosts/%s/%s", expected.ClientHostRenderedID, expected.ServerHostRenderedID))
-		var edge app.APIEdge
-		if err := json.Unmarshal(body, &edge); err != nil {
-			t.Fatalf("JSON parse error: %s", err)
-		}
-		if want, have := (report.EdgeMetadata{
-			MaxConnCountTCP: newu64(3),
-		}), edge.Metadata; !reflect.DeepEqual(want, have) {
-			t.Error(test.Diff(want, have))
-		}
-	}
 }
 
 // Basic websocket test
diff --git a/app/router.go b/app/router.go
index 15875bf50..36dd835fd 100644
--- a/app/router.go
+++ b/app/router.go
@@ -70,8 +70,6 @@ func RegisterTopologyRoutes(c Reporter, router *mux.Router) {
 		topologyRegistry.captureRenderer(c, handleWs)) // NB not gzip!
 	get.MatcherFunc(URLMatcher("/api/topology/{topology}/{id}")).HandlerFunc(
 		gzipHandler(topologyRegistry.captureRendererWithoutFilters(c, handleNode)))
-	get.MatcherFunc(URLMatcher("/api/topology/{topology}/{local}/{remote}")).HandlerFunc(
-		gzipHandler(topologyRegistry.captureRenderer(c, handleEdge)))
 	get.HandleFunc("/api/report", gzipHandler(makeRawReportHandler(c)))
 }