Support Bzlmod for bazel-gazelle itself (bazel-contrib#1509)

spags-lacework · Apr 19, 2023 · a23e4f9 · a23e4f9
1 parent 36b2084
commit a23e4f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@io_bazel_rules_go//go:def.bzl", "nogo")
 load("//:def.bzl", "gazelle", "gazelle_binary")
+load("//internal:common.bzl", "IS_BZLMOD_ENABLED")
 
 # gazelle:prefix github.com/bazelbuild/bazel-gazelle
 # gazelle:exclude vendor
@@ -31,7 +32,7 @@ gazelle_binary(
         "//language/proto",
         "//language/go",
         "//internal/language/test_filegroup",
-        "@bazel_skylib//gazelle/bzl",
+        "@bazel_skylib_gazelle_plugin//bzl" if IS_BZLMOD_ENABLED else "@bazel_skylib//gazelle/bzl",
     ],
 )
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "rules_proto", version = "4.0.0")
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
 
 # Known to exist since it is instantiated by rules_go itself.
-use_repo(go_sdk, "go_default_sdk")
+use_repo(go_sdk, go_sdk = "go_default_sdk")
 
 non_module_deps = use_extension("//internal/bzlmod:non_module_deps.bzl", "non_module_deps")
 use_repo(
@@ -43,3 +43,6 @@ use_repo(
     # Read by go_repository rules.
     "bazel_gazelle_go_repository_config",
 )
+
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.5.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
diff --git a/internal/bzlmod/non_module_deps.bzl b/internal/bzlmod/non_module_deps.bzl
@@ -13,7 +13,7 @@ def _non_module_deps_impl(_):
     go_repository_cache(
         name = "bazel_gazelle_go_repository_cache",
         # Always provided by rules_go.
-        go_sdk_name = "go_default_sdk",
+        go_sdk_name = "go_sdk",
         go_env = {},
     )
     go_repository_tools(