Fix out of sync go work and update check (DataDog#31723)

kkpan11 · Dec 3, 2024 · dbbc50e · dbbc50e
1 parent 45a9bcf
commit dbbc50e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/tasks/go.py b/tasks/go.py
@@ -410,6 +410,11 @@ def check_mod_tidy(ctx, test_folder="testmodule"):
     check_valid_mods(ctx)
     with generate_dummy_package(ctx, test_folder) as dummy_folder:
         errors_found = []
+        ctx.run("go work sync")
+        res = ctx.run("git diff --exit-code **/go.mod **/go.sum", warn=True)
+        if res.exited is None or res.exited > 0:
+            errors_found.append("modules dependencies are out of sync, please run go work sync")
+
         for mod in get_default_modules().values():
             with ctx.cd(mod.full_path()):
                 ctx.run("go mod tidy")

diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod
@@ -7,9 +7,9 @@ module github.com/DataDog/datadog-agent/tools/retry_file_dump
 
 go 1.22.0
 
-require github.com/golang/protobuf v1.4.3
+require github.com/golang/protobuf v1.5.4
 
 require (
 	github.com/google/go-cmp v0.6.0 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 )
diff --git a/tools/retry_file_dump/go.sum b/tools/retry_file_dump/go.sum