Merge pull request #356 from q384566678/check-windows

liangchenye · web-flow · commit f2ae88b7fe40 · 2017-04-11T21:29:53.000+08:00
validate: add windows validation in checkos
diff --git a/validate/validate.go b/validate/validate.go
@@ -385,6 +385,7 @@ func (v *Validator) CheckMounts() (msgs []string) {
 	return
 }
 
+// CheckOS checks v.spec.Platform.OS
 func (v *Validator) CheckOS() (msgs []string) {
 	logrus.Debugf("check os")
 
@@ -400,6 +401,12 @@ func (v *Validator) CheckOS() (msgs []string) {
 		}
 	}
 
+	if v.spec.Platform.OS != "windows" {
+		if v.spec.Windows != nil {
+			msgs = append(msgs, fmt.Sprintf("'windows' MUST NOT be set when platform.os is %q", v.spec.Platform.OS))
+		}
+	}
+
 	return
 }
 

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,7 @@ func (v *Validator) CheckMounts() (msgs []string) {`
`385`	`385`	`return`
`386`	`386`	`}`
`387`	`387`
	`388`	`+// CheckOS checks v.spec.Platform.OS`
`388`	`389`	`func (v *Validator) CheckOS() (msgs []string) {`
`389`	`390`	`logrus.Debugf("check os")`
`390`	`391`
`@@ -400,6 +401,12 @@ func (v *Validator) CheckOS() (msgs []string) {`
`400`	`401`	`}`
`401`	`402`	`}`
`402`	`403`
	`404`	`+ if v.spec.Platform.OS != "windows" {`
	`405`	`+ if v.spec.Windows != nil {`
	`406`	`+ msgs = append(msgs, fmt.Sprintf("'windows' MUST NOT be set when platform.os is %q", v.spec.Platform.OS))`
	`407`	`+ }`
	`408`	`+ }`
	`409`	`+`
`403`	`410`	`return`
`404`	`411`	`}`
`405`	`412`