[WIP/Ideas] Config matrices for integration tests

libbeat/scripts/Makefile

@@ -388,14 +388,13 @@ import-dashboards: update ${BEAT_NAME}
 # Builds the environment to test beat
 .PHONY: build-image
 build-image: write-environment
-	${DOCKER_COMPOSE} build ${DOCKER_NOCACHE} --pull --force-rm
 
 # Runs the environment so the redis and elasticsearch can also be used for local development
 # To use it for running the test, set ES_HOST and REDIS_HOST environment variable to the ip of your docker-machine.
 .PHONY: start-environment
 start-environment: stop-environment
 	${DOCKER_COMPOSE} pull --include-deps
-	${DOCKER_COMPOSE} up -d
+	${DOCKER_COMPOSE} up --build -d
 
 .PHONY: stop-environment
 stop-environment:

libbeat/tests/compose/compose.go

@@ -21,72 +21,39 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
-	"strconv"
-	"testing"
 )
 
-// EnsureUp starts all the requested services (must be defined in docker-compose.yml)
-// with a default timeout of 300 seconds
-func EnsureUp(t *testing.T, services ...string) {
-	EnsureUpWithTimeout(t, 300, services...)
-}
-
-// EnsureUpWithTimeout starts all the requested services (must be defined in docker-compose.yml)
-// Wait for `timeout` seconds for health
-func EnsureUpWithTimeout(t *testing.T, timeout int, services ...string) {
-	// The NO_COMPOSE env variables makes it possible to skip the starting of the environment.
-	// This is useful if the service is already running locally.
-	if noCompose, err := strconv.ParseBool(os.Getenv("NO_COMPOSE")); err == nil && noCompose {
-		return
-	}
-
-	compose, err := getComposeProject()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Kill no longer used containers
-	err = compose.KillOld(services)
+func findComposePath() (string, error) {
+	// find docker-compose
+	path, err := os.Getwd()
 	if err != nil {
-		t.Fatal(err)
+		return "", err
 	}
+	for {
+		if path == "/" {
+			break
+		}
 
-	for _, service := range services {
-		err = compose.Start(service)
-		if err != nil {
-			t.Fatal(err)
+		composePath := filepath.Join(path, "docker-compose.yml")
+		if _, err = os.Stat(composePath); err == nil {
+			return composePath, nil
 		}
+		path = filepath.Dir(path)
 	}
 
-	// Wait for health
-	err = compose.Wait(timeout, services...)
-	if err != nil {
-		t.Fatal(err)
-	}
+	return "", errors.New("docker-compose.yml not found")
 }
 
-func getComposeProject() (*Project, error) {
-	// find docker-compose
-	path, err := os.Getwd()
+func getComposeProject(name string) (*Project, error) {
+	path, err := findComposePath()
 	if err != nil {
 		return nil, err
 	}
-	for {
-		if path == "/" {
-			return nil, errors.New("docker-compose.yml not found")
-		}
-
-		if _, err = os.Stat(filepath.Join(path, "docker-compose.yml")); err != nil {
-			path = filepath.Dir(path)
-		} else {
-			break
-		}
-	}
 
 	return NewProject(
-		os.Getenv("DOCKER_COMPOSE_PROJECT_NAME"),
+		name,
 		[]string{
-			filepath.Join(path, "docker-compose.yml"),
+			path,
 		},
 	)
 }

libbeat/tests/compose/project.go

@@ -56,9 +56,11 @@ const (
 // Driver is the interface of docker compose implementations
 type Driver interface {
 	Up(ctx context.Context, opts UpOptions, service string) error
+	Down(ctx context.Context) error
 	Kill(ctx context.Context, signal string, service string) error
 	Ps(ctx context.Context, filter ...string) ([]ContainerStatus, error)
-	// Containers(ctx context.Context, projectFilter Filter, filter ...string) ([]string, error)
+
+	SetParameters(map[string]string)
 
 	LockFile() string
 }
@@ -69,6 +71,7 @@ type ContainerStatus interface {
 	Healthy() bool
 	Running() bool
 	Old() bool
+	Host() string
 }
 
 // Project is a docker-compose project
@@ -94,18 +97,6 @@ func NewProject(name string, files []string) (*Project, error) {
 
 // Start the container, unless it's running already
 func (c *Project) Start(service string) error {
-	servicesStatus, err := c.getServices(service)
-	if err != nil {
-		return err
-	}
-
-	if servicesStatus[service] != nil {
-		if servicesStatus[service].Running {
-			// Someone is running it
-			return nil
-		}
-	}
-
 	c.Lock()
 	defer c.Unlock()
 
@@ -149,6 +140,25 @@ func (c *Project) Wait(seconds int, services ...string) error {
 	return nil
 }
 
+// Host gets the host and port of a service
+func (c *Project) Host(service string) (string, error) {
+	servicesStatus, err := c.getServices(service)
+	if err != nil {
+		return "", err
+	}
+
+	if len(servicesStatus) == 0 {
+		return "", errors.New("no container running for service")
+	}
+
+	status, ok := servicesStatus[service]
+	if !ok || status.Host == "" {
+		return "", errors.New("unknown host:port for service")
+	}
+
+	return status.Host, nil
+}
+
 // Kill a container
 func (c *Project) Kill(service string) error {
 	c.Lock()
@@ -190,6 +200,14 @@ func (c *Project) KillOld(except []string) error {
 	return nil
 }
 
+// Down removes all resources of a project
+func (c *Project) Down() error {
+	c.Lock()
+	defer c.Unlock()
+
+	return c.Driver.Down(context.Background())
+}
+
 // Lock acquires the lock (300s) timeout
 // Normally it should only be seconds that the lock is used, but in some cases it can take longer.
 func (c *Project) Lock() {
@@ -226,6 +244,8 @@ type serviceInfo struct {
 	Running bool
 	Healthy bool
 
+	Host string
+
 	// Has been up for too long?:
 	Old bool
 }
@@ -259,6 +279,7 @@ func (c *Project) getServices(filter ...string) (map[string]*serviceInfo, error)
 		if service.Healthy {
 			service.Old = c.Old()
 		}
+		service.Host = c.Host()
 		result[name] = service
 	}