Move the descriptorset output to the ProtoSourcesProvider and expose it to skylark.

This does mean that the type name 'ProtoSourcesProvider' is a little inaccurate, since descriptorSet() is an output.  Alternatively we could expose the DescriptorSetProvider to skylark.


RELNOTES: expose proto_library descriptor set to skylark via <dep>.proto.descriptor_set

--
PiperOrigin-RevId: 142680666
MOS_MIGRATED_REVID=142680666

1 files changed, 33 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
index d0a1211975..504e07c99b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
@@ -40,6 +40,7 @@ public class BazelProtoLibraryTest extends BuildViewTestCase {
     Artifact file =
         ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin");
     assertThat(file.getRootRelativePathString()).isEqualTo("x/foo-descriptor-set.proto.bin");
+    assertThat(target.getProvider(ProtoSourcesProvider.class).descriptorSet()).isEqualTo(file);
 
     assertThat(getGeneratingSpawnAction(file).getRemainingArguments())
         .containsAllOf(
@@ -73,6 +74,38 @@ public class BazelProtoLibraryTest extends BuildViewTestCase {
     ConfiguredTarget target = scratchConfiguredTarget("x", "foo", "proto_library(name='foo')");
     assertThat(ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin"))
         .isNull();
+
+    assertThat(target.getProvider(ProtoSourcesProvider.class).descriptorSet()).isNull();
+  }
+
+  @Test
+  public void testDescriptorSetOutput_noSrcs_transitive() throws Exception {
+    ConfiguredTarget target =
+        scratchConfiguredTarget(
+            "x",
+            "foo",
+            "proto_library(name='foo', deps = [':dep1'])",
+            "proto_library(name='dep1', deps = [':dep2'])",
+            "proto_library(name='dep2')");
+    assertThat(ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin"))
+        .isNull();
+
+    assertThat(target.getProvider(ProtoSourcesProvider.class).descriptorSet()).isNull();
+  }
+
+  @Test
+  public void testDescriptorSetOutput_srcs_transitive() throws Exception {
+    ConfiguredTarget target =
+        scratchConfiguredTarget(
+            "x",
+            "foo",
+            "proto_library(name='foo', deps = [':dep1'])",
+            "proto_library(name='dep1', deps = [':dep2'])",
+            "proto_library(name='dep2', srcs=['foo.proto'])");
+    Artifact file =
+        ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), ".proto.bin");
+    assertThat(file.getRootRelativePathString()).isEqualTo("x/foo-descriptor-set.proto.bin");
+    assertThat(target.getProvider(ProtoSourcesProvider.class).descriptorSet()).isEqualTo(file);
   }
 
   @Test