Add compose 3 parsing, tests

allisaurus · allisaurus · commit 9c41362a9a1d · 2018-06-04T10:55:48.000-07:00
diff --git a/ecs-cli/modules/cli/compose/containerconfig/containerconfig.go b/ecs-cli/modules/cli/compose/containerconfig/containerconfig.go
@@ -3,6 +3,8 @@ package containerconfig
 // ContainerConfig all compose fields supported by the ecs-cli
 // TODO: finalize fields
 type ContainerConfig struct {
+	Name string
+
 	CapAdd      []string
 	CapDrop     []string
 	Command     string // type TBD
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3.go b/ecs-cli/modules/cli/compose/project/project_parseV3.go
@@ -1,7 +1,11 @@
 package project
 
 import (
+	"io/ioutil"
+	"path/filepath"
+
 	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/docker/cli/cli/compose/loader"
@@ -11,20 +15,67 @@ import (
 func (p *ecsProject) parseV3() (*[]containerconfig.ContainerConfig, error) {
 	logrus.Debug("Parsing v3 project...")
 
-	// TODO: parse v3, convert ServiceConfigs to ContainerConfigs
-	configDetails := types.ConfigDetails{}
+	// load and parse each compose file into a configFile
+	configFiles := []types.ConfigFile{}
+	for _, file := range p.ecsContext.ComposeFiles {
+
+		loadedFile, err := ioutil.ReadFile(file)
+		if err != nil {
+			return nil, err
+		}
+		parsedFile, err := loader.ParseYAML(loadedFile)
+		if err != nil {
+			return nil, err
+		}
+		configFile := types.ConfigFile{
+			Filename: file,
+			Config:   parsedFile,
+		}
+		configFiles = append(configFiles, configFile)
+	}
+
+	wrkDir, err := getWorkingDir(p.ecsContext.ComposeFiles[0])
+	if err != nil {
+		return nil, err
+	}
+
+	configDetails := types.ConfigDetails{
+		WorkingDir:  wrkDir,
+		ConfigFiles: configFiles,
+		Environment: nil,
+	}
+
+	// load config from config details
 	config, err := loader.Load(configDetails)
 	if err != nil {
 		return nil, err
 	}
 
+	// convert ServiceConfigs to ContainerConfigs
+	conConfigs := []containerconfig.ContainerConfig{}
 	for _, service := range config.Services {
-		convertDockerToContainerConfig(service)
+		cCon, err := convertToContainerConfig(service)
+		if err != nil {
+			return nil, err
+		}
+		conConfigs = append(conConfigs, *cCon)
 	}
 
-	return &[]containerconfig.ContainerConfig{}, nil
+	return &conConfigs, nil
 }
 
-func convertDockerToContainerConfig(serviceConfig types.ServiceConfig) {
-	return
+func convertToContainerConfig(serviceConfig types.ServiceConfig) (*containerconfig.ContainerConfig, error) {
+	//TODO: fully convert ServiceConfig to ContainerConfig
+	c := &containerconfig.ContainerConfig{
+		Name: serviceConfig.Name,
+	}
+	return c, nil
+}
+
+func getWorkingDir(fileName string) (string, error) {
+	pwd, err := filepath.Abs(fileName)
+	if err != nil {
+		return "", errors.Wrap(err, "Unable to retrieve compose file directory")
+	}
+	return filepath.Dir(pwd), nil
 }
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3_test.go b/ecs-cli/modules/cli/compose/project/project_parseV3_test.go
@@ -0,0 +1,104 @@
+package project
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseV3WithOneFile(t *testing.T) {
+	// set up file
+	numOfServices := 2
+	composeFileString := `version: '3'
+services:
+  wordpress:
+    image: wordpress
+    ports: ["80:80"]
+  mysql:
+    image: mysql`
+
+	tmpfile, err := ioutil.TempFile("", "test")
+	if err != nil {
+		t.Fatal("Unexpected error in creating test file: ", err)
+	}
+	defer os.Remove(tmpfile.Name())
+
+	if _, err := tmpfile.Write([]byte(composeFileString)); err != nil {
+		t.Fatal("Unexpected error writing to test file: ", err)
+	}
+	if err := tmpfile.Close(); err != nil {
+		t.Fatal("Unexpected error closing test file: ", err)
+	}
+
+	// add files to projects
+	project := setupTestProject(t)
+	project.ecsContext.ComposeFiles = append(project.ecsContext.ComposeFiles, tmpfile.Name())
+
+	// assert number of container configs matches expected number of services
+	// TODO: assert containerConfig content after conversion implemented
+	conConfigResult, err := project.parseV3()
+	if err != nil {
+		t.Fatal("Unexpected error parsing file: ", err)
+	}
+	assert.Equal(t, numOfServices, len(*conConfigResult))
+}
+
+func TestParseV3WithMultileFiles(t *testing.T) {
+	// set up files
+	numOfServices := 3
+	fileString1 := `version: '3'
+services:
+  wordpress:
+    image: wordpress
+    ports: ["80:80"]
+  mysql:
+    image: mysql`
+
+	fileString2 := `version: '3'
+services:
+  redis:
+    image: redis
+    ports: ["90:90"]`
+
+	// initialize temp files
+	tmpfile1, err1 := ioutil.TempFile("", "test")
+	if err1 != nil {
+		t.Fatal("Unexpected error in creating test file: ", err1)
+	}
+	defer os.Remove(tmpfile1.Name())
+
+	tmpfile2, err2 := ioutil.TempFile("", "test")
+	if err2 != nil {
+		t.Fatal("Unexpected error in creating test file: ", err2)
+	}
+	defer os.Remove(tmpfile2.Name())
+
+	// write compose contents to files
+	if _, err := tmpfile1.Write([]byte(fileString1)); err != nil {
+		t.Fatal("Unexpected error writing to test file: ", err)
+	}
+	if err := tmpfile1.Close(); err != nil {
+		t.Fatal("Unexpected error closing test file: ", err)
+	}
+
+	if _, err := tmpfile2.Write([]byte(fileString2)); err != nil {
+		t.Fatal("Unexpected error writing to test file: ", err)
+	}
+	if err := tmpfile2.Close(); err != nil {
+		t.Fatal("Unexpected error closing test file: ", err)
+	}
+	// add files to projects
+	project := setupTestProject(t)
+	project.ecsContext.ComposeFiles = append(project.ecsContext.ComposeFiles, tmpfile1.Name())
+	project.ecsContext.ComposeFiles = append(project.ecsContext.ComposeFiles, tmpfile2.Name())
+
+	// assert number of container configs matches expected number of services
+	// TODO: assert containerConfig content after conversion implemented
+	conConfigResult, err := project.parseV3()
+	if err != nil {
+		t.Fatal("Unexpected error parsing file: ", err)
+	}
+	assert.Equal(t, numOfServices, len(*conConfigResult))
+}
