From 2bb5680917fe8581ceeb7ce6ce7641a60085366e Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Mon, 28 Mar 2016 18:59:53 -0700
Subject: [PATCH] Plumb deployment request through client

---
 cmd/manager/deployments.go      | 30 +++++++++++++++++-------------
 cmd/manager/deployments_test.go |  4 ++--
 pkg/client/deployments.go       |  5 +++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/cmd/manager/deployments.go b/cmd/manager/deployments.go
index f439d062a..7b8f5d4ba 100644
--- a/cmd/manager/deployments.go
+++ b/cmd/manager/deployments.go
@@ -202,9 +202,9 @@ func createDeploymentHandlerFunc(w http.ResponseWriter, r *http.Request, c *rout
 	handler := "manager: create deployment"
 	util.LogHandlerEntry(handler, r)
 	defer r.Body.Close()
-	t := getTemplate(w, r, handler)
-	if t != nil {
-		d, err := c.Manager.CreateDeployment(t)
+	depReq := getDeploymentRequest(w, r, handler)
+	if depReq != nil {
+		d, err := c.Manager.CreateDeployment(depReq)
 		if err != nil {
 			httputil.BadRequest(w, r, err)
 			return nil
@@ -212,6 +212,7 @@ func createDeploymentHandlerFunc(w http.ResponseWriter, r *http.Request, c *rout
 
 		util.LogHandlerExitWithJSON(handler, w, d, http.StatusCreated)
 	}
+
 	return nil
 }
 
@@ -242,9 +243,9 @@ func putDeploymentHandlerFunc(w http.ResponseWriter, r *http.Request, c *router.
 		return err
 	}
 
-	t := getTemplate(w, r, handler)
-	if t != nil {
-		d, err := c.Manager.PutDeployment(name, t)
+	depReq := getDeploymentRequest(w, r, handler)
+	if depReq != nil {
+		d, err := c.Manager.PutDeployment(name, depReq)
 		if err != nil {
 			httputil.BadRequest(w, r, err)
 			return nil
@@ -252,6 +253,7 @@ func putDeploymentHandlerFunc(w http.ResponseWriter, r *http.Request, c *router.
 
 		util.LogHandlerExitWithJSON(handler, w, d, http.StatusCreated)
 	}
+
 	return nil
 }
 
@@ -289,14 +291,15 @@ func getPathVariable(w http.ResponseWriter, r *http.Request, variable, handler s
 	return unescaped, nil
 }
 
-func getTemplate(w http.ResponseWriter, r *http.Request, handler string) *common.Template {
+func getDeploymentRequest(w http.ResponseWriter, r *http.Request, handler string) *common.DeploymentRequest {
 	util.LogHandlerEntry(handler, r)
-	t := &common.Template{}
-	if err := httputil.Decode(w, r, t); err != nil {
+	depReq := &common.DeploymentRequest{}
+	if err := httputil.Decode(w, r, depReq); err != nil {
 		httputil.BadRequest(w, r, err)
 		return nil
 	}
-	return t
+
+	return depReq
 }
 
 func listManifestsHandlerFunc(w http.ResponseWriter, r *http.Request, c *router.Context) error {
@@ -348,9 +351,9 @@ func expandHandlerFunc(w http.ResponseWriter, r *http.Request, c *router.Context
 	handler := "manager: expand config"
 	util.LogHandlerEntry(handler, r)
 	defer r.Body.Close()
-	t := getTemplate(w, r, handler)
-	if t != nil {
-		c, err := c.Manager.Expand(t)
+	depReq := getDeploymentRequest(w, r, handler)
+	if depReq != nil {
+		c, err := c.Manager.Expand(depReq)
 		if err != nil {
 			httputil.BadRequest(w, r, err)
 			return nil
@@ -358,6 +361,7 @@ func expandHandlerFunc(w http.ResponseWriter, r *http.Request, c *router.Context
 
 		util.LogHandlerExitWithJSON(handler, w, c, http.StatusCreated)
 	}
+
 	return nil
 }
 
diff --git a/cmd/manager/deployments_test.go b/cmd/manager/deployments_test.go
index 84389694f..bd06e3370 100644
--- a/cmd/manager/deployments_test.go
+++ b/cmd/manager/deployments_test.go
@@ -60,12 +60,12 @@ func TestHealthz(t *testing.T) {
 
 func TestCreateDeployments(t *testing.T) {
 	c := stubContext()
-	tpl := &common.Template{Name: "foo"}
+	depReq := &common.DeploymentRequest{Name: "foo"}
 	s := httpHarness(c, "POST /deployments", createDeploymentHandlerFunc)
 	defer s.Close()
 
 	var b bytes.Buffer
-	if err := json.NewEncoder(&b).Encode(tpl); err != nil {
+	if err := json.NewEncoder(&b).Encode(depReq); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/pkg/client/deployments.go b/pkg/client/deployments.go
index 30bf0ff45..dc355e4d8 100644
--- a/pkg/client/deployments.go
+++ b/pkg/client/deployments.go
@@ -110,8 +110,9 @@ func (c *Client) DescribeDeployment(name string) (*common.Deployment, error) {
 // PostDeployment posts a deployment object to the manager service.
 func (c *Client) PostDeployment(res *common.Resource) error {
 	// This is a stop-gap until we get this API cleaned up.
-	t := common.CreateDeploymentRequest{
-		ChartInvocation: res,
+	t := common.DeploymentRequest{
+		Configuration: common.Configuration{Resources: []*common.Resource{res}},
+		Name:          res.Name,
 	}
 
 	data, err := json.Marshal(t)