Bazel rules: Adjust accessing ProtoInfo of dependencies

To be compatible with Bazel 0.29+. See also: bazelbuild/bazel#7152 Change-Id: Idd53f148aadc44c727966e8910f2776704a018a6 GitOrigin-RevId: 6922a516dd7c4a9c2cc8a981f2e4b9f74488ed78
TulipSolutions · Sep 11, 2019 · 0543d08 · 0543d08
1 parent 936c3ff
commit 0543d08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/bazel/rules_proto_py/def.bzl b/bazel/rules_proto_py/def.bzl
@@ -21,8 +21,8 @@ def _protoc_output_path(proto_src, suffix):
     return _proto_path(proto_src).replace("-", "_").replace(".proto", suffix)
 
 def _py_proto_library_gen_impl(ctx):
-    srcs = [f for dep in ctx.attr.deps for f in dep.proto.transitive_sources.to_list()]
-    includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports.to_list()]
+    srcs = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].transitive_sources.to_list()]
+    includes = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].transitive_imports.to_list()]
 
     proto_include_args = ["--proto_path={0}={1}".format(_proto_path(include), include.path) for include in includes]
     options = ",".join([])  # Empty, for now.
@@ -49,6 +49,7 @@ _py_proto_library_gen = rule(
     attrs = {
         "deps": attr.label_list(
             mandatory = True,
+            providers = [ProtoInfo],
         ),
         "_protoc": attr.label(
             default = Label("@com_google_protobuf//:protoc"),
@@ -79,8 +80,8 @@ def py_proto_library(name, deps, **kwargs):
     )
 
 def _py_grpc_library_gen_impl(ctx):
-    srcs = [f for dep in ctx.attr.deps for f in dep.proto.transitive_sources.to_list()]
-    includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports.to_list()]
+    srcs = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].transitive_sources.to_list()]
+    includes = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].transitive_imports.to_list()]
 
     proto_include_args = ["--proto_path={0}={1}".format(_proto_path(include), include.path) for include in includes]
     options = ",".join([])  # Empty, for now.
@@ -134,6 +135,7 @@ _py_grpc_library_gen = rule(
     attrs = {
         "deps": attr.label_list(
             mandatory = True,
+            providers = [ProtoInfo],
         ),
         "includes": attr.label_list(),
         "_protoc": attr.label(

diff --git a/bazel/rules_protodoc/def.bzl b/bazel/rules_protodoc/def.bzl
@@ -18,8 +18,8 @@ def _protoc_output_path(proto_src):
     return _proto_path(proto_src).replace("-", "_").replace(".proto", "")
 
 def _rst_proto_gen_impl(ctx):
-    srcs = [f for dep in ctx.attr.deps for f in dep.proto.direct_sources]
-    includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports.to_list()]
+    srcs = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].direct_sources]
+    includes = [f for dep in ctx.attr.deps for f in dep[ProtoInfo].transitive_imports.to_list()]
 
     proto_include_args = ["--proto_path={0}={1}".format(_proto_path(include), include.path) for include in includes]
     options = ",".join([])  # Empty, for now.
@@ -49,6 +49,7 @@ _rst_proto_gen = rule(
     attrs = {
         "deps": attr.label_list(
             mandatory = True,
+            providers = [ProtoInfo],
         ),
         "_protoc": attr.label(
             default = Label("@com_google_protobuf//:protoc"),