Add buildifier and fix issues

pcj · pcj · commit 1ed9772e1f97 · 2025-09-12T22:41:17.000-06:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -11,6 +11,7 @@ module(
 # -------------------------------------------------------------------
 
 bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "rules_scala", version = "7.0.0", repo_name = "io_bazel_rules_scala")
 bazel_dep(name = "rules_python", version = "1.5.3")
 bazel_dep(name = "rules_proto", version = "7.1.0")
@@ -174,6 +175,7 @@ go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
 use_repo(
     go_deps,
+    "bazel_gazelle_go_repository_config",  # keep
     "com_github_bazelbuild_buildtools",
     "com_github_bmatcuk_doublestar",
     "com_github_emicklei_proto",
@@ -183,10 +185,9 @@ use_repo(
     "com_github_stretchr_testify",
     "in_gopkg_yaml_v3",
     "net_starlark_go",
-    "org_golang_google_protobuf",
     "org_golang_google_grpc",
     "org_golang_google_grpc_cmd_protoc_gen_go_grpc",
-    "bazel_gazelle_go_repository_config",  # keep
+    "org_golang_google_protobuf",
 )
 
 # -------------------------------------------------------------------
diff --git a/example/golden/testdata/starlark_java/defs.bzl b/example/golden/testdata/starlark_java/defs.bzl
@@ -1,2 +1,3 @@
+# buildifier: disable=module-docstring
 def java_wrapper(**_kwargs):
     pass
diff --git a/example/routeguide/cc/BUILD.bazel b/example/routeguide/cc/BUILD.bazel
@@ -1,3 +1,6 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 cc_library(
     name = "helper",
     srcs = ["helper.cc"],
diff --git a/plugin/akka/akka-grpc/BUILD.bazel b/plugin/akka/akka-grpc/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@build_stack_rules_proto//rules:proto_plugin.bzl", "proto_plugin")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 
 proto_plugin(
     name = "protoc-gen-akka-grpc",
diff --git a/plugin/scalapb/scalapb/BUILD.bazel b/plugin/scalapb/scalapb/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@build_stack_rules_proto//rules:proto_plugin.bzl", "proto_plugin")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 
 proto_plugin(
     name = "protoc-gen-scala",
diff --git a/plugin/scalapb/zio-grpc/BUILD.bazel b/plugin/scalapb/zio-grpc/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@build_stack_rules_proto//rules:proto_plugin.bzl", "proto_plugin")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 
 proto_plugin(
     name = "protoc-gen-zio-grpc",
diff --git a/proto_repositories.bzl b/proto_repositories.bzl
diff --git a/rules/go/proto_go_modules.bzl b/rules/go/proto_go_modules.bzl
@@ -1,6 +1,8 @@
 "proto_go_modules.bzl provides the 'proto_go_modules' rule"
 
 load("@io_bazel_rules_go//go:def.bzl", "GoArchive")
+
+# buildifier: disable=bzl-visibility
 load("@io_bazel_rules_go//go/private:common.bzl", "GO_TOOLCHAIN")
 
 ProtoGoModulesInfo = provider(
diff --git a/rules/golden_filegroup.bzl b/rules/golden_filegroup.bzl
@@ -10,12 +10,12 @@ For any golden_filegroup target `//:a` that srcs `a.txt`, `//:a.update` copies
 `a.txt` and `a.txt.golden'` are identical.
 """
 
-load("@build_stack_rules_proto//rules:providers.bzl", "ProtoCompileInfo")
 load(
     "@build_stack_rules_proto//rules:proto_compile_gencopy.bzl",
     "proto_compile_gencopy_run",
     "proto_compile_gencopy_test",
 )
+load("@build_stack_rules_proto//rules:providers.bzl", "ProtoCompileInfo")
 
 def _files_impl(ctx):
     dep = ctx.attr.dep[DefaultInfo]
diff --git a/rules/java/grpc_java_library.bzl b/rules/java/grpc_java_library.bzl
@@ -1,4 +1,6 @@
 "grpc_java_library.bzl provides a java_library for grpc files."
 
+load("@rules_java//java:java_library.bzl", "java_library")
+
 def grpc_java_library(**kwargs):
-    native.java_library(**kwargs)
+    java_library(**kwargs)
diff --git a/rules/java/proto_java_library.bzl b/rules/java/proto_java_library.bzl
@@ -1,4 +1,6 @@
 "proto_java_library.bzl provides a java_library for proto files."
 
+load("@rules_java//java:java_library.bzl", "java_library")
+
 def proto_java_library(**kwargs):
-    native.java_library(**kwargs)
+    java_library(**kwargs)
diff --git a/rules/proto/proto_repository.bzl b/rules/proto/proto_repository.bzl
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch", "read_user_netrc", "use_netrc")
-load("@bazel_gazelle//internal:go_repository_cache.bzl", "read_cache_env")
 load("@bazel_gazelle//internal:common.bzl", "env_execute", "executable_extension", "watch")
+load("@bazel_gazelle//internal:go_repository_cache.bzl", "read_cache_env")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch", "read_user_netrc", "use_netrc")
 
 # copied from
 # https://github.com/bazelbuild/bazel/blob/d273cb62f43ef8169415cf60fc96e503ea2ad823/tools/build_defs/repo/http.bzl#L76
@@ -53,6 +53,9 @@ Authorization: Bearer RANDOM-TOKEN
 </pre>
 """
 
+# developer debugging setting
+DEBUG = False
+
 # We can't disable timeouts on Bazel, but we can set them to large values.
 _GO_REPOSITORY_TIMEOUT = 86400
 
@@ -242,11 +245,14 @@ def _proto_repository_impl(ctx):
         fail("%s: %s" % (ctx.name, result.stderr))
 
     _delete_files(ctx, ctx.attr.deleted_files)
-    # _find(ctx)
+    if DEBUG:
+        _find(ctx)
 
     # Repositories are fetched. Determine if build file generation is needed.
     build_file_names = ctx.attr.build_file_name.split(",")
     existing_build_file = ""
+    build_file_name = build_file_names[0]
+
     for name in build_file_names:
         path = ctx.path(name)
         if path.exists and not env_execute(ctx, ["test", "-f", path]).return_code:
@@ -389,6 +395,8 @@ def _find(ctx):
     )
     if result.return_code:
         fail("%s: %s" % (ctx.name, result.stderr))
+
+    # buildifier: disable=print
     print("result:", result.stdout)
 
 def _delete_files(ctx, files_to_delete):
diff --git a/rules/proto_gazelle.bzl b/rules/proto_gazelle.bzl
@@ -19,6 +19,7 @@ load(
     "@bazel_skylib//lib:shell.bzl",
     "shell",
 )
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 DEFAULT_LANGUAGES = [
     "@bazel_gazelle//language/proto:go_default_library",
@@ -176,7 +177,7 @@ def proto_gazelle(name, **kwargs):
         tags = tags,
         **kwargs
     )
-    native.sh_binary(
+    sh_binary(
         name = name,
         srcs = [runner_name],
         tags = tags,
diff --git a/rules/proto_plugin.bzl b/rules/proto_plugin.bzl
@@ -3,8 +3,8 @@
 A "proto_plugin" rule wraps metadata about a proto compiler plugin.
 """
 
-load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load("@build_stack_rules_proto//rules:providers.bzl", "ProtoPluginInfo")
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 
 def _proto_plugin_impl(ctx):
     return [
diff --git a/third_party/zlib.BUILD b/third_party/zlib.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # BSD/MIT-like license (for zlib)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+# buildifier: disable=module-docstring`
`1`	`2`	`def java_wrapper(**_kwargs):`
`2`	`3`	`pass`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@build_stack_rules_proto//rules:proto_plugin.bzl", "proto_plugin")`
	`2`	`+load("@rules_java//java:java_binary.bzl", "java_binary")`
`2`	`3`
`3`	`4`	`proto_plugin(`
`4`	`5`	`name = "protoc-gen-akka-grpc",`