Merge pull request #246 from shin-/check-compose-file-version

Check that Compose file version is supported during init

Author: silvin-lubecki

internal/packager/init.go

@@ -15,6 +15,7 @@ import (
 	"github.com/docker/app/internal/render"
 	"github.com/docker/app/internal/types"
 	"github.com/docker/cli/cli/compose/loader"
+	"github.com/docker/cli/cli/compose/schema"
 	dtemplate "github.com/docker/cli/cli/compose/template"
 	"github.com/docker/cli/opts"
 	"github.com/pkg/errors"
@@ -106,6 +107,14 @@ func initFromScratch(name string) error {
 	return ioutil.WriteFile(filepath.Join(dirName, internal.SettingsFileName), []byte{'\n'}, 0644)
 }
 
+func checkComposeFileVersion(compose map[string]interface{}) error {
+	version, ok := compose["version"]
+	if !ok {
+		return fmt.Errorf("unsupported Compose file version: version 1 is too low")
+	}
+	return schema.Validate(compose, fmt.Sprintf("%v", version))
+}
+
 func initFromComposeFile(name string, composeFile string) error {
 	log.Debug("init from compose")
 
@@ -119,6 +128,9 @@ func initFromComposeFile(name string, composeFile string) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to parse compose file")
 	}
+	if err := checkComposeFileVersion(cfgMap); err != nil {
+		return err
+	}
 	settings := make(map[string]string)
 	envs, err := opts.ParseEnvFile(filepath.Join(filepath.Dir(composeFile), ".env"))
 	if err == nil {

internal/packager/init_test.go

@@ -23,7 +23,9 @@ func randomName(prefix string) string {
 }
 
 func TestInitFromComposeFile(t *testing.T) {
-	composeData := `services:
+	composeData := `
+version: '3.0'
+services:
   nginx:
     image: nginx:${NGINX_VERSION}
     command: nginx $NGINX_ARGS
@@ -65,6 +67,49 @@ func TestInitFromInvalidComposeFile(t *testing.T) {
 	assert.ErrorContains(t, err, "failed to read")
 }
 
+func TestInitFromV2ComposeFile(t *testing.T) {
+	composeData := `
+version: '2.4'
+services:
+  nginx:
+    image: nginx:${NGINX_VERSION}
+    command: nginx $NGINX_ARGS
+`
+	inputDir := randomName("app_input_")
+	os.Mkdir(inputDir, 0755)
+	ioutil.WriteFile(filepath.Join(inputDir, "docker-compose.yml"), []byte(composeData), 0644)
+	defer os.RemoveAll(inputDir)
+
+	testAppName := randomName("app_")
+	dirName := internal.DirNameFromAppName(testAppName)
+	err := os.Mkdir(dirName, 0755)
+	assert.NilError(t, err)
+	defer os.RemoveAll(dirName)
+
+	err = initFromComposeFile(testAppName, filepath.Join(inputDir, "docker-compose.yml"))
+	assert.ErrorContains(t, err, "unsupported Compose file version")
+}
+
+func TestInitFromV1ComposeFile(t *testing.T) {
+	composeData := `
+nginx:
+  image: nginx
+`
+	inputDir := randomName("app_input_")
+	os.Mkdir(inputDir, 0755)
+	ioutil.WriteFile(filepath.Join(inputDir, "docker-compose.yml"), []byte(composeData), 0644)
+	defer os.RemoveAll(inputDir)
+
+	testAppName := randomName("app_")
+	dirName := internal.DirNameFromAppName(testAppName)
+	err := os.Mkdir(dirName, 0755)
+	assert.NilError(t, err)
+	defer os.RemoveAll(dirName)
+
+	err = initFromComposeFile(testAppName, filepath.Join(inputDir, "docker-compose.yml"))
+	assert.ErrorContains(t, err, "unsupported Compose file version")
+}
+
 func TestWriteMetadataFile(t *testing.T) {
 	appName := "writemetadata_test"
 	tmpdir := fs.NewDir(t, appName)