Merge pull request #14439 from github/mbg/go/workspace-experiments

Go: Move `go.mod` into `extractor` subdirectory

.github/dependabot.yml

@@ -19,11 +19,8 @@ updates:
         update-types: ['version-update:semver-patch', 'version-update:semver-minor']
 
   - package-ecosystem: "gomod"
-    directory: "go"
+    directory: "go/extractor"
     schedule:
       interval: "daily"
-    allow:
-      - dependency-name: "golang.org/x/mod"
-      - dependency-name: "golang.org/x/tools"
     reviewers:
       - "github/codeql-go"

go/Makefile

@@ -51,7 +51,7 @@ tools: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))) tools/tokenizer.j
 
 .PHONY: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES)))
 $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))):
-	go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 tools-codeql: tools-$(CODEQL_PLATFORM)
 
@@ -61,19 +61,19 @@ tools-linux64: $(addprefix tools/linux64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/linux64/,$(BINARIES))
 $(addprefix tools/linux64/,$(BINARIES)):
-	GOOS=linux GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=linux GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-osx64: $(addprefix tools/osx64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/osx64/,$(BINARIES))
 $(addprefix tools/osx64/,$(BINARIES)):
-	GOOS=darwin GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=darwin GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-win64: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 
 .PHONY: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))):
-	env GOOS=windows GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	env GOOS=windows GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 .PHONY: extractor-common extractor extractor-full
 extractor-common: codeql-extractor.yml LICENSE ql/lib/go.dbscheme \

go/extractor/go.mod

@@ -1,4 +1,4 @@
-module github.com/github/codeql-go
+module github.com/github/codeql-go/extractor
 
 go 1.21
 

go/ql/test/go.mod

@@ -0,0 +1,4 @@
+module github.com/github/codeql-go/ql/test
+
+go 1.21
+

go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected

@@ -1 +1,2 @@
+| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | util.go:0:0:0:0 | util.go |  |

go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go

@@ -1,10 +1,10 @@
 // Code generated by depstubber. DO NOT EDIT.
-// This is a simple stub for github.com/github/codeql-go/extractor/util, strictly for use in testing.
+// This is a simple stub for github.com/github/codeql-go/util, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/github/codeql-go/extractor/util (exports: ; functions: Getenv)
+// Source: github.com/github/codeql-go/util (exports: ; functions: Getenv)
 
-// Package util is a stub of github.com/github/codeql-go/extractor/util, generated by depstubber.
+// Package util is a stub of github.com/github/codeql-go/util, generated by depstubber.
 package util
 
 func Getenv(_ string, _ ...string) string {