fix(compose): remove by project name [EE-4916] (#34)

Author: chiptus

compose/compose_test.go

@@ -67,7 +67,7 @@ func Test_UpAndDown(t *testing.T) {
 		t.Fatal("container should exist")
 	}
 
-	err = deployer.Remove(ctx, []string{filePathOriginal, filePathOverride}, libstack.Options{})
+	err = deployer.Remove(ctx, "", []string{filePathOriginal, filePathOverride}, libstack.Options{})
 	if err != nil {
 		t.Fatal(err)
 	}

compose/internal/composeplugin/composeplugin.go

@@ -55,8 +55,8 @@ func (wrapper *PluginWrapper) Deploy(ctx context.Context, filePaths []string, op
 }
 
 // Down stop and remove containers
-func (wrapper *PluginWrapper) Remove(ctx context.Context, filePaths []string, options libstack.Options) error {
-	output, err := wrapper.command(newDownCommand(filePaths), options)
+func (wrapper *PluginWrapper) Remove(ctx context.Context, projectName string, filePaths []string, options libstack.Options) error {
+	output, err := wrapper.command(newDownCommand(projectName, filePaths), options)
 	if len(output) != 0 {
 		if err != nil {
 			return err
@@ -203,8 +203,11 @@ func newUpCommand(filePaths []string, options upOptions) composeCommand {
 	return newCommand(args, filePaths)
 }
 
-func newDownCommand(filePaths []string) composeCommand {
-	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
+func newDownCommand(projectName string, filePaths []string) composeCommand {
+	cmd := newCommand([]string{"down", "--remove-orphans"}, filePaths)
+	cmd.WithProjectName(projectName)
+
+	return cmd
 }
 
 func newPullCommand(filePaths []string) composeCommand {

compose/internal/composeplugin/composeplugin_test.go

@@ -101,7 +101,7 @@ services:
 		t.Fatal("container should exist")
 	}
 
-	err = w.Remove(ctx, []string{filePathOriginal, filePathOverride}, libstack.Options{})
+	err = w.Remove(ctx, "", []string{filePathOriginal, filePathOverride}, libstack.Options{})
 	if err != nil {
 		t.Fatal(err)
 	}

libstack.go

@@ -6,7 +6,11 @@ import (
 
 type Deployer interface {
 	Deploy(ctx context.Context, filePaths []string, options DeployOptions) error
-	Remove(ctx context.Context, filePaths []string, options Options) error
+	// Remove stops and removes containers
+	//
+	// projectName or filePaths are required
+	// if projectName is supplied filePaths will be ignored
+	Remove(ctx context.Context, projectName string, filePaths []string, options Options) error
 	Pull(ctx context.Context, filePaths []string, options Options) error
 	Validate(ctx context.Context, filePaths []string, options Options) error
 }