From a1fcd4093c731dc63ddb4f1ba76a4cb0afb6f095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= <mcluseau@isi.nc>
Date: Thu, 18 Apr 2019 18:47:31 +0100
Subject: [PATCH] so go-restful require different prefixes now

---
 Dockerfile                 |  2 +-
 cmd/dkl-local-server/ws.go | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fb922bc..160586b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------
-from golang:1.12.3-alpine as build
+from golang:1.12.4-alpine as build
 run apk add --update git
 
 env CGO_ENABLED 0
diff --git a/cmd/dkl-local-server/ws.go b/cmd/dkl-local-server/ws.go
index 302bde8..f778b60 100644
--- a/cmd/dkl-local-server/ws.go
+++ b/cmd/dkl-local-server/ws.go
@@ -13,8 +13,7 @@ import (
 
 func registerWS(rest *restful.Container) {
 	// Admin API
-	adminWS := &restful.WebService{}
-	ws := adminWS
+	ws := &restful.WebService{}
 	ws.Filter(adminAuth).
 		HeaderParameter("Authorization", "Admin bearer token")
 
@@ -42,35 +41,34 @@ func registerWS(rest *restful.Container) {
 	ws.Route(ws.PUT("/clusters/{cluster-name}/passwords/{password-name}").To(wsClusterSetPassword).
 		Doc("Set cluster's password"))
 
+	ws.Route(ws.GET("/hosts").To(wsListHosts).
+		Doc("List hosts"))
+
 	(&wsHost{
 		prefix:  "/hosts/{host-name}",
 		hostDoc: "given host",
 		getHost: func(req *restful.Request) string {
 			return req.PathParameter("host-name")
 		},
-	}).register(adminWS, func(rb *restful.RouteBuilder) {
+	}).register(ws, func(rb *restful.RouteBuilder) {
 	})
 
+	rest.Add(ws)
+
 	// Hosts API
-	hostsWS := &restful.WebService{}
-	ws = adminWS
+	ws = &restful.WebService{}
+	ws.Path("/me")
 	ws.Filter(hostsAuth).
 		HeaderParameter("Authorization", "Host or admin bearer token")
 
-	ws.Route(ws.GET("/hosts").To(wsListHosts).
-		Doc("List hosts"))
-
 	(&wsHost{
-		prefix:  "/me",
 		hostDoc: "detected host",
 		getHost: detectHost,
 	}).register(ws, func(rb *restful.RouteBuilder) {
 		rb.Notes("In this case, the host is detected from the remote IP")
 	})
 
-	// register the web services
-	rest.Add(adminWS)
-	rest.Add(hostsWS)
+	rest.Add(ws)
 }
 
 func detectHost(req *restful.Request) string {