From 13592b05dcd2a39f9834df49d7b4b13b9d47ab10 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Date: Wed, 1 Apr 2020 19:16:01 +0200
Subject: [PATCH] Add support for MODULE in mage goIntegTest for metricbeat
 (#17147)

Add support for `MODULE` environment variable in `mage goIntegTest`
for Metricbeat to run integration tests for an specific module. For example,
to run integration tests for sql module only:

  MODULE=sql mage goIntegTest
---
 CHANGELOG-developer.next.asciidoc | 1 +
 dev-tools/mage/gotest.go          | 7 +++++++
 dev-tools/mage/integtest.go       | 1 +
 metricbeat/magefile.go            | 1 +
 x-pack/metricbeat/magefile.go     | 1 +
 5 files changed, 11 insertions(+)

diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
index cc39c4a9516..3a70e657af2 100644
--- a/CHANGELOG-developer.next.asciidoc
+++ b/CHANGELOG-developer.next.asciidoc
@@ -75,4 +75,5 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
 - `supported-versions.yml` can be used in metricbeat python system tests to obtain the build args for docker compose builds. {pull}14520[14520]
 - Fix dropped errors in the tests for the metricbeat Azure module. {pull}13773[13773]
 - New mage target for Functionbeat: generate pkg folder to make manager easier. {pull}15580[15880]
+- Add support for MODULE environment variable in `mage goIntegTest` in metricbeat to run integration tests for a single module. {pull}17147[17147]
 - Add support for a `TEST_TAGS` environment variable to add tags for tests selection following go build tags semantics, this environment variable is used by mage test targets to add build tags. Python tests can also be tagged with a decorator (`@beat.tag('sometag')`). {pull}16937[16937] {pull}17075[17075]
diff --git a/dev-tools/mage/gotest.go b/dev-tools/mage/gotest.go
index b444e456a61..9f0050025f9 100644
--- a/dev-tools/mage/gotest.go
+++ b/dev-tools/mage/gotest.go
@@ -135,8 +135,15 @@ func DefaultTestBinaryArgs() TestBinaryArgs {
 // This method executes integration tests for a single module at a time.
 // Use TEST_COVERAGE=true to enable code coverage profiling.
 // Use RACE_DETECTOR=true to enable the race detector.
+// Use MODULE=module to run only tests for `module`.
 func GoTestIntegrationForModule(ctx context.Context) error {
 	return RunIntegTest("goIntegTest", func() error {
+		module := EnvOr("MODULE", "")
+		if module != "" {
+			err := GoTest(ctx, GoTestIntegrationArgsForModule(module))
+			return errors.Wrapf(err, "integration tests failed for module %s", module)
+		}
+
 		modulesFileInfo, err := ioutil.ReadDir("./module")
 		if err != nil {
 			return err
diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go
index 1c1d7801733..6fc26915415 100644
--- a/dev-tools/mage/integtest.go
+++ b/dev-tools/mage/integtest.go
@@ -149,6 +149,7 @@ func RunIntegTest(mageTarget string, test func() error, passThroughEnvVars ...st
 		"RACE_DETECTOR",
 		"TEST_TAGS",
 		"PYTHON_EXE",
+		"MODULE",
 	}
 	env = append(env, passThroughEnvVars...)
 	return runInIntegTestEnv(mageTarget, test, env...)
diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go
index f94556c7182..d100e555c78 100644
--- a/metricbeat/magefile.go
+++ b/metricbeat/magefile.go
@@ -176,6 +176,7 @@ func CollectDocs() error {
 // Use TEST_COVERAGE=true to enable code coverage profiling.
 // Use RACE_DETECTOR=true to enable the race detector.
 // Use TEST_TAGS=tag1,tag2 to add additional build tags.
+// Use MODULE=module to run only tests for `module`.
 func GoIntegTest(ctx context.Context) error {
 	mg.Deps(Fields)
 	return devtools.GoTestIntegrationForModule(ctx)
diff --git a/x-pack/metricbeat/magefile.go b/x-pack/metricbeat/magefile.go
index 76d8e28156c..030b2b1889e 100644
--- a/x-pack/metricbeat/magefile.go
+++ b/x-pack/metricbeat/magefile.go
@@ -146,6 +146,7 @@ func IntegTest() {
 // Use TEST_COVERAGE=true to enable code coverage profiling.
 // Use RACE_DETECTOR=true to enable the race detector.
 // Use TEST_TAGS=tag1,tag2 to add additional build tags.
+// Use MODULE=module to run only tests for `module`.
 func GoIntegTest(ctx context.Context) error {
 	return devtools.GoTestIntegrationForModule(ctx)
 }