Skip to content

Preserve FieldMask as a message in the CelValue runtime path #1074

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

Closed
andrewparmet wants to merge 6 commits into from
Closed

Preserve FieldMask as a message in the CelValue runtime path #1074

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95faaa8
Preserve FieldMask as a message in the CelValue runtime path
andrewparmet May 9, 2026
984193b
Wrap FieldMask via shared message-to-struct hook on the base converter
andrewparmet Jun 2, 2026
b9e7639
Revert "Wrap FieldMask via shared message-to-struct hook on the base …
andrewparmet Jun 2, 2026
abbd7cf
Override fromWellKnownProto in ProtoLiteCelValueConverter for FieldMask
andrewparmet Jun 3, 2026
c5d86d9
Remove redundant base FieldMask handler now that both converters inte…
andrewparmet Jun 3, 2026
f8434e1
Merge remote-tracking branch 'google/main' into fix-fieldmask-celvalue
andrewparmet Jun 4, 2026
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
3 changes: 3 additions & 0 deletions common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ protected Object fromWellKnownProto(MessageLiteOrBuilder msg, WellKnownProto wel
"Unpacking failed for message: " + message.getDescriptorForType().getFullName(), e);
}
return toRuntimeValue(unpackedMessage);
case FIELD_MASK:
Comment thread
l46kok marked this conversation as resolved.
return ProtoMessageValue.create(
(Message) message, celDescriptorPool, this, celOptions.enableJsonFieldNames());
default:
return super.fromWellKnownProto(message, wellKnownProto);
}
Expand Down
18 changes: 18 additions & 0 deletions common/src/test/java/dev/cel/common/values/ProtoMessageValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,24 @@ public void selectField_durationOutOfRange_success(int seconds, int nanos) {
.isEqualTo(Duration.ofSeconds(seconds, nanos));
}

@Test
public void selectField_fieldMask_returnsProtoMessageValue() {
TestAllTypes testAllTypes =
TestAllTypes.newBuilder()
.setFieldMask(
com.google.protobuf.FieldMask.newBuilder().addPaths("foo").addPaths("bar"))
.build();

ProtoMessageValue protoMessageValue =
ProtoMessageValue.create(
testAllTypes, DefaultDescriptorPool.INSTANCE, PROTO_CEL_VALUE_CONVERTER, false);

Object selected = protoMessageValue.select("field_mask");
assertThat(selected).isInstanceOf(ProtoMessageValue.class);
assertThat(((ProtoMessageValue) selected).select("paths"))
.isEqualTo(ImmutableList.of("foo", "bar"));
}

@SuppressWarnings("ImmutableEnumChecker") // Test only
private enum SelectFieldJsonValueTestCase {
NULL(Value.newBuilder().build(), NullValue.NULL_VALUE),
Expand Down
Loading