Merge pull request #340 from ndeloof/healthcheck

laurazard · web-flow · commit 5c348e375e19 · 2023-01-10T13:40:54.000Z
validate healthcheck is well configured
diff --git a/loader/validate.go b/loader/validate.go
@@ -38,6 +38,14 @@ func checkConsistency(project *types.Project) error {
 			}
 		}
 
+		if s.HealthCheck != nil && len(s.HealthCheck.Test) > 0 {
+			switch s.HealthCheck.Test[0] {
+			case "CMD", "CMD-SHELL", "NONE":
+			default:
+				return errors.New(`healthcheck.test must start either by "CMD", "CMD-SHELL" or "NONE"`)
+			}
+		}
+
 		for dependedService := range s.DependsOn {
 			if _, err := project.GetService(dependedService); err != nil {
 				return errors.Wrap(errdefs.ErrInvalid, fmt.Sprintf("service %q depends on undefined service %s", s.Name, dependedService))

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,14 @@ func checkConsistency(project *types.Project) error {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ if s.HealthCheck != nil && len(s.HealthCheck.Test) > 0 {`
	`42`	`+ switch s.HealthCheck.Test[0] {`
	`43`	`+ case "CMD", "CMD-SHELL", "NONE":`
	`44`	`+ default:`
	`45`	+ return errors.New(`healthcheck.test must start either by "CMD", "CMD-SHELL" or "NONE"`)
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+`
`41`	`49`	`for dependedService := range s.DependsOn {`
`42`	`50`	`if _, err := project.GetService(dependedService); err != nil {`
`43`	`51`	`return errors.Wrap(errdefs.ErrInvalid, fmt.Sprintf("service %q depends on undefined service %s", s.Name, dependedService))`