Merge pull request #8 from quintilesims/fix-urls

Make urls consistent
quintilesims · Dec 9, 2016 · 03b2012 · 03b2012
2 parents 9653433 + 6e965b5
commit 03b2012
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/api/handlers/deploy_handler.go b/api/handlers/deploy_handler.go
@@ -49,7 +49,7 @@ func (this *DeployHandler) Routes() *restful.WebService {
 		Param(id).
 		Returns(http.StatusNoContent, "Deleted", nil))
 
-	service.Route(service.POST("/create").
+	service.Route(service.POST("/").
 		Filter(basicAuthenticate).
 		To(this.CreateDeploy).
 		Doc("Create a new Deploy").

diff --git a/api/handlers/load_balancer_handler.go b/api/handlers/load_balancer_handler.go
@@ -59,7 +59,7 @@ func (this *LoadBalancerHandler) Routes() *restful.WebService {
 		Param(id).
 		Returns(http.StatusNoContent, "Deleted", nil))
 
-	service.Route(service.PUT("{id}").
+	service.Route(service.PUT("{id}/ports").
 		Filter(basicAuthenticate).
 		To(this.UpdateLoadBalancer).
 		Reads(models.UpdateLoadBalancerRequest{}).

diff --git a/api/handlers/service_handler.go b/api/handlers/service_handler.go
@@ -71,7 +71,7 @@ func (this *ServiceHandler) Routes() *restful.WebService {
 		Returns(400, "Invalid request", models.ServerError{}).
 		Writes(models.Service{}))
 
-	service.Route(service.PUT("/{id}/update").
+	service.Route(service.PUT("/{id}/deploy").
 		Filter(basicAuthenticate).
 		To(this.UpdateService).
 		Doc("Run a new deploy on a service").

diff --git a/cli/client/deploy.go b/cli/client/deploy.go
@@ -11,7 +11,7 @@ func (c *APIClient) CreateDeploy(name string, content []byte) (*models.Deploy, e
 	}
 
 	var deploy *models.Deploy
-	if err := c.Execute(c.Sling("deploy/create").Post("").BodyJSON(req), &deploy); err != nil {
+	if err := c.Execute(c.Sling("deploy").Post("").BodyJSON(req), &deploy); err != nil {
 		return nil, err
 	}
 

diff --git a/cli/client/deploy_test.go b/cli/client/deploy_test.go
@@ -10,7 +10,7 @@ import (
 func TestCreateDeploy(t *testing.T) {
 	handler := func(w http.ResponseWriter, r *http.Request) {
 		testutils.AssertEqual(t, r.Method, "POST")
-		testutils.AssertEqual(t, r.URL.Path, "/deploy/create")
+		testutils.AssertEqual(t, r.URL.Path, "/deploy")
 
 		var req models.CreateDeployRequest
 		Unmarshal(t, r, &req)

diff --git a/cli/client/load_balancer.go b/cli/client/load_balancer.go
@@ -53,7 +53,7 @@ func (c *APIClient) UpdateLoadBalancer(id string, ports []models.Port) (*models.
 	}
 
 	var loadBalancer *models.LoadBalancer
-	if err := c.Execute(c.Sling("loadbalancer/").Put(id).BodyJSON(req), &loadBalancer); err != nil {
+	if err := c.Execute(c.Sling("loadbalancer/").Put(id+"/ports").BodyJSON(req), &loadBalancer); err != nil {
 		return nil, err
 	}
 

diff --git a/cli/client/load_balancer_test.go b/cli/client/load_balancer_test.go
@@ -136,7 +136,7 @@ func TestUpdateLoadBalancer(t *testing.T) {
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
 		testutils.AssertEqual(t, r.Method, "PUT")
-		testutils.AssertEqual(t, r.URL.Path, "/loadbalancer/id")
+		testutils.AssertEqual(t, r.URL.Path, "/loadbalancer/id/ports")
 
 		var req models.UpdateLoadBalancerRequest
 		Unmarshal(t, r, &req)

diff --git a/cli/client/service.go b/cli/client/service.go
@@ -40,7 +40,7 @@ func (c *APIClient) UpdateService(serviceID, deployID string) (*models.Service,
 	}
 
 	var service *models.Service
-	if err := c.Execute(c.Sling("service/").Put(serviceID+"/update").BodyJSON(request), &service); err != nil {
+	if err := c.Execute(c.Sling("service/").Put(serviceID+"/deploy").BodyJSON(request), &service); err != nil {
 		return nil, err
 	}
 

diff --git a/cli/client/service_test.go b/cli/client/service_test.go
@@ -158,7 +158,7 @@ func TestScaleService(t *testing.T) {
 func TestUpdateService(t *testing.T) {
 	handler := func(w http.ResponseWriter, r *http.Request) {
 		testutils.AssertEqual(t, r.Method, "PUT")
-		testutils.AssertEqual(t, r.URL.Path, "/service/id/update")
+		testutils.AssertEqual(t, r.URL.Path, "/service/id/deploy")
 
 		var req models.UpdateServiceRequest
 		Unmarshal(t, r, &req)