[WIP/Ideas] Config matrices for integration tests

libbeat/tests/compose/compose.go

@@ -40,7 +40,8 @@ func EnsureUpWithTimeout(t *testing.T, timeout int, services ...string) {
 		return
 	}
 
-	compose, err := getComposeProject()
+	name := os.Getenv("DOCKER_COMPOSE_PROJECT_NAME")
+	compose, err := getComposeProject(name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -65,28 +66,37 @@ func EnsureUpWithTimeout(t *testing.T, timeout int, services ...string) {
 	}
 }
 
-func getComposeProject() (*Project, error) {
+func findComposePath() (string, error) {
 	// find docker-compose
 	path, err := os.Getwd()
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	for {
 		if path == "/" {
-			return nil, errors.New("docker-compose.yml not found")
+			break
 		}
 
-		if _, err = os.Stat(filepath.Join(path, "docker-compose.yml")); err != nil {
-			path = filepath.Dir(path)
-		} else {
-			break
+		composePath := filepath.Join(path, "docker-compose.yml")
+		if _, err = os.Stat(composePath); err == nil {
+			return composePath, nil
 		}
+		path = filepath.Dir(path)
+	}
+
+	return "", errors.New("docker-compose.yml not found")
+}
+
+func getComposeProject(name string) (*Project, error) {
+	path, err := findComposePath()
+	if err != nil {
+		return nil, err
 	}
 
 	return NewProject(
-		os.Getenv("DOCKER_COMPOSE_PROJECT_NAME"),
+		name,
 		[]string{
-			filepath.Join(path, "docker-compose.yml"),
+			path,
 		},
 	)
 }

libbeat/tests/compose/project.go

@@ -56,10 +56,13 @@ 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 +72,7 @@ type ContainerStatus interface {
 	Healthy() bool
 	Running() bool
 	Old() bool
+	Host() string
 }
 
 // Project is a docker-compose project
@@ -94,18 +98,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 +141,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 +201,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 +245,8 @@ type serviceInfo struct {
 	Running bool
 	Healthy bool
 
+	Host string
+
 	// Has been up for too long?:
 	Old bool
 }
@@ -259,6 +280,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
 	}
 

libbeat/tests/compose/runner.go

@@ -0,0 +1,119 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package compose
+
+import (
+	"fmt"
+	"math/rand"
+	"os"
+	"sort"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/pkg/errors"
+)
+
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}
+
+type TestRunner struct {
+	Service  string
+	Options  map[string][]string
+	Parallel bool
+	Timeout  int
+}
+
+type Suite map[string]func(t *testing.T, host string)
+
+func (r *TestRunner) scenarios() []map[string]string {
+	n := 1
+	for _, values := range r.Options {
+		n *= len(values)
+	}
+
+	scenarios := make([]map[string]string, n)
+	for variable, values := range r.Options {
+		v := 0
+		for i, s := range scenarios {
+			if s == nil {
+				s = make(map[string]string)
+				scenarios[i] = s
+			}
+			s[variable] = values[v]
+			v = (v + 1) % len(values)
+		}
+	}
+
+	return scenarios
+}
+
+func (r *TestRunner) Run(t *testing.T, tests Suite) {
+	timeout := r.Timeout
+	if timeout == 0 {
+		timeout = 300
+	}
+
+	for _, s := range r.scenarios() {
+		var vars []string
+		for k, v := range s {
+			os.Setenv(k, v)
+			vars = append(vars, fmt.Sprintf("%s=%s", k, v))
+		}
+		sort.Strings(vars)
+		desc := strings.Join(vars, ",")
+
+		seq := make([]byte, 16)
+		rand.Read(seq)
+		name := fmt.Sprintf("%s_%x", r.Service, seq)
+
+		project, err := getComposeProject(name)
+		if err != nil {
+			t.Fatal(err)
+		}
+		project.SetParameters(s)
+
+		t.Run(desc, func(t *testing.T) {
+			if r.Parallel {
+				t.Parallel()
+			}
+
+			err := project.Start(r.Service)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer project.Down()
+
+			err = project.Wait(timeout, r.Service)
+			if err != nil {
+				t.Fatal(errors.Wrapf(err, "waiting for %s/%s", r.Service, desc))
+			}
+
+			host, err := project.Host(r.Service)
+			if err != nil {
+				t.Fatal(errors.Wrapf(err, "getting host for %s/%s", r.Service, desc))
+			}
+
+			for name, test := range tests {
+				t.Run(name, func(t *testing.T) { test(t, host) })
+			}
+		})
+
+	}
+}

