Merge pull request #53 from EmileVauge/emilevauge-sleep-well

Sleep well
Merge branch 'master' into emilevauge-sleep-well
2015-10-08 22:30:56 +02:00 · 2015-10-08 22:21:29 +02:00 · 2015-10-08 22:11:34 +02:00 · 2015-10-08 21:55:12 +02:00 · 2015-10-08 21:44:29 +02:00
8 changed files with 69 additions and 137 deletions
--- a/docs/index.md
+++ b/docs/index.md
@@ -321,14 +321,16 @@ $ curl -s "http://localhost:8080/api" | jq .
 }
 ```

-* `/api/providers`: `GET` providers
-* `/api/providers/{provider}`: `GET` or `PUT` provider
-* `/api/providers/{provider}/backends`: `GET` backends
-* `/api/providers/{provider}/backends/{backend}`: `GET` a backend
-* `/api/providers/{provider}/backends/{backend}/servers`: `GET` servers in a backend
-* `/api/providers/{provider}/backends/{backend}/servers/{server}`: `GET` a server in a backend
-* `/api/providers/{provider}/frontends`: `GET` frontends
-* `/api/providers/{provider}/frontends/{frontend}`: `GET` a frontend
+- `/api/providers`: `GET` providers
+- `/api/providers/{provider}`: `GET` or `PUT` provider
+- `/api/providers/{provider}/backends`: `GET` backends
+- `/api/providers/{provider}/backends/{backend}`: `GET` a backend
+- `/api/providers/{provider}/backends/{backend}/servers`: `GET` servers in a backend
+- `/api/providers/{provider}/backends/{backend}/servers/{server}`: `GET` a server in a backend
+- `/api/providers/{provider}/frontends`: `GET` frontends
+- `/api/providers/{provider}/frontends/{frontend}`: `GET` a frontend
+- `/api/providers/{provider}/frontends/{frontend}/routes`: `GET` routes in a frontend
+- `/api/providers/{provider}/frontends/{frontend}/routes/{route}`: `GET` a route in a frontend


 ## <a id="docker"></a> Docker backend
--- a/integration/basic_test.go
+++ b/integration/basic_test.go
@@ -38,7 +38,7 @@ func (s *SimpleSuite) TestSimpleDefaultConfig(c *check.C) {
 	err := cmd.Start()
 	c.Assert(err, checker.IsNil)

-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	// TODO validate : run on 80
 	resp, err := http.Get("http://127.0.0.1/")

--- a/integration/consul_test.go
+++ b/integration/consul_test.go
@@ -14,7 +14,7 @@ func (s *ConsulSuite) TestSimpleConfiguration(c *check.C) {
 	err := cmd.Start()
 	c.Assert(err, checker.IsNil)

-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	// TODO validate : run on 80
 	resp, err := http.Get("http://127.0.0.1/")

--- a/integration/docker_test.go
+++ b/integration/docker_test.go
@@ -18,7 +18,7 @@ func (s *DockerSuite) TestSimpleConfiguration(c *check.C) {
 	err := cmd.Start()
 	c.Assert(err, checker.IsNil)

-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	// TODO validate : run on 80
 	resp, err := http.Get("http://127.0.0.1/")

--- a/integration/file_test.go
+++ b/integration/file_test.go
@@ -14,7 +14,7 @@ func (s *FileSuite) TestSimpleConfiguration(c *check.C) {
 	err := cmd.Start()
 	c.Assert(err, checker.IsNil)

-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	// TODO validate : run on 80
 	resp, err := http.Get("http://127.0.0.1/")

--- a/integration/marathon_test.go
+++ b/integration/marathon_test.go
@@ -14,7 +14,7 @@ func (s *MarathonSuite) TestSimpleConfiguration(c *check.C) {
 	err := cmd.Start()
 	c.Assert(err, checker.IsNil)

-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	// TODO validate : run on 80
 	resp, err := http.Get("http://127.0.0.1/")

--- a/templates/configuration.tmpl
+++ b/templates/configuration.tmpl
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>/ˈTræfɪk/</title>
-
-    <!-- Bootstrap -->
-    <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/static/bootstrap/css/bootstrap-theme.min.css">
-    <script src="/static/jquery-2.1.4.min.js"></script>
-    <script src="/static/bootstrap/js/bootstrap.min.js"></script>
-
-    <style type="text/css">
-        body {padding-bottom: 70px;}
-        .content {margin:10px;}
-    </style>
-</head>
-
-<body>
-
-<div class="container">
-  <div class="jumbotron">
-    <h1>/ˈTræfɪk/</h1>
-  </div>
-
-    <div class="row">
-
-    <div class="col-md-6">
-        <!-- <div class="panel-heading">Frontends</div>
-        <div class="panel-body"> -->
-            {{range $keyProviders, $valueProviders := .Configurations}}
-            {{range $keyFrontends, $valueFrontends := $valueProviders.Frontends}}
-            <div class="panel panel-primary">
-              <div class="panel-heading">{{$keyFrontends}} - ({{$keyProviders}})</div>
-                <div class="panel-body">
-                    <a class="btn btn-info" role="button" data-toggle="collapse" href="#{{$valueFrontends.Backend}}" aria-expanded="false">
-                        {{$valueFrontends.Backend}}
-                    </a>
-                </div>
-                <table class="table table-striped table-hover">
-                    <tr>
-                        <td><em>Route</em></td>
-                        <td><em>Rule</em></td>
-                        <td><em>Value</em></td>
-                    </tr>
-                    {{range $keyRoutes, $valueRoutes := $valueFrontends.Routes}}
-                    <tr>
-                        <td>{{$keyRoutes}}</td>
-                        <td>{{$valueRoutes.Rule}}</td>
-                        <td>{{$valueRoutes.Value}}</td>
-                    </tr>
-                    {{end}}
-                </table>
-            </div>
-            {{end}}
-            {{end}}
-        <!-- </div> -->
-    </div>
-        <div class="col-md-6">
-            <!-- <div class="panel-heading">Backends</div>
-            <div class="panel-body"> -->
-            {{range $keyProviders, $valueProviders := .Configurations}}
-                {{range $keyBackends, $valueBackends := $valueProviders.Backends}}
-                <div class="panel panel-primary" id="{{$keyBackends}}">
-                  <div class="panel-heading">{{$keyBackends}} - ({{$keyProviders}})</div>
-                    <div class="panel-body">
-                        {{with $valueBackends.LoadBalancer}}
-                        <a class="btn btn-info" role="button">
-                            Load Balancer: {{.Method}}
-                        </a>
-                        {{end}}
-                        {{with $valueBackends.CircuitBreaker}}
-                        <a class="btn btn-info" role="button">
-                            Circuit Breaker: {{.Expression}}
-                        </a>
-                        {{end}}
-                    </div>
-                    <table class="table table-striped table-hover">
-                        <tr>
-                            <td><em>Server</em></td>
-                            <td><em>URL</em></td>
-                            <td><em>Weight</em></td>
-                        </tr>
-                        {{range $keyServers, $valueServers := $valueBackends.Servers}}
-                        <tr>
-                            <td>{{$keyServers}}</td>
-                            <td><code><A href="{{$valueServers.URL}}">{{$valueServers.URL}}</A></code></td>
-                            <td>{{$valueServers.Weight}}</td>
-                        </tr>
-                        {{end}}
-                    </table>
-                </div>
-                {{end}}
-                {{end}}
-            <!-- </div> -->
-        </div>
-
-    </div>
-</div>
-
-</body>
-</html>
--- a/web.go
+++ b/web.go
@@ -51,6 +51,8 @@ func (provider *WebProvider) Provide(configurationChan chan<- configMessage) err
 	systemRouter.Methods("GET").Path("/api/providers/{provider}/backends/{backend}/servers/{server}").HandlerFunc(getServerHandler)
 	systemRouter.Methods("GET").Path("/api/providers/{provider}/frontends").HandlerFunc(getFrontendsHandler)
 	systemRouter.Methods("GET").Path("/api/providers/{provider}/frontends/{frontend}").HandlerFunc(getFrontendHandler)
+	systemRouter.Methods("GET").Path("/api/providers/{provider}/frontends/{frontend}/routes").HandlerFunc(getRoutesHandler)
+	systemRouter.Methods("GET").Path("/api/providers/{provider}/frontends/{frontend}/routes/{route}").HandlerFunc(getRouteHandler)

 	// Expose dashboard
 	systemRouter.Methods("GET").Path("/").HandlerFunc(func(response http.ResponseWriter, request *http.Request) {
@@ -115,29 +117,6 @@ func getBackendHandler(response http.ResponseWriter, request *http.Request) {
 	http.NotFound(response, request)
 }

-func getFrontendsHandler(response http.ResponseWriter, request *http.Request) {
-	vars := mux.Vars(request)
-	providerID := vars["provider"]
-	if provider, ok := currentConfigurations[providerID]; ok {
-		templatesRenderer.JSON(response, http.StatusOK, provider.Frontends)
-	} else {
-		http.NotFound(response, request)
-	}
-}
-
-func getFrontendHandler(response http.ResponseWriter, request *http.Request) {
-	vars := mux.Vars(request)
-	providerID := vars["provider"]
-	frontendID := vars["frontend"]
-	if provider, ok := currentConfigurations[providerID]; ok {
-		if frontend, ok := provider.Frontends[frontendID]; ok {
-			templatesRenderer.JSON(response, http.StatusOK, frontend)
-			return
-		}
-	}
-	http.NotFound(response, request)
-}
-
 func getServersHandler(response http.ResponseWriter, request *http.Request) {
 	vars := mux.Vars(request)
 	providerID := vars["provider"]
@@ -166,3 +145,55 @@ func getServerHandler(response http.ResponseWriter, request *http.Request) {
 	}
 	http.NotFound(response, request)
 }
+
+func getFrontendsHandler(response http.ResponseWriter, request *http.Request) {
+	vars := mux.Vars(request)
+	providerID := vars["provider"]
+	if provider, ok := currentConfigurations[providerID]; ok {
+		templatesRenderer.JSON(response, http.StatusOK, provider.Frontends)
+	} else {
+		http.NotFound(response, request)
+	}
+}
+
+func getFrontendHandler(response http.ResponseWriter, request *http.Request) {
+	vars := mux.Vars(request)
+	providerID := vars["provider"]
+	frontendID := vars["frontend"]
+	if provider, ok := currentConfigurations[providerID]; ok {
+		if frontend, ok := provider.Frontends[frontendID]; ok {
+			templatesRenderer.JSON(response, http.StatusOK, frontend)
+			return
+		}
+	}
+	http.NotFound(response, request)
+}
+
+func getRoutesHandler(response http.ResponseWriter, request *http.Request) {
+	vars := mux.Vars(request)
+	providerID := vars["provider"]
+	frontendID := vars["frontend"]
+	if provider, ok := currentConfigurations[providerID]; ok {
+		if frontend, ok := provider.Frontends[frontendID]; ok {
+			templatesRenderer.JSON(response, http.StatusOK, frontend.Routes)
+			return
+		}
+	}
+	http.NotFound(response, request)
+}
+
+func getRouteHandler(response http.ResponseWriter, request *http.Request) {
+	vars := mux.Vars(request)
+	providerID := vars["provider"]
+	frontendID := vars["frontend"]
+	routeID := vars["route"]
+	if provider, ok := currentConfigurations[providerID]; ok {
+		if frontend, ok := provider.Frontends[frontendID]; ok {
+			if route, ok := frontend.Routes[routeID]; ok {
+				templatesRenderer.JSON(response, http.StatusOK, route)
+				return
+			}
+		}
+	}
+	http.NotFound(response, request)
+}
Author	SHA1	Message	Date
Emile Vauge	398dfbd8a5	Merge pull request #53 from EmileVauge/emilevauge-sleep-well Sleep well	2015-10-08 22:30:56 +02:00
Emile Vauge	3a877a51b9	Merge branch 'master' into emilevauge-sleep-well	2015-10-08 22:21:29 +02:00
emile	5a979b3dd6	Changed sleep to 500ms in tests	2015-10-08 22:11:34 +02:00
Vincent Demeester	f89b727ad1	Merge pull request #47 from ldez/feature/api-frontend-routes feat(api): add api routes for Frontend Routes	2015-10-08 21:55:12 +02:00
Fernandez Ludovic	781c6aaafa	feat(api): add api routes for Frontend Routes - add `/api/providers/{provider}/frontends/{frontend}/routes` - add `/api/providers/{provider}/frontends/{frontend}/routes/{route}`	2015-10-08 21:44:29 +02:00