Reject compose file that uses incompatible features

ndeloof · ndeloof · commit 12a47cb0f2b6 · 2020-07-07T15:40:26.000+02:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/bugsnag/panicwrap v1.2.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cloudflare/cfssl v1.4.1 // indirect
-	github.com/compose-spec/compose-go v0.0.0-20200624120600-614475470cd8
+	github.com/compose-spec/compose-go v0.0.0-20200707124823-710ff8e60ad9
 	github.com/containerd/containerd v1.3.2 // indirect
 	github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
 	github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492
diff --git a/go.sum b/go.sum
@@ -56,6 +56,8 @@ github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:ea
 github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo=
 github.com/compose-spec/compose-go v0.0.0-20200624120600-614475470cd8 h1:sVvKsoXizFOuJNc8dM91IeET2/zDNFj3hwHgk437iJ8=
 github.com/compose-spec/compose-go v0.0.0-20200624120600-614475470cd8/go.mod h1:ih9anT8po+49hrb+1j3ldIJ/YRAaBH52ErlQLTKE2Yo=
+github.com/compose-spec/compose-go v0.0.0-20200707124823-710ff8e60ad9 h1:WkFqc6UpRqxROso9KC+ceaTiXx/VWpeO1x+NV0d4d+o=
+github.com/compose-spec/compose-go v0.0.0-20200707124823-710ff8e60ad9/go.mod h1:ArodJ6gsEB7iWKrbV3fSHZ08LlBvSVB0Oqg04fX86t4=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -167,6 +169,8 @@ github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo=
 github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
diff --git a/pkg/amazon/backend/cloudformation.go b/pkg/amazon/backend/cloudformation.go
@@ -17,6 +17,7 @@ import (
 	cloudmap "github.com/awslabs/goformation/v4/cloudformation/servicediscovery"
 	"github.com/awslabs/goformation/v4/cloudformation/tags"
 	"github.com/compose-spec/compose-go/compatibility"
+	"github.com/compose-spec/compose-go/errdefs"
 	"github.com/compose-spec/compose-go/types"
 	"github.com/docker/ecs-plugin/pkg/compose"
 	"github.com/sirupsen/logrus"
@@ -39,8 +40,7 @@ func (c *FargateCompatibilityChecker) CheckPortsPublished(p *types.ServicePortCo
 		p.Published = p.Target
 	}
 	if p.Published != p.Target {
-		c.Error("published port can't be set to a distinct value than container port")
-		p.Published = p.Target
+		c.Incompatible("published port can't be set to a distinct value than container port")
 	}
 }
 
@@ -51,7 +51,7 @@ func (c *FargateCompatibilityChecker) CheckCapAdd(service *types.ServiceConfig)
 		case "SYS_PTRACE":
 			add = append(add, cap)
 		default:
-			c.Error("service.cap_add = %s", cap)
+			c.Incompatible("ECS doesn't allow to add capability %s", cap)
 		}
 	}
 	service.CapAdd = add
@@ -86,7 +86,14 @@ func (b Backend) Convert(project *types.Project) (*cloudformation.Template, erro
 	}
 	compatibility.Check(project, checker)
 	for _, err := range checker.Errors() {
-		logrus.Warn(err.Error())
+		if errdefs.IsIncompatibleError(err) {
+			logrus.Error(err.Error())
+		} else {
+			logrus.Warn(err.Error())
+		}
+	}
+	if !compatibility.IsCompatible(checker) {
+		return nil, fmt.Errorf("compose file is incompatible with Amazon ECS")
 	}
 
 	template := cloudformation.NewTemplate()

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`cloudmap "github.com/awslabs/goformation/v4/cloudformation/servicediscovery"`
`18`	`18`	`"github.com/awslabs/goformation/v4/cloudformation/tags"`
`19`	`19`	`"github.com/compose-spec/compose-go/compatibility"`
	`20`	`+ "github.com/compose-spec/compose-go/errdefs"`
`20`	`21`	`"github.com/compose-spec/compose-go/types"`
`21`	`22`	`"github.com/docker/ecs-plugin/pkg/compose"`
`22`	`23`	`"github.com/sirupsen/logrus"`
`@@ -39,8 +40,7 @@ func (c FargateCompatibilityChecker) CheckPortsPublished(p types.ServicePortCo`
`39`	`40`	`p.Published = p.Target`
`40`	`41`	`}`
`41`	`42`	`if p.Published != p.Target {`
`42`		`- c.Error("published port can't be set to a distinct value than container port")`
`43`		`- p.Published = p.Target`
	`43`	`+ c.Incompatible("published port can't be set to a distinct value than container port")`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -51,7 +51,7 @@ func (c FargateCompatibilityChecker) CheckCapAdd(service types.ServiceConfig)`
`51`	`51`	`case "SYS_PTRACE":`
`52`	`52`	`add = append(add, cap)`
`53`	`53`	`default:`
`54`		`- c.Error("service.cap_add = %s", cap)`
	`54`	`+ c.Incompatible("ECS doesn't allow to add capability %s", cap)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`service.CapAdd = add`
`@@ -86,7 +86,14 @@ func (b Backend) Convert(project types.Project) (cloudformation.Template, erro`
`86`	`86`	`}`
`87`	`87`	`compatibility.Check(project, checker)`
`88`	`88`	`for _, err := range checker.Errors() {`
`89`		`- logrus.Warn(err.Error())`
	`89`	`+ if errdefs.IsIncompatibleError(err) {`
	`90`	`+ logrus.Error(err.Error())`
	`91`	`+ } else {`
	`92`	`+ logrus.Warn(err.Error())`
	`93`	`+ }`
	`94`	`+ }`
	`95`	`+ if !compatibility.IsCompatible(checker) {`
	`96`	`+ return nil, fmt.Errorf("compose file is incompatible with Amazon ECS")`
`90`	`97`	`}`
`91`	`98`
`92`	`99`	`template := cloudformation.NewTemplate()`