libbeat/tests/compose/wrapper.go

@@ -20,8 +20,10 @@ package compose
 import (
 	"context"
 	"fmt"
+	"net"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -39,6 +41,8 @@ const (
 type wrapperDriver struct {
 	Name  string
 	Files []string
+
+	Environment []string
 }
 
 type wrapperContainer struct {
@@ -61,13 +65,32 @@ func (c *wrapperContainer) Old() bool {
 	return strings.Contains(c.info.Status, "minute")
 }
 
+func (c *wrapperContainer) Host() string {
+	// TODO: Support multiple networks/ports
+	var ip string
+	for _, net := range c.info.NetworkSettings.Networks {
+		if len(net.IPAddress) > 0 {
+			ip = net.IPAddress
+			break
+		}
+	}
+	if len(ip) == 0 {
+		return ""
+	}
+
+	for _, port := range c.info.Ports {
+		return net.JoinHostPort(ip, strconv.Itoa(int(port.PrivatePort)))
+	}
+	return ""
+}
+
 func (d *wrapperDriver) LockFile() string {
-	return d.Files[0] + ".lock"
+	return d.Files[0] + "." + d.Name + ".lock"
 }
 
 func (d *wrapperDriver) cmd(ctx context.Context, command string, arg ...string) *exec.Cmd {
 	var args []string
-	args = append(args, "--project-name", d.Name)
+	args = append(args, "--no-ansi", "--project-name", d.Name)
 	for _, f := range d.Files {
 		args = append(args, "--file", f)
 	}
@@ -76,9 +99,20 @@ func (d *wrapperDriver) cmd(ctx context.Context, command string, arg ...string)
 	cmd := exec.CommandContext(ctx, "docker-compose", args...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
+	if len(d.Environment) > 0 {
+		cmd.Env = d.Environment
+	}
 	return cmd
 }
 
+func (d *wrapperDriver) SetParameters(params map[string]string) {
+	var env []string
+	for k, v := range params {
+		env = append(env, fmt.Sprintf("%s=%s", k, v))
+	}
+	d.Environment = env
+}
+
 func (d *wrapperDriver) Up(ctx context.Context, opts UpOptions, service string) error {
 	var args []string
 
@@ -99,6 +133,10 @@ func (d *wrapperDriver) Up(ctx context.Context, opts UpOptions, service string)
 	return d.cmd(ctx, "up", args...).Run()
 }
 
+func (d *wrapperDriver) Down(ctx context.Context) error {
+	return d.cmd(ctx, "down", "-v").Run()
+}
+
 func (d *wrapperDriver) Kill(ctx context.Context, signal string, service string) error {
 	var args []string
 

metricbeat/docker-compose.yml

@@ -1,4 +1,5 @@
-version: '2'
+version: "2"
+
 services:
   beat:
     build: ${PWD}/.
@@ -156,9 +157,6 @@ services:
   rabbitmq:
     build: ./module/rabbitmq/_meta
 
-  redis:
-    build: ./module/redis/_meta
-
   traefik:
     build: ./module/traefik/_meta
 

metricbeat/module/redis/docker-compose.yml

@@ -0,0 +1,11 @@
+version: "2.4"
+
+services:
+  redis:
+    image: redis:${REDIS_VERSION:-4.0.11}-${IMAGE_OS:-alpine}
+    healthcheck:
+      test:
+      - "CMD-SHELL"
+      - "nc -z localhost 6379"
+      interval: 1s
+      retries: 90