Do not update go.mod during packaging and testing (#19823)

kvch · web-flow · commit f91c96f672ba · 2020-07-13T13:18:30.000+02:00
diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go
@@ -263,6 +263,7 @@ func (b GolangCrossBuilder) Build() error {
 
 	args = append(args,
 		"--rm",
+		"--env", "GOFLAGS=-mod=readonly",
 		"--env", "MAGEFILE_VERBOSE="+verbose,
 		"--env", "MAGEFILE_TIMEOUT="+EnvOr("MAGEFILE_TIMEOUT", ""),
 		"--env", fmt.Sprintf("SNAPSHOT=%v", Snapshot),
diff --git a/dev-tools/mage/fields.go b/dev-tools/mage/fields.go
@@ -102,6 +102,7 @@ func generateFieldsYAML(baseDir, output string, moduleDirs ...string) error {
 	}
 
 	cmd := []string{"run",
+		"-mod=readonly",
 		filepath.Join(beatsDir, globalFieldsCmdPath),
 		"-es_beats_path", beatsDir,
 		"-beat_path", baseDir,
@@ -127,6 +128,7 @@ func GenerateFieldsGo(fieldsYML, out string) error {
 	}
 
 	cmd := []string{"run",
+		"-mod=readonly",
 		filepath.Join(beatsDir, assetCmdPath),
 		"-pkg", "include",
 		"-in", fieldsYML,
diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go
@@ -236,6 +236,7 @@ func initRunner(tester IntegrationTester, dir string, passInEnv map[string]strin
 	// Create the custom env for the runner.
 	env := map[string]string{
 		insideIntegrationTestEnvVar: "true",
+		"GOFLAGS":                   "-mod=vendor",
 	}
 	for name, value := range passInEnv {
 		env[name] = value

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ func generateFieldsYAML(baseDir, output string, moduleDirs ...string) error {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`cmd := []string{"run",`
	`105`	`+ "-mod=readonly",`
`105`	`106`	`filepath.Join(beatsDir, globalFieldsCmdPath),`
`106`	`107`	`"-es_beats_path", beatsDir,`
`107`	`108`	`"-beat_path", baseDir,`
`@@ -127,6 +128,7 @@ func GenerateFieldsGo(fieldsYML, out string) error {`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`cmd := []string{"run",`
	`131`	`+ "-mod=readonly",`
`130`	`132`	`filepath.Join(beatsDir, assetCmdPath),`
`131`	`133`	`"-pkg", "include",`
`132`	`134`	`"-in", fieldsYML,`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ func initRunner(tester IntegrationTester, dir string, passInEnv map[string]strin`
`236`	`236`	`// Create the custom env for the runner.`
`237`	`237`	`env := map[string]string{`
`238`	`238`	`insideIntegrationTestEnvVar: "true",`
	`239`	`+ "GOFLAGS": "-mod=vendor",`
`239`	`240`	`}`
`240`	`241`	`for name, value := range passInEnv {`
`241`	`242`	`env[name] = value`