Skip to content

Fix CEL bindings for lists for this variable #276

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
smaye81 merged 1 commit into from
Apr 29, 2025
Merged

Fix CEL bindings for lists for this variable #276

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
4 changes: 0 additions & 4 deletions conformance/expected-failures.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ custom_rules:
- field_expression/map/enum/valid
- field_expression/map/message/invalid
- field_expression/map/message/valid
- field_expression/repeated/enum/invalid
- field_expression/repeated/enum/valid
- field_expression/repeated/scalar/invalid
- field_expression/repeated/scalar/valid
- field_expression/map/bool/valid
- field_expression/map/bool/invalid
- field_expression/map/string/valid
Expand Down
28 changes: 10 additions & 18 deletions src/main/java/build/buf/protovalidate/EvaluatorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.api.expr.v1alpha1.Decl;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
Expand All @@ -30,7 +31,6 @@
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Message;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -321,31 +321,23 @@ private void processFieldExpressions(
if (rulesCelList.isEmpty()) {
return;
}
List<EnvOption> opts;
Decl celType =
Decls.newVar(
Variable.THIS_NAME,
DescriptorMappings.getCELType(fieldDescriptor, valueEvaluatorEval.hasNestedRule()));

List<EnvOption> opts = new ArrayList<EnvOption>();
opts.add(EnvOption.declarations(celType));
if (fieldDescriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
try {
DynamicMessage defaultInstance =
DynamicMessage.parseFrom(fieldDescriptor.getMessageType(), new byte[0]);
opts =
Arrays.asList(
EnvOption.types(defaultInstance),
EnvOption.declarations(
Decls.newVar(
Variable.THIS_NAME,
DescriptorMappings.getCELType(
fieldDescriptor, valueEvaluatorEval.hasNestedRule()))));
opts.add(EnvOption.types(defaultInstance));
} catch (InvalidProtocolBufferException e) {
throw new CompilationException("field descriptor type is invalid " + e.getMessage(), e);
}
} else {
opts =
Collections.singletonList(
EnvOption.declarations(
Decls.newVar(
Variable.THIS_NAME,
DescriptorMappings.protoKindToCELType(fieldDescriptor.getType()))));
}
Env finalEnv = env.extend(opts.toArray(new EnvOption[0]));
Env finalEnv = env.extend(opts.toArray(new EnvOption[opts.size()]));
List<CompiledProgram> compiledPrograms = compileRules(rulesCelList, finalEnv, true);
if (!compiledPrograms.isEmpty()) {
valueEvaluatorEval.append(new CelPrograms(valueEvaluatorEval, compiledPrograms));
Expand Down