Merge pull request github#17145 from github/redsun82/go

Go/Bazel: fix gazelle invocation to use bundled bazel go

Author: redsun82

MODULE.bazel

@@ -14,7 +14,7 @@ local_path_override(
 # see https://registry.bazel.build/ for a list of available packages
 
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_go", version = "0.48.0")
+bazel_dep(name = "rules_go", version = "0.49.0")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
 bazel_dep(name = "rules_python", version = "0.32.2")
@@ -23,7 +23,7 @@ bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "10.0.0")
 bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
-bazel_dep(name = "gazelle", version = "0.37.0")
+bazel_dep(name = "gazelle", version = "0.38.0")
 bazel_dep(name = "rules_dotnet", version = "0.15.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
 bazel_dep(name = "rules_rust", version = "0.46.0")

go/BUILD.bazel

@@ -1,11 +1,9 @@
-load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+load("@gazelle//:def.bzl", "gazelle")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
 
-native_binary(
+gazelle(
     name = "gazelle",
-    src = "@gazelle//cmd/gazelle",
-    out = "gazelle.exe",
     args = ["go/extractor"],
 )
 

go/extractor/BUILD.bazel

@@ -21,8 +21,8 @@ go_library(
         "//go/extractor/toolchain",
         "//go/extractor/trap",
         "//go/extractor/util",
-        "@org_golang_x_mod//modfile:go_default_library",
-        "@org_golang_x_tools//go/packages:go_default_library",
+        "@org_golang_x_mod//modfile",
+        "@org_golang_x_tools//go/packages",
     ],
 )
 

go/extractor/dbscheme/BUILD.bazel

@@ -24,7 +24,7 @@ def options():
 opts = options()
 
 try:
-    workspace_dir = pathlib.Path(os.environ.pop('BUILD_WORKSPACE_DIRECTORY'))
+    workspace_dir = pathlib.Path(os.environ['BUILD_WORKSPACE_DIRECTORY'])
 except KeyError:
     print("this should be run with bazel run", file=sys.stderr)
     sys.exit(1)