Skip to content

Dedupe enum types by enum descriptor's fully qualified name in ProtoMessageTypeProvider #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Apr 18, 2024
+36 −2
Merged

Dedupe enum types by enum descriptor's fully qualified name in ProtoMessageTypeProvider #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@
import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.Any;
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Timestamps;
import com.google.rpc.context.AttributeContext;
Expand Down Expand Up @@ -1021,6 +1024,34 @@ public void compile_enumTypeTransitiveResolutionFailure() {
assertThat(e).hasMessageThat().contains("undeclared reference to 'NullValue'");
}

@Test
public void compile_multipleInstancesOfEnumDescriptor_dedupedByFullName() throws Exception {
String enumTextProto =
"name: \"standalone_global_enum.proto\"\n"
+ "package: \"dev.cel.testing.testdata.proto3\"\n"
+ "enum_type {\n"
+ " name: \"StandaloneGlobalEnum\"\n"
+ " value {\n"
+ " name: \"SGOO\"\n"
+ " number: 0\n"
+ " }\n"
+ "}\n"
+ "syntax: \"proto3\"\n";
FileDescriptorProto enumFileDescriptorProto =
TextFormat.parse(enumTextProto, FileDescriptorProto.class);
FileDescriptor enumFileDescriptor =
FileDescriptor.buildFrom(enumFileDescriptorProto, new FileDescriptor[] {});
Cel cel =
standardCelBuilderWithMacros()
.setContainer("dev.cel.testing.testdata")
.addFileTypes(enumFileDescriptor)
.addFileTypes(StandaloneGlobalEnum.getDescriptor().getFile())
.build();

assertThat(cel.compile("dev.cel.testing.testdata.proto3.StandaloneGlobalEnum.SGOO").getAst())
.isNotNull();
}

@Test
public void program_customVarResolver() throws Exception {
Cel cel =
Expand Down
7 changes: 5 additions & 2 deletions common/src/main/java/dev/cel/common/types/ProtoMessageTypeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,19 @@ private ImmutableMap<String, CelType> createProtoMessageTypes(

private ImmutableMap<String, CelType> createEnumTypes(
Collection<EnumDescriptor> enumDescriptors) {
ImmutableMap.Builder<String, CelType> enumTypes = ImmutableMap.builder();
HashMap<String, CelType> enumTypes = new HashMap<>();
for (EnumDescriptor enumDescriptor : enumDescriptors) {
if (enumTypes.containsKey(enumDescriptor.getFullName())) {
continue;
}
ImmutableMap<String, Integer> values =
enumDescriptor.getValues().stream()
.collect(
toImmutableMap(EnumValueDescriptor::getName, EnumValueDescriptor::getNumber));
enumTypes.put(
enumDescriptor.getFullName(), EnumType.create(enumDescriptor.getFullName(), values));
}
return enumTypes.buildOrThrow();
return ImmutableMap.copyOf(enumTypes);
}

private static class FieldResolver {
Expand Down