From 368bf86a0f7f9abe4db7d437479047c0c17de528 Mon Sep 17 00:00:00 2001
From: sayden <mariocaster@gmail.com>
Date: Tue, 9 Apr 2019 10:33:23 +0200
Subject: [PATCH 1/3] Atomic commit

---
 metricbeat/magefile.go | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go
index 39de5fa4704b..d938aa9cb8ab 100644
--- a/metricbeat/magefile.go
+++ b/metricbeat/magefile.go
@@ -22,6 +22,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 	"regexp"
 	"time"
 
@@ -93,6 +94,27 @@ func Update() error {
 	return sh.Run("make", "update")
 }
 
+// MockedTests runs the HTTP tests using the mocked data inside each {module}/{metricset}/testdata folder.
+// Use MODULE={module_name} to run only mocked tests with a single module.
+// Use GENERATE=true or GENERATE=1 to regenerate JSON files.
+func MockedTests() error {
+	goTestDefaultArgs := mage.DefaultGoTestUnitArgs()
+
+	goTestDefaultArgs.ExtraFlags = []string{"github.com/elastic/beats/metricbeat/mb/testing/data/."}
+
+	if module := os.Getenv("MODULE"); module != "" {
+		goTestDefaultArgs.ExtraFlags = append(goTestDefaultArgs.ExtraFlags, fmt.Sprintf("-module=%s", module))
+	}
+
+	if generate := os.Getenv("GENERATE"); generate == "true" || generate == "1" {
+		goTestDefaultArgs.ExtraFlags = append(goTestDefaultArgs.ExtraFlags, "-generate")
+	}
+
+	goTestDefaultArgs.Packages = []string{}
+
+	return mage.GoTest(context.Background(), goTestDefaultArgs)
+}
+
 // Fields generates a fields.yml for the Beat.
 func Fields() error {
 	return mage.GenerateFieldsYAML("module")

From 42cbc7c844bd94695d9ef7e990459d7220ebef39 Mon Sep 17 00:00:00 2001
From: sayden <mariocaster@gmail.com>
Date: Wed, 10 Apr 2019 15:09:25 +0200
Subject: [PATCH 2/3] Address comments

---
 metricbeat/magefile.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go
index d938aa9cb8ab..790e62eb32b4 100644
--- a/metricbeat/magefile.go
+++ b/metricbeat/magefile.go
@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"os"
 	"regexp"
+	"strconv"
 	"time"
 
 	"github.com/magefile/mage/mg"
@@ -97,22 +98,22 @@ func Update() error {
 // MockedTests runs the HTTP tests using the mocked data inside each {module}/{metricset}/testdata folder.
 // Use MODULE={module_name} to run only mocked tests with a single module.
 // Use GENERATE=true or GENERATE=1 to regenerate JSON files.
-func MockedTests() error {
-	goTestDefaultArgs := mage.DefaultGoTestUnitArgs()
+func MockedTests(ctx context.Context) error {
+	params := mage.DefaultGoTestUnitArgs()
 
-	goTestDefaultArgs.ExtraFlags = []string{"github.com/elastic/beats/metricbeat/mb/testing/data/."}
+	params.ExtraFlags = []string{"github.com/elastic/beats/metricbeat/mb/testing/data/."}
 
 	if module := os.Getenv("MODULE"); module != "" {
-		goTestDefaultArgs.ExtraFlags = append(goTestDefaultArgs.ExtraFlags, fmt.Sprintf("-module=%s", module))
+		params.ExtraFlags = append(params.ExtraFlags, "-module="+module)
 	}
 
-	if generate := os.Getenv("GENERATE"); generate == "true" || generate == "1" {
-		goTestDefaultArgs.ExtraFlags = append(goTestDefaultArgs.ExtraFlags, "-generate")
+	if generate, _ := strconv.ParseBool(os.Getenv("GENERATE")) ; generate {
+		params.ExtraFlags = append(params.ExtraFlags, "-generate")
 	}
 
-	goTestDefaultArgs.Packages = []string{}
+	params.Packages = nil
 
-	return mage.GoTest(context.Background(), goTestDefaultArgs)
+	return mage.GoTest(ctx, params)
 }
 
 // Fields generates a fields.yml for the Beat.

From dd585966023951efc1426bacfaedb279e84243ea Mon Sep 17 00:00:00 2001
From: sayden <mariocaster@gmail.com>
Date: Wed, 10 Apr 2019 16:31:04 +0200
Subject: [PATCH 3/3] make fmt

---
 metricbeat/magefile.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go
index 790e62eb32b4..7a99d5ecc67d 100644
--- a/metricbeat/magefile.go
+++ b/metricbeat/magefile.go
@@ -107,7 +107,7 @@ func MockedTests(ctx context.Context) error {
 		params.ExtraFlags = append(params.ExtraFlags, "-module="+module)
 	}
 
-	if generate, _ := strconv.ParseBool(os.Getenv("GENERATE")) ; generate {
+	if generate, _ := strconv.ParseBool(os.Getenv("GENERATE")); generate {
 		params.ExtraFlags = append(params.ExtraFlags, "-generate")
 	}