Handle dependent protos when generating CelLiteDescriptor

PiperOrigin-RevId: 756500427

Author: l46kok

common/src/test/java/dev/cel/common/internal/BUILD.bazel

@@ -30,12 +30,12 @@ java_library(
         "//common/internal:proto_message_factory",
         "//common/internal:well_known_proto",
         "//common/src/test/resources:default_instance_message_test_protos_java_proto",
-        "//common/src/test/resources:multi_file_java_proto",
         "//common/src/test/resources:service_conflicting_name_java_proto",
-        "//common/src/test/resources:single_file_java_proto",
         "//common/testing",
         "//protobuf:cel_lite_descriptor",
-        "//testing:test_all_types_cel_java_proto3",
+        "//testing/protos:multi_file_java_proto",
+        "//testing/protos:single_file_java_proto",
+        "//testing/protos:test_all_types_cel_java_proto3",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@com_google_googleapis//google/type:type_java_proto",

common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

@@ -22,7 +22,7 @@
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
-import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
+import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
 import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
 import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
 import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
@@ -102,7 +102,7 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
   public void findDescriptor_success() {
     DefaultLiteDescriptorPool descriptorPool =
         DefaultLiteDescriptorPool.newInstance(
-            ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
+            ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));
 
     MessageLiteDescriptor liteDescriptor =
         descriptorPool.getDescriptorOrThrow("cel.expr.conformance.proto3.TestAllTypes");

common/src/test/java/dev/cel/common/values/BUILD.bazel

@@ -33,7 +33,7 @@ java_library(
         "//common/values:proto_message_lite_value_provider",
         "//common/values:proto_message_value",
         "//common/values:proto_message_value_provider",
-        "//testing:test_all_types_cel_java_proto3",
+        "//testing/protos:test_all_types_cel_java_proto3",
         "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
         "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@maven//:com_google_guava_guava",

common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

@@ -38,7 +38,7 @@
 import dev.cel.common.internal.WellKnownProto;
 import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
 import dev.cel.expr.conformance.proto3.TestAllTypes;
-import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
+import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
 import java.time.Instant;
 import java.util.LinkedHashMap;
 import org.junit.Test;
@@ -48,7 +48,7 @@
 public class ProtoLiteCelValueConverterTest {
   private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
       DefaultLiteDescriptorPool.newInstance(
-          ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
+          ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));
 
   private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
       ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

@@ -20,15 +20,15 @@
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import dev.cel.common.types.StructTypeReference;
 import dev.cel.expr.conformance.proto3.TestAllTypes;
-import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
+import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
 import java.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(TestParameterInjector.class)
 public class ProtoMessageLiteValueProviderTest {
   private static final ProtoMessageLiteValueProvider VALUE_PROVIDER =
-      ProtoMessageLiteValueProvider.newInstance(TestAllTypesProto3CelDescriptor.getDescriptor());
+      ProtoMessageLiteValueProvider.newInstance(TestAllTypesCelDescriptor.getDescriptor());
 
   @Test
   public void newValue_unknownType_returnsEmpty() {

common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

@@ -36,7 +36,7 @@
 import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
 import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
-import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
+import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
 import java.time.Duration;
 import java.time.Instant;
 import org.junit.Test;
@@ -46,7 +46,7 @@
 public class ProtoMessageLiteValueTest {
   private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
       DefaultLiteDescriptorPool.newInstance(
-          ImmutableSet.of(TestAllTypesProto3CelDescriptor.getDescriptor()));
+          ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));
 
   private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
       ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

common/src/test/resources/BUILD.bazel

@@ -18,26 +18,6 @@ filegroup(
     ],
 )
 
-proto_library(
-    name = "multi_file_proto",
-    srcs = ["multi_file.proto"],
-)
-
-java_proto_library(
-    name = "multi_file_java_proto",
-    deps = [":multi_file_proto"],
-)
-
-proto_library(
-    name = "single_file_proto",
-    srcs = ["single_file.proto"],
-)
-
-java_proto_library(
-    name = "single_file_java_proto",
-    deps = [":single_file_proto"],
-)
-
 proto_library(
     name = "default_instance_message_test_protos",
     srcs = [

java_lite_proto_cel_library.bzl

@@ -19,29 +19,35 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto
 
 def java_lite_proto_cel_library(
         name,
-        proto_src,
-        java_descriptor_class_name = None,
+        deps,
+        java_descriptor_class_suffix = None,
         debug = False):
     """Generates a CelLiteDescriptor
 
     Args:
        name: name of this target.
+       deps: The list of proto_library rules to generate Java code for.
        proto_src: Name of the proto_library target.
-       java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
-                                  By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
-                                  suffixed as the class name. Use this field to override this name.
+       java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
+                                                Default is "CelLiteDescriptor".
        debug: (optional) If true, prints additional information during codegen for debugging purposes.
     """
+    if not name:
+        fail("You must provide a name.")
+
+    if not deps or len(deps) < 1:
+        fail("You must provide at least one proto_library dependency.")
+
     java_proto_library_dep = name + "_java_lite_proto_dep"
     java_lite_proto_library(
         name = java_proto_library_dep,
-        deps = [proto_src],
+        deps = deps,
     )
 
     java_lite_proto_cel_library_impl(
         name = name,
-        proto_src = proto_src,
-        java_descriptor_class_name = java_descriptor_class_name,
+        deps = deps,
+        java_descriptor_class_suffix = java_descriptor_class_suffix,
         java_proto_library_dep = java_proto_library_dep,
         debug = debug,
     )

java_lite_proto_cel_library_impl.bzl

@@ -24,40 +24,40 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 
 def java_lite_proto_cel_library_impl(
         name,
-        proto_src,
+        deps,
         java_proto_library_dep,
-        java_descriptor_class_name = None,
+        java_descriptor_class_suffix = None,
         debug = False):
     """Generates a CelLiteDescriptor
 
     Args:
-       name: name of this target.
-       proto_src: Name of the proto_library target.
-       java_descriptor_class_name (optional): Java class name for the generated CEL lite descriptor.
-                                   By default, CEL will use the first encountered message name in proto_src with "CelLiteDescriptor"
-                                   suffixed as the class name. Use this field to override this name.
+       name: Name of this target.
+       deps: The list of proto_library rules to generate Java code for.
+       java_descriptor_class_suffix (optional): Suffix for the Java class name of the generated CEL lite descriptor.
+                                                Default is "CelLiteDescriptor".
        java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors.
                                 If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
        debug: (optional) If true, prints additional information during codegen for debugging purposes.
     """
     if not name:
         fail("You must provide a name.")
 
-    if not proto_src:
-        fail("You must provide a proto_library dependency.")
+    if not deps or len(deps) < 1:
+        fail("You must provide at least one proto_library dependency.")
 
     generated = name + "_cel_lite_descriptor"
     java_lite_proto_cel_library_rule(
         name = generated,
-        descriptor = proto_src,
-        java_descriptor_class_name = java_descriptor_class_name,
+        debug = debug,
+        descriptors = deps,
+        java_descriptor_class_suffix = java_descriptor_class_suffix,
     )
 
     if not java_proto_library_dep:
         java_proto_library_dep = name + "_java_lite_proto_dep"
         java_lite_proto_library(
             name = java_proto_library_dep,
-            deps = [proto_src],
+            deps = deps,
         )
 
     descriptor_codegen_deps = [
@@ -75,24 +75,35 @@ def _generate_cel_lite_descriptor_class(ctx):
     srcjar_output = ctx.actions.declare_file(ctx.attr.name + ".srcjar")
     java_file_path = srcjar_output.path
 
-    proto_info = ctx.attr.descriptor[ProtoInfo]
-    transitive_descriptors = proto_info.transitive_descriptor_sets
+    direct_descriptor_set = depset(
+        direct = [
+            descriptor[ProtoInfo].direct_descriptor_set
+            for descriptor in ctx.attr.descriptors
+        ],
+    )
+    transitive_descriptor_set = depset(
+        transitive = [
+            descriptor[ProtoInfo].transitive_descriptor_sets
+            for descriptor in ctx.attr.descriptors
+        ],
+    )
 
     args = ctx.actions.args()
     args.add("--version", CEL_VERSION)
-    args.add("--descriptor", proto_info.direct_descriptor_set)
-    args.add_joined("--transitive_descriptor_set", transitive_descriptors, join_with = ",")
+    args.add_joined("--descriptor_set", direct_descriptor_set, join_with = ",")
+    args.add_joined("--transitive_descriptor_set", transitive_descriptor_set, join_with = ",")
     args.add("--out", java_file_path)
 
-    if ctx.attr.java_descriptor_class_name:
-        args.add("--overridden_descriptor_class_name", ctx.attr.java_descriptor_class_name)
+    if ctx.attr.java_descriptor_class_suffix:
+        args.add("--overridden_descriptor_class_suffix", ctx.attr.java_descriptor_class_suffix)
+
     if ctx.attr.debug:
         args.add("--debug")
 
     ctx.actions.run(
         mnemonic = "CelLiteDescriptorGenerator",
         arguments = [args],
-        inputs = transitive_descriptors,
+        inputs = transitive_descriptor_set,
         outputs = [srcjar_output],
         progress_message = "Generating CelLiteDescriptor for: " + ctx.attr.name,
         executable = ctx.executable._tool,
@@ -103,8 +114,8 @@ def _generate_cel_lite_descriptor_class(ctx):
 java_lite_proto_cel_library_rule = rule(
     implementation = _generate_cel_lite_descriptor_class,
     attrs = {
-        "java_descriptor_class_name": attr.string(),
-        "descriptor": attr.label(
+        "java_descriptor_class_suffix": attr.string(),
+        "descriptors": attr.label_list(
             providers = [ProtoInfo],
         ),
         "debug": attr.bool(),

protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel

@@ -47,7 +47,6 @@ java_library(
         ":cel_lite_descriptor",
         ":debug_printer",
         ":lite_descriptor_codegen_metadata",
-        "//common:cel_descriptors",
         "//common/internal:proto_java_qualified_names",
         "//common/internal:well_known_proto",
         "@maven//:com_google_guava_guava",