feat(command): support multi file paths EE-782

Author: ArrisLee

go.mod

@@ -1,5 +1,3 @@
 module github.com/portainer/docker-compose-wrapper
 
 go 1.15
-
-require github.com/stretchr/testify v1.7.0 // indirect

go.sum

@@ -1,10 +0,0 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

utils_test.go

@@ -11,12 +11,12 @@ func TestIsBinaryPresent(t *testing.T) {
 		Expected bool
 	}
 	testCases := []testCase{
-		testCase{
+		{
 			Name:     "not existing",
 			Binary:   "qwgq-er-gerw",
 			Expected: false,
 		},
-		testCase{
+		{
 			Name:     "docker-compose exists",
 			Binary:   "docker-compose",
 			Expected: true,

wrapper.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 )
 
 var (
@@ -28,13 +29,13 @@ func NewComposeWrapper(binaryPath string) (*ComposeWrapper, error) {
 }
 
 // Up create and start containers
-func (wrapper *ComposeWrapper) Up(filePath, url, projectName, envFilePath, configPath string) ([]byte, error) {
-	return wrapper.Command(newUpCommand(filePath), url, projectName, envFilePath, configPath)
+func (wrapper *ComposeWrapper) Up(filePaths []string, url, projectName, envFilePath, configPath string) ([]byte, error) {
+	return wrapper.Command(newUpCommand(filePaths), url, projectName, envFilePath, configPath)
 }
 
 // Down stop and remove containers
-func (wrapper *ComposeWrapper) Down(filePath, url, projectName string) ([]byte, error) {
-	return wrapper.Command(newDownCommand(filePath), url, projectName, "", "")
+func (wrapper *ComposeWrapper) Down(filePaths []string, url, projectName string) ([]byte, error) {
+	return wrapper.Command(newDownCommand(filePaths), url, projectName, "", "")
 }
 
 // Command exectue a docker-compose commanåd
@@ -76,19 +77,24 @@ type composeCommand struct {
 	args    []string
 }
 
-func newCommand(command []string, filePath string) composeCommand {
+func newCommand(command []string, filePaths []string) composeCommand {
+	var args []string
+	for _, path := range filePaths {
+		args = append(args, "-f")
+		args = append(args, strings.TrimSpace(path))
+	}
 	return composeCommand{
-		args:    []string{"-f", filePath},
+		args:    args,
 		command: command,
 	}
 }
 
-func newUpCommand(filePath string) composeCommand {
-	return newCommand([]string{"up", "-d"}, filePath)
+func newUpCommand(filePaths []string) composeCommand {
+	return newCommand([]string{"up", "-d"}, filePaths)
 }
 
-func newDownCommand(filePath string) composeCommand {
-	return newCommand([]string{"down", "--remove-orphans"}, filePath)
+func newDownCommand(filePaths []string) composeCommand {
+	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
 }
 
 func (command *composeCommand) WithProjectName(projectName string) {

wrapper_test.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 )
@@ -19,39 +20,76 @@ func setup(t *testing.T) *ComposeWrapper {
 	return w
 }
 
+func Test_NewCommand_SingleFilePath(t *testing.T) {
+	cmd := newCommand([]string{"up", "-d"}, []string{"docker-compose.yml"})
+	expected := []string{"-f", "docker-compose.yml"}
+	if !reflect.DeepEqual(cmd.args, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.args)
+	}
+}
+
+func Test_NewCommand_MultiFilePaths(t *testing.T) {
+	cmd := newCommand([]string{"up", "-d"}, []string{"docker-compose.yml", "docker-compose-override.yml"})
+	expected := []string{"-f", "docker-compose.yml", "-f", "docker-compose-override.yml"}
+	if !reflect.DeepEqual(cmd.args, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.args)
+	}
+}
+
+func Test_NewCommand_MultiFilePaths_WithSpaces(t *testing.T) {
+	cmd := newCommand([]string{"up", "-d"}, []string{" docker-compose.yml", "docker-compose-override.yml "})
+	expected := []string{"-f", "docker-compose.yml", "-f", "docker-compose-override.yml"}
+	if !reflect.DeepEqual(cmd.args, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.args)
+	}
+}
+
 func Test_UpAndDown(t *testing.T) {
 
 	const composeFileContent = `version: "3.9"
+services:
+  busybox:
+    image: "alpine:3.7"
+    container_name: "test_container_one"`
+
+	const overrideComposeFileContent = `version: "3.9"
 services:
   busybox:
     image: "alpine:latest"
-    container_name: "compose_wrapper_test"`
-	const composedContainerName = "compose_wrapper_test"
+    container_name: "test_container_two"`
+
+	const composeContainerName = "test_container_two"
 
 	w := setup(t)
 
 	dir := os.TempDir()
+	defer os.RemoveAll(dir)
+
+	filePathOriginal, err := createFile(dir, "docker-compose.yml", composeFileContent)
+	if err != nil {
+		t.Fatal(err)
+	}
 
-	filePath, err := createComposeFile(dir, composeFileContent)
+	filePathOverride, err := createFile(dir, "docker-compose-override.yml", overrideComposeFileContent)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	_, err = w.Up(filePath, "", "test1", "")
+	_, err = w.Up([]string{filePathOriginal, filePathOverride}, "", "test1", "", "")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if !containerExists(composedContainerName) {
+	if !containerExists(composeContainerName) {
 		t.Fatal("container should exist")
 	}
 
-	_, err = w.Down(filePath, "", "test1")
+	_, err = w.Down([]string{filePathOriginal, filePathOverride}, "", "test1")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if containerExists(composedContainerName) {
+	if containerExists(composeContainerName) {
 		t.Fatal("container should be removed")
 	}
 }