py_proto_library: Fix for strip_import_prefix

tpudlik · tpudlik · commit 214bb7cb46e2 · 2023-11-13T14:03:40.000-08:00
Fixes the handling of transitive proto_library dependencies with
strip_import_prefix.
diff --git a/examples/py_proto_library/BUILD.bazel b/examples/py_proto_library/BUILD.bazel
@@ -8,3 +8,11 @@ py_test(
         "//example.com/proto:pricetag_proto_py_pb2",
     ],
 )
+
+py_test(
+    name = "message_test",
+    srcs = ["message_test.py"],
+    deps = [
+        "//example.com/another_proto:message_proto_py_pb2",
+    ],
+)
diff --git a/examples/py_proto_library/example.com/another_proto/BUILD.bazel b/examples/py_proto_library/example.com/another_proto/BUILD.bazel
@@ -0,0 +1,16 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:proto.bzl", "py_proto_library")
+
+py_proto_library(
+    name = "message_proto_py_pb2",
+    visibility = ["//visibility:public"],
+    deps = [":message_proto"],
+)
+
+proto_library(
+    name = "message_proto",
+    srcs = ["message.proto"],
+    # https://bazel.build/reference/be/protocol-buffer#proto_library.strip_import_prefix
+    strip_import_prefix = "/example.com",
+    deps = ["//example.com/proto:pricetag_proto"],
+)
diff --git a/examples/py_proto_library/example.com/another_proto/message.proto b/examples/py_proto_library/example.com/another_proto/message.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package rules_python;
+
+import "proto/pricetag.proto";
+
+message TestMessage {
+  uint32 index = 1;
+  PriceTag pricetag = 2;
+}
diff --git a/examples/py_proto_library/example.com/proto/BUILD.bazel b/examples/py_proto_library/example.com/proto/BUILD.bazel
@@ -12,4 +12,5 @@ proto_library(
     srcs = ["pricetag.proto"],
     # https://bazel.build/reference/be/protocol-buffer#proto_library.strip_import_prefix
     strip_import_prefix = "/example.com",
+    visibility = ["//visibility:public"],
 )
diff --git a/examples/py_proto_library/message_test.py b/examples/py_proto_library/message_test.py
@@ -0,0 +1,15 @@
+import sys
+import unittest
+
+from another_proto import message_pb2
+
+class TestCase(unittest.TestCase):
+    def test_message(self):
+        got = message_pb2.TestMessage(
+            index = 5,
+        )
+        self.assertIsNotNone(got)
+
+
+if __name__ == "__main__":
+  sys.exit(unittest.main())
diff --git a/python/private/proto/py_proto_library.bzl b/python/private/proto/py_proto_library.bzl
@@ -114,7 +114,7 @@ def _py_proto_aspect_impl(target, ctx):
                 # will put the repo root at the top of the PYTHONPATH, ahead of
                 # directories added through `imports` attributes.
                 [proto_root] if "_virtual_imports" in proto_root else [],
-                transitive = [dep[PyInfo].imports for dep in api_deps],
+                transitive = [dep[PyInfo].imports for dep in api_deps] + [dep.imports for dep in deps],
             ),
             runfiles_from_proto_deps = runfiles_from_proto_deps,
             transitive_sources = transitive_sources,

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ proto_library(`
`12`	`12`	`srcs = ["pricetag.proto"],`
`13`	`13`	`# https://bazel.build/reference/be/protocol-buffer#proto_library.strip_import_prefix`
`14`	`14`	`strip_import_prefix = "/example.com",`
	`15`	`+ visibility = ["//visibility:public"],`
`15`	`16`	`)`