diff --git a/BUILD.bazel b/BUILD.bazel index acd210e18..4c8760cc4 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,4 @@ -load("@bazel_gazelle//:def.bzl", "gazelle_binary") +load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") load("@build_stack_rules_proto//rules:proto_gazelle.bzl", "proto_gazelle") load("@npm_ts_proto//:defs.bzl", "npm_link_all_packages") @@ -13,6 +13,13 @@ exports_files([ # gazelle:prefix github.com/stackb/rules_proto # gazelle:exclude vendor # gazelle:exclude node_modules +# gazelle:go_generate_proto false + +# ProTip: `bazel run //:gazelle` for go-only deps +gazelle( + name = "gazelle", + external = "static", +) gazelle_binary( name = "gazelle-protobuf", @@ -27,8 +34,9 @@ gazelle_binary( visibility = ["//visibility:public"], ) +# ProTip: `bazel run //:proto_gazelle` for this extension proto_gazelle( - name = "gazelle", + name = "proto_gazelle", cfgs = ["//:rules_proto_config.yaml"], external = "static", gazelle = "//:gazelle-protobuf", diff --git a/Makefile b/Makefile index 4ddeb31db..ed43e8e67 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ tidy: bazel run @go_sdk//:bin/go -- mod tidy bazel run @go_sdk//:bin/go -- mod vendor find vendor -name 'BUILD.bazel' | xargs rm - bazel run //:gazelle + bazel run //:proto_gazelle bazel mod tidy .PHONY: build diff --git a/cmd/gazelle/BUILD.bazel b/cmd/gazelle/BUILD.bazel index 038ba6469..9571e018e 100644 --- a/cmd/gazelle/BUILD.bazel +++ b/cmd/gazelle/BUILD.bazel @@ -29,19 +29,19 @@ go_library( "//cmd/gazelle/internal/wspace", "//language/proto_go_modules", "//language/protobuf", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//flag:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//language:go_default_library", - "@bazel_gazelle//language/go:go_default_library", - "@bazel_gazelle//language/proto:go_default_library", - "@bazel_gazelle//merger:go_default_library", - "@bazel_gazelle//repo:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@bazel_gazelle//walk:go_default_library", - "@com_github_bazelbuild_buildtools//build:go_default_library", - "@com_github_pmezard_go_difflib//difflib:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//flag", + "@bazel_gazelle//label", + "@bazel_gazelle//language", + "@bazel_gazelle//language/go", + "@bazel_gazelle//language/proto", + "@bazel_gazelle//merger", + "@bazel_gazelle//repo", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@bazel_gazelle//walk", + "@com_github_bazelbuild_buildtools//build", + "@com_github_pmezard_go_difflib//difflib", ], ) @@ -61,10 +61,10 @@ go_test( x_defs = {"goRootFile": "$(rlocationpath @go_sdk//:ROOT)"}, deps = [ "//cmd/gazelle/internal/wspace", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//testtools:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@io_bazel_rules_go//go/runfiles:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//testtools", + "@com_github_google_go_cmp//cmp", + "@io_bazel_rules_go//go/runfiles", ], ) diff --git a/cmd/gencopy/BUILD.bazel b/cmd/gencopy/BUILD.bazel index 8bb1fc94e..6b1117ae3 100644 --- a/cmd/gencopy/BUILD.bazel +++ b/cmd/gencopy/BUILD.bazel @@ -7,7 +7,7 @@ go_library( srcs = ["gencopy.go"], importpath = "github.com/stackb/rules_proto/cmd/gencopy", visibility = ["//visibility:private"], - deps = ["@com_github_google_go_cmp//cmp:go_default_library"], + deps = ["@com_github_google_go_cmp//cmp"], ) go_binary( @@ -21,8 +21,8 @@ go_test( srcs = ["gencopy_test.go"], embed = [":gencopy_lib"], deps = [ - "@bazel_gazelle//testtools:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "@bazel_gazelle//testtools", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/language/example/BUILD.bazel b/language/example/BUILD.bazel index c3bedfe89..08fd8f921 100644 --- a/language/example/BUILD.bazel +++ b/language/example/BUILD.bazel @@ -7,6 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/language/noop", - "@bazel_gazelle//language:go_default_library", + "@bazel_gazelle//language", ], ) diff --git a/language/proto_go_modules/BUILD.bazel b/language/proto_go_modules/BUILD.bazel index 2d7af177c..59ff5490e 100644 --- a/language/proto_go_modules/BUILD.bazel +++ b/language/proto_go_modules/BUILD.bazel @@ -9,12 +9,12 @@ go_library( importpath = "github.com/stackb/rules_proto/language/proto_go_modules", visibility = ["//visibility:public"], deps = [ - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//language:go_default_library", - "@bazel_gazelle//repo:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//language", + "@bazel_gazelle//repo", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/language/protobuf/BUILD.bazel b/language/protobuf/BUILD.bazel index ddb19069c..49e7dc759 100644 --- a/language/protobuf/BUILD.bazel +++ b/language/protobuf/BUILD.bazel @@ -28,7 +28,7 @@ go_library( "//pkg/rule/rules_nodejs", "//pkg/rule/rules_python", "//pkg/rule/rules_scala", - "@bazel_gazelle//language:go_default_library", + "@bazel_gazelle//language", ], ) diff --git a/pkg/goldentest/BUILD.bazel b/pkg/goldentest/BUILD.bazel index fa0483ef7..780afe66f 100644 --- a/pkg/goldentest/BUILD.bazel +++ b/pkg/goldentest/BUILD.bazel @@ -7,7 +7,7 @@ go_library( importpath = "github.com/stackb/rules_proto/pkg/goldentest", visibility = ["//visibility:public"], deps = [ - "@bazel_gazelle//testtools:go_default_library", - "@io_bazel_rules_go//go/tools/bazel:go_default_library", + "@bazel_gazelle//testtools", + "@io_bazel_rules_go//go/tools/bazel", ], ) diff --git a/pkg/language/noop/BUILD.bazel b/pkg/language/noop/BUILD.bazel index e2857ca00..4e96862e2 100644 --- a/pkg/language/noop/BUILD.bazel +++ b/pkg/language/noop/BUILD.bazel @@ -6,11 +6,11 @@ go_library( importpath = "github.com/stackb/rules_proto/pkg/language/noop", visibility = ["//visibility:public"], deps = [ - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//language:go_default_library", - "@bazel_gazelle//repo:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//language", + "@bazel_gazelle//repo", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/language/protobuf/BUILD.bazel b/pkg/language/protobuf/BUILD.bazel index 2e473af9f..ff2a706f7 100644 --- a/pkg/language/protobuf/BUILD.bazel +++ b/pkg/language/protobuf/BUILD.bazel @@ -16,12 +16,12 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//language:go_default_library", - "@bazel_gazelle//repo:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//language", + "@bazel_gazelle//repo", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) @@ -34,13 +34,13 @@ go_test( embed = [":protobuf"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//language:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@bazel_gazelle//testtools:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//language", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@bazel_gazelle//testtools", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/pkg/plugin/akka/akka_grpc/BUILD.bazel b/pkg/plugin/akka/akka_grpc/BUILD.bazel index b15cf24c1..2c350e0e4 100644 --- a/pkg/plugin/akka/akka_grpc/BUILD.bazel +++ b/pkg/plugin/akka/akka_grpc/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/bufbuild/BUILD.bazel b/pkg/plugin/bufbuild/BUILD.bazel index aaa8362e8..c71a8f430 100644 --- a/pkg/plugin/bufbuild/BUILD.bazel +++ b/pkg/plugin/bufbuild/BUILD.bazel @@ -10,7 +10,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/builtin/BUILD.bazel b/pkg/plugin/builtin/BUILD.bazel index 3d85bf46d..f5aa1c015 100644 --- a/pkg/plugin/builtin/BUILD.bazel +++ b/pkg/plugin/builtin/BUILD.bazel @@ -20,7 +20,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/gogo/protobuf/BUILD.bazel b/pkg/plugin/gogo/protobuf/BUILD.bazel index f8fd046a3..14ab88582 100644 --- a/pkg/plugin/gogo/protobuf/BUILD.bazel +++ b/pkg/plugin/gogo/protobuf/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/golang/protobuf/BUILD.bazel b/pkg/plugin/golang/protobuf/BUILD.bazel index f33a738ff..3a9bfe73a 100644 --- a/pkg/plugin/golang/protobuf/BUILD.bazel +++ b/pkg/plugin/golang/protobuf/BUILD.bazel @@ -7,8 +7,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//label", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/plugin/grpc/grpc/BUILD.bazel b/pkg/plugin/grpc/grpc/BUILD.bazel index 38417a423..2b20e6697 100644 --- a/pkg/plugin/grpc/grpc/BUILD.bazel +++ b/pkg/plugin/grpc/grpc/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/grpc/grpcgo/BUILD.bazel b/pkg/plugin/grpc/grpcgo/BUILD.bazel index bb36e7236..d130b2c7e 100644 --- a/pkg/plugin/grpc/grpcgo/BUILD.bazel +++ b/pkg/plugin/grpc/grpcgo/BUILD.bazel @@ -8,8 +8,8 @@ go_library( deps = [ "//pkg/plugin/golang/protobuf", "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//label", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/plugin/grpc/grpcjava/BUILD.bazel b/pkg/plugin/grpc/grpcjava/BUILD.bazel index 718508e26..a380d745a 100644 --- a/pkg/plugin/grpc/grpcjava/BUILD.bazel +++ b/pkg/plugin/grpc/grpcjava/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/grpc/grpcnode/BUILD.bazel b/pkg/plugin/grpc/grpcnode/BUILD.bazel index d27e4b86d..c773a1575 100644 --- a/pkg/plugin/grpc/grpcnode/BUILD.bazel +++ b/pkg/plugin/grpc/grpcnode/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/grpc/grpcweb/BUILD.bazel b/pkg/plugin/grpc/grpcweb/BUILD.bazel index 32feb9ab1..23184ca80 100644 --- a/pkg/plugin/grpc/grpcweb/BUILD.bazel +++ b/pkg/plugin/grpc/grpcweb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/grpcecosystem/grpcgateway/BUILD.bazel b/pkg/plugin/grpcecosystem/grpcgateway/BUILD.bazel index 72fa9c4f9..31a2bfc89 100644 --- a/pkg/plugin/grpcecosystem/grpcgateway/BUILD.bazel +++ b/pkg/plugin/grpcecosystem/grpcgateway/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/scalapb/scalapb/BUILD.bazel b/pkg/plugin/scalapb/scalapb/BUILD.bazel index 978d62e07..1c0fa8395 100644 --- a/pkg/plugin/scalapb/scalapb/BUILD.bazel +++ b/pkg/plugin/scalapb/scalapb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/scalapb/zio_grpc/BUILD.bazel b/pkg/plugin/scalapb/zio_grpc/BUILD.bazel index 3b1c71b9d..55f5a9800 100644 --- a/pkg/plugin/scalapb/zio_grpc/BUILD.bazel +++ b/pkg/plugin/scalapb/zio_grpc/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/stackb/grpc_js/BUILD.bazel b/pkg/plugin/stackb/grpc_js/BUILD.bazel index 768c2732d..d268d8d3b 100644 --- a/pkg/plugin/stackb/grpc_js/BUILD.bazel +++ b/pkg/plugin/stackb/grpc_js/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugin/stephenh/ts-proto/BUILD.bazel b/pkg/plugin/stephenh/ts-proto/BUILD.bazel index 4230d79b7..fc484d9e1 100644 --- a/pkg/plugin/stephenh/ts-proto/BUILD.bazel +++ b/pkg/plugin/stephenh/ts-proto/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", + "@bazel_gazelle//label", ], ) diff --git a/pkg/plugintest/BUILD.bazel b/pkg/plugintest/BUILD.bazel index 691955475..cff7079fc 100644 --- a/pkg/plugintest/BUILD.bazel +++ b/pkg/plugintest/BUILD.bazel @@ -12,10 +12,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", + "@bazel_gazelle//label", + "@bazel_gazelle//rule", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", ], ) diff --git a/pkg/protoc/BUILD.bazel b/pkg/protoc/BUILD.bazel index c281da272..7847116c8 100644 --- a/pkg/protoc/BUILD.bazel +++ b/pkg/protoc/BUILD.bazel @@ -37,15 +37,15 @@ go_library( importpath = "github.com/stackb/rules_proto/pkg/protoc", visibility = ["//visibility:public"], deps = [ - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_bazelbuild_buildtools//build:go_default_library", - "@com_github_emicklei_proto//:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", - "@net_starlark_go//starlark:go_default_library", - "@net_starlark_go//starlarkstruct:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@com_github_bazelbuild_buildtools//build", + "@com_github_emicklei_proto//:proto", + "@in_gopkg_yaml_v3//:yaml_v3", + "@net_starlark_go//starlark", + "@net_starlark_go//starlarkstruct", ], ) @@ -71,16 +71,16 @@ go_test( ], embed = [":protoc"], deps = [ - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_emicklei_proto//:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", - "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", - "@com_github_stretchr_testify//assert:go_default_library", - "@net_starlark_go//starlark:go_default_library", - "@net_starlark_go//starlarkstruct:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@com_github_emicklei_proto//:proto", + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", + "@com_github_stretchr_testify//assert", + "@net_starlark_go//starlark", + "@net_starlark_go//starlarkstruct", ], ) diff --git a/pkg/rule/rules_cc/BUILD.bazel b/pkg/rule/rules_cc/BUILD.bazel index 2a76a6e65..f954304f4 100644 --- a/pkg/rule/rules_cc/BUILD.bazel +++ b/pkg/rule/rules_cc/BUILD.bazel @@ -11,10 +11,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/rule/rules_closure/BUILD.bazel b/pkg/rule/rules_closure/BUILD.bazel index aaff40ed5..b020a7c96 100644 --- a/pkg/rule/rules_closure/BUILD.bazel +++ b/pkg/rule/rules_closure/BUILD.bazel @@ -11,10 +11,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/rule/rules_go/BUILD.bazel b/pkg/rule/rules_go/BUILD.bazel index 9f2b3cf5e..efc627602 100644 --- a/pkg/rule/rules_go/BUILD.bazel +++ b/pkg/rule/rules_go/BUILD.bazel @@ -7,10 +7,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) @@ -20,7 +20,7 @@ go_test( embed = [":rules_go"], deps = [ "//pkg/protoc", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/rule/rules_java/BUILD.bazel b/pkg/rule/rules_java/BUILD.bazel index b05a8de00..8b43ae790 100644 --- a/pkg/rule/rules_java/BUILD.bazel +++ b/pkg/rule/rules_java/BUILD.bazel @@ -11,10 +11,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/rule/rules_java/proto_java_library.go b/pkg/rule/rules_java/proto_java_library.go index 309370692..9dae3b8b3 100644 --- a/pkg/rule/rules_java/proto_java_library.go +++ b/pkg/rule/rules_java/proto_java_library.go @@ -54,7 +54,12 @@ func (s *protoJavaLibrary) ProvideRule(cfg *protoc.LanguageRuleConfig, pc *proto Config: pc, Resolver: func(c *config.Config, ix *resolve.RuleIndex, r *rule.Rule, imports []string, from label.Label) { protoc.ResolveDepsAttr("deps", false)(c, ix, r, imports, from) - r.SetAttr("exports", r.Attr("deps")) + deps := r.Attr("deps") + if deps == nil { + r.DelAttr("exports") + } else { + r.SetAttr("exports", deps) + } }, } } diff --git a/pkg/rule/rules_nodejs/BUILD.bazel b/pkg/rule/rules_nodejs/BUILD.bazel index 55220febe..3a744906a 100644 --- a/pkg/rule/rules_nodejs/BUILD.bazel +++ b/pkg/rule/rules_nodejs/BUILD.bazel @@ -13,10 +13,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) diff --git a/pkg/rule/rules_python/BUILD.bazel b/pkg/rule/rules_python/BUILD.bazel index 136ebfa6c..e3712bc8f 100644 --- a/pkg/rule/rules_python/BUILD.bazel +++ b/pkg/rule/rules_python/BUILD.bazel @@ -11,10 +11,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", ], ) @@ -27,10 +27,10 @@ go_test( embed = [":rules_python"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/pkg/rule/rules_scala/BUILD.bazel b/pkg/rule/rules_scala/BUILD.bazel index 60e8caaca..cb993b9d7 100644 --- a/pkg/rule/rules_scala/BUILD.bazel +++ b/pkg/rule/rules_scala/BUILD.bazel @@ -12,12 +12,12 @@ go_library( "//pkg/plugin/akka/akka_grpc", "//pkg/plugin/scalapb/scalapb", "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_bmatcuk_doublestar//:go_default_library", - "@com_github_emicklei_proto//:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@com_github_bmatcuk_doublestar//:doublestar", + "@com_github_emicklei_proto//:proto", ], ) @@ -27,11 +27,11 @@ go_test( embed = [":rules_scala"], deps = [ "//pkg/protoc", - "@bazel_gazelle//config:go_default_library", - "@bazel_gazelle//label:go_default_library", - "@bazel_gazelle//resolve:go_default_library", - "@bazel_gazelle//rule:go_default_library", - "@com_github_google_go_cmp//cmp:go_default_library", + "@bazel_gazelle//config", + "@bazel_gazelle//label", + "@bazel_gazelle//resolve", + "@bazel_gazelle//rule", + "@com_github_google_go_cmp//cmp", ], ) diff --git a/rules/proto_gazelle.bzl b/rules/proto_gazelle.bzl index 6e24c00b6..f67de58bf 100644 --- a/rules/proto_gazelle.bzl +++ b/rules/proto_gazelle.bzl @@ -15,6 +15,14 @@ """proto_gazelle.bzl provides the proto_gazelle rule. """ +load( + "@bazel_gazelle_go_repository_config//:go_env.bzl", + "GO_ENV", +) +load( + "@bazel_gazelle_is_bazel_module//:defs.bzl", + "GAZELLE_IS_BAZEL_MODULE", +) load( "@bazel_skylib//lib:shell.bzl", "shell", @@ -67,7 +75,10 @@ def _gazelle_runner_impl(ctx): args.extend([ctx.expand_location(arg, ctx.attr.data) for arg in ctx.attr.extra_args]) - for key in ctx.attr.env: + combined_env = {} + combined_env.update(GO_ENV) + combined_env.update(ctx.attr.env) + for key in combined_env: if not _valid_env_variable_name(key): fail("Invalid environmental variable name: '%s'" % key) @@ -139,7 +150,7 @@ _gazelle_runner = rule( "cfgs": attr.label_list(allow_files = True), "env": attr.string_dict(), "_repo_config": attr.label( - default = None, + default = "@bazel_gazelle_go_repository_config//:WORKSPACE" if GAZELLE_IS_BAZEL_MODULE else None, allow_single_file = True, ), "_template": attr.label(