Update genmod

- add GOSUMDB - add "go <release>" to temporary go.mod for diff - refreshes all of the go.mod's indirectly
elastic · Sep 4, 2019 · f8e99a0 · f8e99a0
1 parent d2fa30c
commit f8e99a0
Show file tree

Hide file tree

Showing 30 changed files with 67 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -12,3 +12,5 @@ require (
 	go.elastic.co/fastjson v1.0.0
 	golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e
 )
+
+go 1.13
diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod
@@ -5,3 +5,5 @@ require go.elastic.co/apm/module/apmhttp v1.5.0
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../../module/apmhttp
+
+go 1.13
diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod
@@ -14,3 +14,5 @@ replace go.elastic.co/apm => ../..
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
 
 replace go.elastic.co/apm/module/apmsql => ../apmsql
+
+go 1.13
diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod
@@ -10,3 +10,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod
@@ -17,3 +17,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod
@@ -12,3 +12,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod
@@ -10,3 +10,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod
@@ -14,3 +14,5 @@ replace go.elastic.co/apm => ../../../..
 replace go.elastic.co/apm/module/apmelasticsearch => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../../../apmhttp
+
+go 1.13
diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod
@@ -11,3 +11,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod
@@ -9,3 +9,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod
@@ -18,3 +18,5 @@ replace go.elastic.co/apm => ../..
 replace go.elastic.co/apm/module/apmgrpc => ../apmgrpc
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod
@@ -7,3 +7,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod
@@ -18,3 +18,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmsql => ../apmsql
+
+go 1.13
diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod
@@ -11,3 +11,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod
@@ -14,3 +14,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmsql => ../apmsql
+
+go 1.13
diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod
@@ -12,3 +12,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmhttp/go.mod b/module/apmhttp/go.mod
@@ -9,3 +9,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmhttprouter/go.mod b/module/apmhttprouter/go.mod
@@ -10,3 +10,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod
@@ -6,3 +6,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod
@@ -9,3 +9,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod
@@ -15,3 +15,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmot/go.mod b/module/apmot/go.mod
@@ -10,3 +10,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod
@@ -9,3 +9,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod
@@ -7,3 +7,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod
@@ -13,3 +13,5 @@ require (
 replace go.elastic.co/apm => ../..
 
 replace go.elastic.co/apm/module/apmhttp => ../apmhttp
+
+go 1.13
diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod
@@ -10,3 +10,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod
@@ -10,3 +10,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/module/apmzerolog/go.mod b/module/apmzerolog/go.mod
@@ -8,3 +8,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod
@@ -6,3 +6,5 @@ require (
 )
 
 replace go.elastic.co/apm => ../..
+
+go 1.13
diff --git a/scripts/genmod/main.go b/scripts/genmod/main.go
@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"go/build"
 	"io/ioutil"
 	"log"
 	"os"
@@ -130,7 +131,7 @@ func updateModule(dir string, gomod *GoMod, modules map[string]*GoMod) error {
 			"-replace", require.Path+"="+relDir,
 		)
 		cmd.Env = append(os.Environ(), "GO111MODULE=on")
-		cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid")
+		cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid", "GOSUMDB=sum.golang.org https://sum.golang.org")
 		cmd.Stderr = os.Stderr
 		cmd.Dir = dir
 		if err := cmd.Run(); err != nil {
@@ -198,18 +199,18 @@ func checkModuleComplete(dir string, gomod *GoMod, modules map[string]*GoMod) er
 	cmd.Stderr = os.Stderr
 	cmd.Dir = gomod.dir
 	if err := cmd.Run(); err != nil {
-		return err
+		return errors.Wrap(err, "'go mod download' failed")
 	}
 
 	// Check we can build the module's tests and its transitive dependencies
 	// without updating go.mod.
 	cmd = exec.Command("go", "test", "-c", "-mod=readonly", "-o", os.DevNull)
 	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-	cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid")
+	cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid", "GOSUMDB=sum.golang.org https://sum.golang.org")
 	cmd.Stderr = os.Stderr
 	cmd.Dir = gomod.dir
 	if err := cmd.Run(); err != nil {
-		return err
+		return errors.Wrap(err, "'go test' failed")
 	}
 
 	// We create a temporary program which imports the module, and then
@@ -243,6 +244,9 @@ func main() {}
 		gomod := modules[path]
 		fmt.Fprintf(&tmpGomodContent, "\nreplace %s => %s\n", path, gomod.dir)
 	}
+	// Add "go <version>", using the latest release tag.
+	tags := build.Default.ReleaseTags
+	fmt.Fprintf(&tmpGomodContent, "\ngo %s\n", tags[len(tags)-1][2:])
 
 	if err := ioutil.WriteFile(tmpGomodPath, tmpGomodContent.Bytes(), 0644); err != nil {
 		return err
@@ -253,7 +257,7 @@ func main() {}
 
 	cmd = exec.Command("go", "mod", "tidy", "-v")
 	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-	cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid")
+	cmd.Env = append(cmd.Env, "GOPROXY=http://proxy.invalid", "GOSUMDB=sum.golang.org https://sum.golang.org")
 	cmd.Stderr = os.Stderr
 	cmd.Dir = tmpdir
 	if err := cmd.Run(); err != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,5 @@ require ( @@
     	go.elastic.co/fastjson v1.0.0
     	golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e
     )
+    go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@ require go.elastic.co/apm/module/apmhttp v1.5.0
		replace go.elastic.co/apm => ../..

		replace go.elastic.co/apm/module/apmhttp => ../../module/apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,5 @@ replace go.elastic.co/apm => ../..
		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		replace go.elastic.co/apm/module/apmsql => ../apmsql

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@ require (
		replace go.elastic.co/apm => ../..

		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ require (
		replace go.elastic.co/apm => ../..

		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ require (
		replace go.elastic.co/apm => ../..

		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,5 @@ replace go.elastic.co/apm => ../../../..
		replace go.elastic.co/apm/module/apmelasticsearch => ../..

		replace go.elastic.co/apm/module/apmhttp => ../../../apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@ require (
		replace go.elastic.co/apm => ../..

		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ require (
		)

		replace go.elastic.co/apm => ../..

		go 1.13
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@ replace go.elastic.co/apm => ../..
		replace go.elastic.co/apm/module/apmgrpc => ../apmgrpc

		replace go.elastic.co/apm/module/apmhttp => ../apmhttp

		go 1.13