all: post full YAML content to register unit endpoint

deploy.go

@@ -26,8 +26,7 @@ func build(c tsuru.Client, appName string, cmd []string, fs Filesystem, executor
 }
 
 func deploy(c tsuru.Client, appName string, fs Filesystem, executor exec.Executor) error {
-	var yamlData tsuru.TsuruYaml
-	envs, err := c.RegisterUnit(appName, yamlData)
+	envs, err := c.RegisterUnit(appName, nil)
 	if err != nil {
 		return err
 	}
@@ -38,7 +37,7 @@ func deploy(c tsuru.Client, appName string, fs Filesystem, executor exec.Executo
 			return err
 		}
 	}
-	yamlData, err = loadTsuruYaml(fs)
+	yamlData, err := loadTsuruYaml(fs)
 	if err != nil {
 		return err
 	}
@@ -50,7 +49,12 @@ func deploy(c tsuru.Client, appName string, fs Filesystem, executor exec.Executo
 	if err != nil {
 		return err
 	}
-	_, err = c.RegisterUnit(appName, yamlData)
+	fullYamlData, err := loadAllTsuruYaml(fs)
+	if err != nil {
+		return err
+	}
+	fullYamlData["processes"] = yamlData.Processes
+	_, err = c.RegisterUnit(appName, fullYamlData)
 	return err
 }
 
@@ -111,7 +115,7 @@ func inspect(dockerClient *docker.Client, image string, filesystem Filesystem, w
 	if err != nil {
 		return fmt.Errorf("failed to inspect image %q: %v", image, err)
 	}
-	tsuruYaml, err := loadTsuruYaml(filesystem)
+	tsuruYaml, err := loadAllTsuruYaml(filesystem)
 	if err != nil {
 		return fmt.Errorf("failed to load tsuru yaml: %v", err)
 	}

internal/tsuru/client.go

@@ -87,10 +87,10 @@ func (c Client) GetAppEnvs(appName string) ([]bind.EnvVar, error) {
 	return envs, nil
 }
 
-func (c Client) RegisterUnit(appName string, customData TsuruYaml) ([]bind.EnvVar, error) {
+func (c Client) RegisterUnit(appName string, customData map[string]interface{}) ([]bind.EnvVar, error) {
 	var err error
 	var yamlData []byte
-	if !customData.IsEmpty() {
+	if len(customData) != 0 {
 		yamlData, err = json.Marshal(customData)
 		if err != nil {
 			return nil, err

internal/tsuru/client_test.go

@@ -40,7 +40,7 @@ func (s *S) TestClient(c *check.C) {
 			c.Assert(val.Get("customdata"), check.Equals, "")
 		} else {
 			customdata := val.Get("customdata")
-			expected := "{\"hooks\":{\"build\":[\"ls\",\"ls\"],\"restart\":null},\"processes\":{\"web\":\"test\"}}"
+			expected := "{\"hooks\":{\"build\":[\"ls\",\"ls\"]},\"processes\":{\"web\":\"test\"}}"
 			c.Assert(customdata, check.Equals, expected)
 		}
 		envs := []bind.EnvVar{{
@@ -56,9 +56,14 @@ func (s *S) TestClient(c *check.C) {
 		Token:   "test-token",
 		Version: "0.2.1",
 	}
-	_, err := cli.RegisterUnit("test", TsuruYaml{})
+	_, err := cli.RegisterUnit("test", nil)
 	c.Assert(err, check.IsNil)
-	t := TsuruYaml{Hooks: Hook{BuildHooks: []string{"ls", "ls"}}, Processes: map[string]string{"web": "test"}}
+	t := map[string]interface{}{
+		"hooks": map[string]interface{}{
+			"build": []string{"ls", "ls"},
+		},
+		"processes": map[string]string{"web": "test"},
+	}
 	_, err = cli.RegisterUnit("test", t)
 	c.Assert(err, check.IsNil)
 }

tasks.go

@@ -88,6 +88,23 @@ func loadTsuruYaml(fs Filesystem) (tsuru.TsuruYaml, error) {
 	return tsuruYamlData, nil
 }
 
+func loadAllTsuruYaml(fs Filesystem) (map[string]interface{}, error) {
+	var tsuruYamlData map[string]interface{}
+	for _, yamlFile := range tsuruYamlFiles {
+		filePath := fmt.Sprintf("%s/%s", defaultWorkingDir, yamlFile)
+		tsuruYaml, err := fs.ReadFile(filePath)
+		if err != nil {
+			continue
+		}
+		err = yaml.Unmarshal(tsuruYaml, &tsuruYamlData)
+		if err != nil {
+			return map[string]interface{}{}, err
+		}
+		break
+	}
+	return tsuruYamlData, nil
+}
+
 func buildHooks(yamlData tsuru.TsuruYaml, envs []bind.EnvVar, fs Filesystem, executor exec.Executor) error {
 	cmds := append([]string{}, yamlData.Hooks.BuildHooks...)
 	fmt.Fprintln(os.Stdout, "---- Running build hooks ----")

tasks_test.go

@@ -105,9 +105,9 @@ healthcheck:
 		Healthcheck: map[string]interface{}{
 			"path":             "/test",
 			"method":           "GET",
-			"status":           200,
+			"status":           float64(200),
 			"match":            ".*OK",
-			"allowed_failures": 0,
+			"allowed_failures": float64(0),
 		},
 	}
 	t, err := loadTsuruYaml(s.fs)