commit bf472d2030dca36c085c870538ba5d22d8db3fc5
author Zvonimir Pavlinovic <zpavlinovic@google.com> Thu Nov 21 19:28:43 2024 +0000
committer Zvonimir Pavlinovic <zpavlinovic@google.com> Fri Nov 22 18:51:56 2024 +0000
tree c0801527837cf07317038e15f959b2168f39b519
parent 072d4ef972913b7136211efe702a1e8bac3e7c6c

cmd/govulncheck: mask dirty dependency versions

Go tip has a new change that creates a valid dirty Go version
for dependencies that were before always (devel). We mask such versions
to devel for the tests to pass. We will remove this mask after the new
change to Go versioning is the only one supported on builders.

Change-Id: I0b8bc6238db47fbf808401047dfb6d5676d2f6c4
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/630735
Reviewed-by: Ian Cottrell <iancottrell@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

cmd/govulncheck/testdata/common/config.json

diff --git a/cmd/govulncheck/testdata/common/config.json b/cmd/govulncheck/testdata/common/config.json
index 1a0fae4..f8cc97f 100644
--- a/cmd/govulncheck/testdata/common/config.json
+++ b/cmd/govulncheck/testdata/common/config.json
@@ -29,11 +29,11 @@
       "replace": "modified 01 Jan 21 00:00 UTC)"
     },
     {
-      "pattern": "Go: (go1.[\\.\\d]*|devel).*",
+      "pattern": "Go: (go1.[\\.\\d]*|devel(.*)).*",
       "replace": "Go: go1.18"
     },
     {
-      "pattern": "\"go_version\": \"go(.*)\"",
+      "pattern": "\"go_version\": \"(go(.*)|devel(.*))\"",
       "replace": "\"go_version\": \"go1.18\""
     },
     {
@@ -43,6 +43,10 @@
     {
       "pattern": "path\": \"stdlib\",\n *\"version\": \"(.*)\"",
       "replace": "path\": \"stdlib\",\n        \"version\": \"v1.18.0\""
+    },
+    {
+      "pattern": "\"version\": \"(.*)dirty\"",
+      "replace": "\"version\": \"(devel)\""
     }
   ]
 }