From 3783934de80835870bf6732ca6053c2187970683 Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <matthieu.morel35@gmail.com>
Date: Tue, 15 Aug 2023 11:58:13 +0200
Subject: [PATCH] modulegen: create internal/module

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 modulegen/internal/tools/exec.go | 19 +++++++++++++++++++
 modulegen/main.go                | 12 +++---------
 2 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 modulegen/internal/tools/exec.go

diff --git a/modulegen/internal/tools/exec.go b/modulegen/internal/tools/exec.go
new file mode 100644
index 0000000000..5d5136ddaa
--- /dev/null
+++ b/modulegen/internal/tools/exec.go
@@ -0,0 +1,19 @@
+package tools
+
+import (
+	"os/exec"
+)
+
+func GoModTidy(cmdDir string) error {
+	return runGoCommand(cmdDir, "mod", "tidy")
+}
+
+func GoVet(cmdDir string) error {
+	return runGoCommand(cmdDir, "vet", "./...")
+}
+
+func runGoCommand(cmdDir string, args ...string) error {
+	cmd := exec.Command("go", args...)
+	cmd.Dir = cmdDir
+	return cmd.Run()
+}
diff --git a/modulegen/main.go b/modulegen/main.go
index b33c67356e..28976b2e7f 100644
--- a/modulegen/main.go
+++ b/modulegen/main.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"html/template"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"sort"
@@ -18,6 +17,7 @@ import (
 
 	"github.com/testcontainers/testcontainers-go/modulegen/internal/dependabot"
 	"github.com/testcontainers/testcontainers-go/modulegen/internal/mkdocs"
+	"github.com/testcontainers/testcontainers-go/modulegen/internal/tools"
 )
 
 var (
@@ -155,12 +155,12 @@ func main() {
 	}
 
 	cmdDir := filepath.Join(ctx.RootDir, example.ParentDir(), example.Lower())
-	err = runGoCommand(cmdDir, "mod", "tidy")
+	err = tools.GoModTidy(cmdDir)
 	if err != nil {
 		fmt.Printf(">> error synchronizing the dependencies: %v\n", err)
 		os.Exit(1)
 	}
-	err = runGoCommand(cmdDir, "vet", "./...")
+	err = tools.GoVet(cmdDir)
 	if err != nil {
 		fmt.Printf(">> error checking generated code: %v\n", err)
 		os.Exit(1)
@@ -338,12 +338,6 @@ func getModulesOrExamplesAsString(t bool) (string, error) {
 	return strings.Join(names, ", "), nil
 }
 
-func runGoCommand(cmdDir string, args ...string) error {
-	cmd := exec.Command("go", args...)
-	cmd.Dir = cmdDir
-	return cmd.Run()
-}
-
 func getRootDir() (string, error) {
 	current, err := os.Getwd()
 	if err != nil {