More init tests

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

packager/init.go

@@ -27,16 +27,17 @@ func Init(name string, composeFiles []string) error {
 		return err
 	}
 
+	merger := NewPythonComposeConfigMerger()
 	if len(composeFiles) == 0 {
 		if _, err := os.Stat("./docker-compose.yml"); os.IsNotExist(err) {
 			log.Println("no compose file detected")
 			return initFromScratch(name)
 		} else if err != nil {
 			return err
 		}
-		return initFromComposeFiles(name, []string{"./docker-compose.yml"})
+		return initFromComposeFiles(name, []string{"./docker-compose.yml"}, merger)
 	}
-	return initFromComposeFiles(name, composeFiles)
+	return initFromComposeFiles(name, composeFiles, merger)
 }
 
 func initFromScratch(name string) error {
@@ -60,11 +61,11 @@ Examples of possible values: java, mysql, redis, ruby, postgres, rabbitmq...`)
 	return utils.CreateFileWithData(path.Join(dirName, "settings.yml"), []byte{'\n'})
 }
 
-func initFromComposeFiles(name string, composeFiles []string) error {
+func initFromComposeFiles(name string, composeFiles []string, merger ComposeConfigMerger) error {
 	log.Println("init from compose")
 
 	dirName := utils.DirNameFromAppName(name)
-	composeConfig, err := mergeComposeConfig(composeFiles)
+	composeConfig, err := merger.MergeComposeConfig(composeFiles)
 	if err != nil {
 		return err
 	}
@@ -74,21 +75,6 @@ func initFromComposeFiles(name string, composeFiles []string) error {
 	return utils.CreateFileWithData(path.Join(dirName, "settings.yml"), []byte{'\n'})
 }
 
-func mergeComposeConfig(composeFiles []string) ([]byte, error) {
-	var args []string
-	for _, filename := range composeFiles {
-		args = append(args, fmt.Sprintf("--file=%v", filename))
-	}
-	args = append(args, "config")
-	cmd := exec.Command("docker-compose", args...)
-	cmd.Stderr = nil
-	out, err := cmd.Output()
-	if err != nil {
-		log.Fatalln(string(err.(*exec.ExitError).Stderr))
-	}
-	return out, err
-}
-
 func composeFileFromScratch(services []string) ([]byte, error) {
 	fileStruct := types.NewInitialComposeFile()
 	serviceMap := *fileStruct.Services
@@ -130,3 +116,35 @@ func newMetadata(name string) types.AppMetadata {
 		Application: info,
 	}
 }
+
+// ComposeConfigMerger is an interface exposing methods to merge
+// multiple compose files into one configuration
+type ComposeConfigMerger interface {
+	MergeComposeConfig(composeFiles []string) ([]byte, error)
+}
+
+// PythonComposeConfigMerger implements the ComposeConfigMerger interface and
+// executes a `docker-compose` command to merge configs
+type PythonComposeConfigMerger struct{}
+
+// NewPythonComposeConfigMerger returns a ComposeConfigMerger implementor
+func NewPythonComposeConfigMerger() ComposeConfigMerger {
+	return &PythonComposeConfigMerger{}
+}
+
+// MergeComposeConfig takes a list of paths and merges the Compose files
+// at those paths into a single configuration
+func (m *PythonComposeConfigMerger) MergeComposeConfig(composeFiles []string) ([]byte, error) {
+	var args []string
+	for _, filename := range composeFiles {
+		args = append(args, fmt.Sprintf("--file=%v", filename))
+	}
+	args = append(args, "config")
+	cmd := exec.Command("docker-compose", args...)
+	cmd.Stderr = nil
+	out, err := cmd.Output()
+	if err != nil {
+		log.Fatalln(string(err.(*exec.ExitError).Stderr))
+	}
+	return out, err
+}

packager/init_test.go

@@ -1,14 +1,50 @@
 package packager
 
 import (
+	"crypto/rand"
+	"encoding/hex"
+	"fmt"
+	"os"
 	"testing"
 
 	"github.com/gotestyourself/gotestyourself/assert"
+	"github.com/gotestyourself/gotestyourself/fs"
 
 	"github.com/docker/lunchbox/types"
+	"github.com/docker/lunchbox/utils"
 	yaml "gopkg.in/yaml.v2"
 )
 
+func randomName(prefix string) string {
+	b := make([]byte, 16)
+	_, err := rand.Read(b)
+	if err != nil {
+		panic(err)
+	}
+	return prefix + hex.EncodeToString(b)
+}
+
+type DummyConfigMerger struct{}
+
+func NewDummyConfigMerger() ComposeConfigMerger {
+	return &DummyConfigMerger{}
+}
+
+var dummyComposeData = `
+version: '3.6'
+services:
+  foo:
+    image: bar
+    command: baz
+`
+
+func (m *DummyConfigMerger) MergeComposeConfig(composeFiles []string) ([]byte, error) {
+	if composeFiles[0] == "doesnotexist" {
+		return []byte{}, fmt.Errorf("no file named %q", composeFiles[0])
+	}
+	return []byte(dummyComposeData), nil
+}
+
 func TestComposeFileFromScratch(t *testing.T) {
 	services := []string{
 		"redis", "mysql", "python",
@@ -27,3 +63,57 @@ func TestComposeFileFromScratch(t *testing.T) {
 	assert.NilError(t, err)
 	assert.DeepEqual(t, result, expectedBytes)
 }
+
+func TestInitFromComposeFiles(t *testing.T) {
+	testAppName := randomName("app_")
+	merger := NewDummyConfigMerger()
+	dirName := utils.DirNameFromAppName(testAppName)
+	err := os.Mkdir(dirName, 0755)
+	assert.NilError(t, err)
+	defer os.RemoveAll(dirName)
+
+	err = initFromComposeFiles(testAppName, []string{"docker-compose.yml"}, merger)
+	assert.NilError(t, err)
+
+	manifest := fs.Expected(
+		t,
+		fs.WithMode(0755),
+		fs.WithFile("services.yml", dummyComposeData, fs.WithMode(0644)),
+		fs.WithFile("settings.yml", "\n", fs.WithMode(0644)),
+	)
+
+	assert.Assert(t, fs.Equal(dirName, manifest))
+}
+
+func TestInitFromInvalidComposeFile(t *testing.T) {
+	testAppName := randomName("app_")
+	merger := NewDummyConfigMerger()
+	dirName := utils.DirNameFromAppName(testAppName)
+	err := os.Mkdir(dirName, 0755)
+	assert.NilError(t, err)
+	defer os.RemoveAll(dirName)
+
+	err = initFromComposeFiles(testAppName, []string{"doesnotexist"}, merger)
+	assert.ErrorContains(t, err, "no file named \"doesnotexist\"")
+}
+
+func TestWriteMetadataFile(t *testing.T) {
+	appName := "writemetadata_test"
+	tmpdir := fs.NewDir(t, appName)
+	defer tmpdir.Remove()
+
+	err := writeMetadataFile(appName, tmpdir.Path())
+	assert.NilError(t, err)
+
+	data, err := yaml.Marshal(newMetadata(appName))
+	assert.NilError(t, err)
+
+	manifest := fs.Expected(
+		t,
+		fs.WithFile("metadata.yml", "",
+			fs.WithMode(0644),
+			fs.WithBytes(data),
+		),
+	)
+	assert.Assert(t, fs.Equal(tmpdir.Path(), manifest))
+}

utils/io_test.go

@@ -24,8 +24,7 @@ func TestCreateFileWithData(t *testing.T) {
 			fs.WithMode(0644),
 		),
 	)
-	comp := fs.Equal(tmpdir.Path(), manifest)()
-	assert.Assert(t, comp.Success())
+	assert.Assert(t, fs.Equal(tmpdir.Path(), manifest))
 }
 
 func TestCreateFileWithDataOverride(t *testing.T) {