chore: update to go 1.21

Prior to this change, we using go 1.20. This change updates to go 1.21 and introduces the toolchain directive. With this update the tools.go file is no longer required for the test cases and it also highlighted some missing go mod tidy commands in the test cases.
Versent · Mar 22, 2024 · 81a63ae · 81a63ae
1 parent 2971f7b
commit 81a63ae
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 92 deletions.
diff --git a/cmd/vermockgen/testdata/commands.txt b/cmd/vermockgen/testdata/commands.txt
@@ -17,9 +17,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/fallback.txt b/cmd/vermockgen/testdata/fallback.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- mock.go --
 //go:build vermockstub
 

diff --git a/cmd/vermockgen/testdata/fallback_all_args.txt b/cmd/vermockgen/testdata/fallback_all_args.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- HEADER --
 // HEADER
 -- mock.go --

diff --git a/cmd/vermockgen/testdata/fallback_flag_undefined.txt b/cmd/vermockgen/testdata/fallback_flag_undefined.txt
@@ -24,9 +24,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/fallback_header.txt b/cmd/vermockgen/testdata/fallback_header.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- HEADER --
 // HEADER
 -- mock.go --

diff --git a/cmd/vermockgen/testdata/fallback_packages_missing.txt b/cmd/vermockgen/testdata/fallback_packages_missing.txt
@@ -15,9 +15,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/fallback_tags.txt b/cmd/vermockgen/testdata/fallback_tags.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- mock.go --
 //go:build vermockstub
 

diff --git a/cmd/vermockgen/testdata/flags.txt b/cmd/vermockgen/testdata/flags.txt
@@ -13,9 +13,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/flags_gen.txt b/cmd/vermockgen/testdata/flags_gen.txt
@@ -17,9 +17,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/gen.txt b/cmd/vermockgen/testdata/gen.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- mock.go --
 //go:build vermockstub
 

diff --git a/cmd/vermockgen/testdata/gen_all_args.txt b/cmd/vermockgen/testdata/gen_all_args.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- HEADER --
 // HEADER
 -- mock.go --

diff --git a/cmd/vermockgen/testdata/gen_flag_undefined.txt b/cmd/vermockgen/testdata/gen_flag_undefined.txt
@@ -24,9 +24,3 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
diff --git a/cmd/vermockgen/testdata/gen_header.txt b/cmd/vermockgen/testdata/gen_header.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- HEADER --
 // HEADER
 -- mock.go --

diff --git a/cmd/vermockgen/testdata/gen_package.txt b/cmd/vermockgen/testdata/gen_package.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- mock.go --
 //go:build vermockstub
 

diff --git a/cmd/vermockgen/testdata/gen_tags.txt b/cmd/vermockgen/testdata/gen_tags.txt
@@ -14,12 +14,6 @@ module test
 go 1.20
 
 require github.com/Versent/go-vermock v0.0.0-00010101000000-000000000000
--- tools.go --
-package main
-
-import (
-	_ "github.com/Versent/go-vermock/cmd/vermockgen"
-)
 -- mock.go --
 //go:build vermockstub
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/Versent/go-vermock
 
-go 1.20
+go 1.21
+
+toolchain go1.21.6
 
 require (
 	github.com/google/subcommands v1.2.0

diff --git a/internal/mock/generate_test.go b/internal/mock/generate_test.go
@@ -30,7 +30,11 @@ func TestGenerate(t *testing.T) {
 		t,
 		context.Background(),
 		engine,
-		[]string{"MUT=" + mutdir},
+		[]string{
+			"PATH=" + os.Getenv("PATH"),
+			"HOME=" + os.Getenv("HOME"),
+			"MUT=" + mutdir,
+		},
 		"testdata/*.txt",
 	)
 }

diff --git a/internal/mock/testdata/custom_func.txt b/internal/mock/testdata/custom_func.txt
@@ -3,6 +3,8 @@
 
 replace ../../../.. $MUT go.mod
 
+exec go mod tidy
+
 vermockgen
 
 cmpenv stdout testdata/stdout

diff --git a/internal/mock/testdata/custom_func_multi_expect.txt b/internal/mock/testdata/custom_func_multi_expect.txt
@@ -3,6 +3,8 @@
 
 replace ../../../.. $MUT go.mod
 
+exec go mod tidy
+
 vermockgen
 
 cmpenv stdout testdata/stdout

diff --git a/internal/mock/testdata/custom_func_multi_file.txt b/internal/mock/testdata/custom_func_multi_file.txt
@@ -3,6 +3,8 @@
 
 replace ../../../.. $MUT go.mod
 
+exec go mod tidy
+
 vermockgen
 
 cmpenv stdout testdata/stdout