Fix issue with arguments. Use long args. Fix tests

Author: hookenz

compose/compose_test.go

@@ -2,6 +2,7 @@ package compose_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -13,7 +14,15 @@ import (
 	"github.com/portainer/docker-compose-wrapper/compose"
 )
 
+func checkPrerequisites(t *testing.T) {
+	if _, err := os.Stat("docker-compose"); errors.Is(err, os.ErrNotExist) {
+		t.Fatal("docker-compose binary not found, please run download.sh and re-run this suite")
+	}
+}
+
 func Test_UpAndDown(t *testing.T) {
+	checkPrerequisites(t)
+
 	deployer, _ := compose.NewComposeDeployer("", "")
 
 	const composeFileContent = `
@@ -49,7 +58,7 @@ func Test_UpAndDown(t *testing.T) {
 
 	ctx := context.Background()
 
-	err = deployer.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)
+	err = deployer.Deploy(ctx, "", "", "", []string{filePathOriginal, filePathOverride}, "", false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -58,7 +67,7 @@ func Test_UpAndDown(t *testing.T) {
 		t.Fatal("container should exist")
 	}
 
-	err = deployer.Remove(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "")
+	err = deployer.Remove(ctx, "", "", "", []string{filePathOriginal, filePathOverride}, "")
 	if err != nil {
 		t.Fatal(err)
 	}

compose/internal/composeplugin/composeplugin.go

@@ -119,19 +119,19 @@ func (wrapper *PluginWrapper) command(command composeCommand, workingDir, host,
 }
 
 type composeCommand struct {
-	command []string
-	args    []string
+	globalArgs        []string // docker-compose global arguments: --host host -f file.yaml
+	subCommandAndArgs []string // docker-compose subcommand:  up, down folllowed by subcommand arguments
 }
 
 func newCommand(command []string, filePaths []string) composeCommand {
-	var args []string
+	args := []string{}
 	for _, path := range filePaths {
 		args = append(args, "-f")
 		args = append(args, strings.TrimSpace(path))
 	}
 	return composeCommand{
-		args:    args,
-		command: command,
+		globalArgs:        args,
+		subCommandAndArgs: command,
 	}
 }
 
@@ -151,18 +151,20 @@ func newPullCommand(filePaths []string) composeCommand {
 	return newCommand([]string{"pull"}, filePaths)
 }
 
-func (command *composeCommand) WithProjectName(projectName string) {
-	command.args = append(command.args, "-p", projectName)
+func (command *composeCommand) WithHost(host string) {
+	// prepend compatibility flags such as this one as they must appear before the
+	// regular global args otherwise docker-compose will throw an error
+	command.globalArgs = append([]string{"--host", host}, command.globalArgs...)
 }
 
-func (command *composeCommand) WithEnvFilePath(envFilePath string) {
-	command.args = append(command.args, "--env-file", envFilePath)
+func (command *composeCommand) WithProjectName(projectName string) {
+	command.globalArgs = append(command.globalArgs, "--project-name", projectName)
 }
 
-func (command *composeCommand) WithHost(host string) {
-	command.args = append(command.args, "-H", host)
+func (command *composeCommand) WithEnvFilePath(envFilePath string) {
+	command.globalArgs = append(command.globalArgs, "--env-file", envFilePath)
 }
 
 func (command *composeCommand) ToArgs() []string {
-	return append(command.args, command.command...)
+	return append(command.globalArgs, command.subCommandAndArgs...)
 }

compose/internal/composeplugin/composeplugin_test.go

@@ -2,6 +2,7 @@ package composeplugin
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -14,6 +15,12 @@ import (
 	libstack "github.com/portainer/docker-compose-wrapper"
 )
 
+func checkPrerequisites(t *testing.T) {
+	if _, err := os.Stat("docker-compose"); errors.Is(err, os.ErrNotExist) {
+		t.Fatal("docker-compose binary not found, please run download.sh and re-run this suite")
+	}
+}
+
 func setup(t *testing.T) libstack.Deployer {
 	w, err := NewPluginWrapper("", "")
 	if err != nil {
@@ -24,30 +31,37 @@ func setup(t *testing.T) libstack.Deployer {
 }
 
 func Test_NewCommand_SingleFilePath(t *testing.T) {
+	checkPrerequisites(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)
+	if !reflect.DeepEqual(cmd.globalArgs, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.globalArgs)
 	}
 }
 
 func Test_NewCommand_MultiFilePaths(t *testing.T) {
+	checkPrerequisites(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)
+	if !reflect.DeepEqual(cmd.globalArgs, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.globalArgs)
 	}
 }
 
 func Test_NewCommand_MultiFilePaths_WithSpaces(t *testing.T) {
+	checkPrerequisites(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)
+	if !reflect.DeepEqual(cmd.globalArgs, expected) {
+		t.Errorf("wrong output args, want: %v, got: %v", expected, cmd.globalArgs)
 	}
 }
 
 func Test_UpAndDown(t *testing.T) {
+	checkPrerequisites(t)
 
 	const composeFileContent = `version: "3.9"
 services:
@@ -79,7 +93,7 @@ services:
 	}
 
 	ctx := context.Background()
-	err = w.Deploy(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride}, "", false)
+	err = w.Deploy(ctx, "", "", "", []string{filePathOriginal, filePathOverride}, "", false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -88,7 +102,7 @@ services:
 		t.Fatal("container should exist")
 	}
 
-	err = w.Remove(ctx, "", "", "test1", []string{filePathOriginal, filePathOverride})
+	err = w.Remove(ctx, "", "", "", []string{filePathOriginal, filePathOverride}, "")
 	if err != nil {
 		t.Fatal(err)
 	}