feat: change api to feet portainer

Author: sbusso

go.mod

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

go.sum

@@ -0,0 +1,10 @@
+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=

wrapper.go

@@ -12,29 +12,42 @@ type ComposeWrapper struct {
 }
 
 // NewComposeWrapper initializes a new ComposeWrapper service with local docker-compose binary.
-func NewComposeWrapper() *ComposeWrapper {
+func NewComposeWrapper(binaryPath string) (*ComposeWrapper, error) {
+	if !IsBinaryPresent(programPath(binaryPath, "docker-compose")) {
+		return nil, errors.New("docker-compose binary not found")
+	}
 
-	return &ComposeWrapper{binaryPath: ""}
+	return &ComposeWrapper{binaryPath: binaryPath}, nil
 }
 
 // Up create and start containers
-func (wrapper *ComposeWrapper) Up(filePath string) ([]byte, error) {
-	return wrapper.Command([]string{"up", "-d"}, filePath)
+func (wrapper *ComposeWrapper) Up(filePath, url, projectName, envFilePath string) ([]byte, error) {
+	return wrapper.Command(newUpCommand(filePath), url, projectName, envFilePath)
 }
 
 // Down stop and remove containers
-func (wrapper *ComposeWrapper) Down(filePath string) ([]byte, error) {
-	return wrapper.Command([]string{"down", "--remove-orphans"}, filePath)
+func (wrapper *ComposeWrapper) Down(filePath, url, projectName string) ([]byte, error) {
+	return wrapper.Command(newDownCommand(filePath), url, projectName, "")
 }
 
 // Command exectue a docker-compose commanåd
-func (wrapper *ComposeWrapper) Command(args []string, filePath string) ([]byte, error) {
+func (wrapper *ComposeWrapper) Command(command composeCommand, url, projectName, envFilePath string) ([]byte, error) {
 	program := programPath(wrapper.binaryPath, "docker-compose")
 
-	args = append([]string{"-f", filePath}, args...)
+	if projectName != "" {
+		command.WithProjectName(projectName)
+	}
+
+	if envFilePath != "" {
+		command.WithEnvFilePath(envFilePath)
+	}
+
+	if url != "" {
+		command.WithURL(url)
+	}
 
 	var stderr bytes.Buffer
-	cmd := exec.Command(program, args...)
+	cmd := exec.Command(program, command.ToArgs()...)
 	cmd.Stderr = &stderr
 
 	output, err := cmd.Output()
@@ -44,3 +57,39 @@ func (wrapper *ComposeWrapper) Command(args []string, filePath string) ([]byte,
 
 	return output, nil
 }
+
+type composeCommand struct {
+	command []string
+	args    []string
+}
+
+func newCommand(command []string, filePath string) composeCommand {
+	return composeCommand{
+		args:    []string{"-f", filePath},
+		command: command,
+	}
+}
+
+func newUpCommand(filePath string) composeCommand {
+	return newCommand([]string{"up", "-d"}, filePath)
+}
+
+func newDownCommand(filePath string) composeCommand {
+	return newCommand([]string{"down", "--remove-orphans"}, filePath)
+}
+
+func (command *composeCommand) WithProjectName(projectName string) {
+	command.args = append(command.args, "-p", projectName)
+}
+
+func (command *composeCommand) WithEnvFilePath(envFilePath string) {
+	command.args = append(command.args, "--env-file", envFilePath)
+}
+
+func (command *composeCommand) WithURL(url string) {
+	command.args = append(command.args, "-H", url)
+}
+
+func (command *composeCommand) ToArgs() []string {
+	return append(command.args, command.command...)
+}

wrapper_test.go

@@ -1,22 +1,96 @@
 package wrapper
 
 import (
+	"fmt"
 	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
 	"testing"
 )
 
-func TestCommand(t *testing.T) {
-	w := NewComposeWrapper()
+func setup(t *testing.T) *ComposeWrapper {
+	w, err := NewComposeWrapper("")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return w
+}
+
+func Test_UpAndDown(t *testing.T) {
+
+	const composeFileContent = `version: "3.9"
+services:
+  busybox:
+    image: "alpine:latest"
+    container_name: "compose_wrapper_test"`
+	const composedContainerName = "compose_wrapper_test"
+
+	w := setup(t)
+
+	dir := os.TempDir()
+
+	filePath, err := createComposeFile(dir, composeFileContent)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = w.Up(filePath, "", "test1", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !containerExists(composedContainerName) {
+		t.Fatal("container should exist")
+	}
 
-	file := "docker-compose-test.yml"
-	_, err := w.Up(file)
+	_, err = w.Down(filePath, "", "test1")
 	if err != nil {
-		log.Fatalln(err)
+		t.Fatal(err)
 	}
 
-	_, err = w.Down(file)
+	if containerExists(composedContainerName) {
+		t.Fatal("container should be removed")
+	}
+}
+
+type composeOptions struct {
+	filePath    string
+	url         string
+	envFile     string
+	projectName string
+}
+
+func createFile(dir, fileName, content string) (string, error) {
+	filePath := filepath.Join(dir, fileName)
+	f, err := os.Create(filePath)
+	if err != nil {
+		return "", err
+	}
+
+	f.WriteString(content)
+	f.Close()
+
+	return filePath, nil
+}
+
+func createEnvFile(dir, envFileContent string) (string, error) {
+	return createFile(dir, "stack.env", envFileContent)
+}
+
+func createComposeFile(dir, composeFileContent string) (string, error) {
+	return createFile(dir, "docmer-compose.yml", composeFileContent)
+}
+
+func containerExists(containerName string) bool {
+	cmd := exec.Command("docker", "ps", "-a", "-f", fmt.Sprintf("name=%s", containerName))
+
+	out, err := cmd.Output()
 	if err != nil {
-		log.Fatalln(err)
+		log.Fatalf("failed to list containers: %s", err)
 	}
 
+	return strings.Contains(string(out), containerName)
 }