From 8cfda2236e11b98a3c43f91428e53d58173ee3ad Mon Sep 17 00:00:00 2001 From: Jack Zezula Date: Tue, 7 May 2024 15:26:26 +1000 Subject: [PATCH] Allow targets to specify plugins --- internal/compile.bzl | 7 ++++++- rust/BUILD.bazel | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/compile.bzl b/internal/compile.bzl index 401a16671..872c05ffa 100644 --- a/internal/compile.bzl +++ b/internal/compile.bzl @@ -13,6 +13,11 @@ load("//internal:providers.bzl", "ProtoCompileInfo", "ProtoPluginInfo") load("//internal:protoc.bzl", "build_protoc_args") proto_compile_attrs = { + "plugins": attr.label_list( + mandatory = False, + providers = [ProtoPluginInfo], + doc = "List of protoc plugins to apply", + ), "protos": attr.label_list( mandatory = True, providers = [ProtoInfo], @@ -84,7 +89,7 @@ def proto_compile(ctx, options, extra_protoc_args, extra_protoc_files): # Load attrs proto_infos = [dep[ProtoInfo] for dep in ctx.attr.protos] - plugins = [plugin[ProtoPluginInfo] for plugin in ctx.attr._plugins] + plugins = [plugin[ProtoPluginInfo] for plugin in ctx.attr._plugins] + [plugin[ProtoPluginInfo] for plugin in ctx.attr.plugins] verbose = ctx.attr.verbose # Load toolchain and tools diff --git a/rust/BUILD.bazel b/rust/BUILD.bazel index a7489d060..e698b15d1 100644 --- a/rust/BUILD.bazel +++ b/rust/BUILD.bazel @@ -12,7 +12,8 @@ proto_plugin( ], output_directory = True, separate_options_flag = True, - tool = "@rules_proto_grpc//rust/3rdparty/crates:protoc-gen-prost-0.2.1__protoc-gen-prost", + # tool = "@rules_proto_grpc//rust/3rdparty/crates:protoc-gen-prost-0.2.1__protoc-gen-prost", + tool = "@rules_proto_grpc//rust/3rdparty/crates:protoc-gen-prost__protoc-gen-prost", visibility = ["//visibility:public"], )