restart: no gets interpreted as restart: false

The yaml parser seems to turn `restart: no` into `restart: false` and
false is not a valid restart policy.  This patch manually fixes up the
value to be `no` if it is read as `false`.

Signed-off-by: Darren Shepherd <darren@rancher.com>

Author: ibuildthecloud

project/merge.go

@@ -50,8 +50,21 @@ func Merge(p *Project, bytes []byte) (map[string]*ServiceConfig, error) {
 		datas[name] = data
 	}
 
-	err = utils.Convert(datas, &configs)
-	return configs, err
+	if err := utils.Convert(datas, &configs); err != nil {
+		return nil, err
+	}
+
+	adjustValues(configs)
+	return configs, nil
+}
+
+func adjustValues(configs map[string]*ServiceConfig) {
+	// yaml parser turns "no" into "false" but that is not valid for retart policy
+	for _, v := range configs {
+		if v.Restart == "false" {
+			v.Restart = "no"
+		}
+	}
 }
 
 func readEnvFile(configLookup ConfigLookup, inFile string, serviceData rawService) (rawService, error) {

project/merge_test.go

@@ -146,3 +146,47 @@ child:
 		t.Fatal("Invalid image", child.Image)
 	}
 }
+
+func TestRestartNo(t *testing.T) {
+	p := NewProject(&Context{
+		ConfigLookup: &NullLookup{},
+	})
+
+	config, err := Merge(p, []byte(`
+test:
+  restart: no
+  image: foo
+`))
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	test := config["test"]
+
+	if test.Restart != "no" {
+		t.Fatal("Invalid restart policy", test.Restart)
+	}
+}
+
+func TestRestartAlways(t *testing.T) {
+	p := NewProject(&Context{
+		ConfigLookup: &NullLookup{},
+	})
+
+	config, err := Merge(p, []byte(`
+test:
+  restart: always
+  image: foo
+`))
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	test := config["test"]
+
+	if test.Restart != "always" {
+		t.Fatal("Invalid restart policy", test.Restart)
+	}
+}