From a04f08f0268adcff4ed0a8b8093a0327152d2931 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 12 Jun 2024 15:10:28 +0100
Subject: [PATCH 1/4] Go: Remove `go.work` file

---
 go/extractor/go.work     | 3 ---
 go/extractor/go.work.sum | 5 -----
 2 files changed, 8 deletions(-)
 delete mode 100644 go/extractor/go.work
 delete mode 100644 go/extractor/go.work.sum

diff --git a/go/extractor/go.work b/go/extractor/go.work
deleted file mode 100644
index 96b89a39cb9..00000000000
--- a/go/extractor/go.work
+++ /dev/null
@@ -1,3 +0,0 @@
-go 1.22.0
-
-use .
diff --git a/go/extractor/go.work.sum b/go/extractor/go.work.sum
deleted file mode 100644
index e3856dfbfa5..00000000000
--- a/go/extractor/go.work.sum
+++ /dev/null
@@ -1,5 +0,0 @@
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=

From a90968d277f9650adc3bd1c638a7e0751f795c21 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 12 Jun 2024 15:19:14 +0100
Subject: [PATCH 2/4] Go: Replace `go work vendor` with `go mod vendor`

---
 go/gen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/gen.py b/go/gen.py
index 6f8d47d7096..d72e8965518 100644
--- a/go/gen.py
+++ b/go/gen.py
@@ -48,7 +48,7 @@ if opts.force:
 existing_build_files = set(go_extractor_dir.glob("*/**/BUILD.bazel"))
 
 print("updating vendor directory")
-subprocess.check_call([go, "-C", go_extractor_dir, "work", "vendor"])
+subprocess.check_call([go, "-C", go_extractor_dir, "mod", "vendor"])
 
 if opts.force:
     print("clearing generated BUILD files")

From 8629e00686b4caa1bf6bdf61632cf26aa77afcfc Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 12 Jun 2024 15:22:56 +0100
Subject: [PATCH 3/4] Go: Remove `workspace` from `vendor/modules.txt`

---
 go/extractor/vendor/modules.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/extractor/vendor/modules.txt b/go/extractor/vendor/modules.txt
index 37c4a68d828..5687615f62c 100644
--- a/go/extractor/vendor/modules.txt
+++ b/go/extractor/vendor/modules.txt
@@ -1,4 +1,3 @@
-## workspace
 # golang.org/x/mod v0.15.0
 ## explicit; go 1.18
 golang.org/x/mod/internal/lazyregexp

From e10e2899bd6e1d991aadfd771a7c2767f9365451 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Wed, 12 Jun 2024 15:24:33 +0100
Subject: [PATCH 4/4] Go: Update comment in `gen.py`

---
 go/gen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/gen.py b/go/gen.py
index d72e8965518..e04dea0b5e9 100644
--- a/go/gen.py
+++ b/go/gen.py
@@ -2,7 +2,7 @@
 Update generated files related to Go in the repo. Using --force will regenerate all files from scratch.
 
 In particular the script will:
-1. update the `vendor` dir with `go work vendor` (using a go toolchain provided by bazel)
+1. update the `vendor` dir with `go mod vendor` (using a go toolchain provided by bazel)
 2. update `BUILD.bazel` files using gazelle
 3. update `ql/lib/go.dbscheme` using a compiled `go-dbschemegen`
 """