Skip to content

Add CelLiteRuntimeVersionSkewTest for runtime version skew verification #1281

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add CelLiteRuntimeVersionSkewTest for runtime version skew verification #1281

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
2 changes: 2 additions & 0 deletions checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,8 @@ public enum StandardIdentifier {
DOUBLE(newStandardIdentDecl(SimpleType.DOUBLE)),
BYTES(newStandardIdentDecl(SimpleType.BYTES)),
STRING(newStandardIdentDecl(SimpleType.STRING)),
DURATION(newStandardIdentDecl(SimpleType.DURATION)),
TIMESTAMP(newStandardIdentDecl(SimpleType.TIMESTAMP)),
DYN(newStandardIdentDecl(SimpleType.DYN)),
TYPE(newStandardIdentDecl("type", SimpleType.DYN)),
NULL_TYPE(newStandardIdentDecl("null_type", SimpleType.NULL_TYPE)),
Expand Down
9 changes: 6 additions & 3 deletions checker/src/main/java/dev/cel/checker/ExprChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,8 @@ private void visit(CelMutableExpr expr, CelMutableStruct struct) {
env.reportError(expr.id(), getPosition(expr), "'%s' is not a type", CelTypes.format(type));
} else {
messageType = ((TypeType) type).type();
if (!messageType.kind().equals(CelKind.STRUCT)) {
if (!messageType.kind().equals(CelKind.STRUCT)
&& !CelTypes.isWellKnownType(messageType.name())) {
env.reportError(
expr.id(),
getPosition(expr),
Expand Down Expand Up @@ -816,7 +817,7 @@ private CelType getFieldType(long exprId, int position, CelType type, String fie
// provided
String errorMessage =
String.format("Message type resolution failure while referencing field '%s'.", fieldName);
if (type.kind().equals(CelKind.STRUCT)) {
if (type.kind().equals(CelKind.STRUCT) || CelTypes.isWellKnownType(typeName)) {
errorMessage +=
String.format(
" Ensure that the descriptor for type '%s' was added to the environment", typeName);
Expand Down Expand Up @@ -858,7 +859,9 @@ private static CelType normalizeFieldType(CelType celType) {
/** TODO: Remove after cl/984117942 is submitted. */
private static Optional<CelType> lookupLegacyFieldType(
TypeProvider legacyTypeProvider, CelType type, String fieldName) {
TypeProvider.FieldType legacyFieldType = legacyTypeProvider.lookupFieldType(type, fieldName);
Type messageType = CelProtoTypes.createMessage(type.name());
TypeProvider.FieldType legacyFieldType =
legacyTypeProvider.lookupFieldType(messageType, fieldName);
if (legacyFieldType != null) {
return Optional.of(legacyFieldType.celType());
}
Expand Down
15 changes: 15 additions & 0 deletions checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.protobuf.Duration;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Timestamp;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.checker.CelStandardDeclarations.StandardFunction;
Expand Down Expand Up @@ -182,6 +183,20 @@ public void check_wellKnownTypeStructCreation_withLegacyTypeProvider_success() t
assertThat(ast.getResultType()).isEqualTo(SimpleType.DURATION);
}

@Test
public void check_wellKnownTypeTimestampStructCreation_withLegacyTypeProvider_success()
throws Exception {
TypeProvider legacyTypeProvider =
new DescriptorTypeProvider(ImmutableList.of(Timestamp.getDescriptor()));
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder().setTypeProvider(legacyTypeProvider).build();

CelAbstractSyntaxTree ast =
celCompiler.compile("google.protobuf.Timestamp{seconds: 100, nanos: 200}").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.TIMESTAMP);
}

@Test
public void check_protoTypeMask_failsClosedWithLegacyTypeProvider() throws Exception {
TypeProvider legacyTypeProvider =
Expand Down
51 changes: 51 additions & 0 deletions checker/src/test/java/dev/cel/checker/CelStandardDeclarationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,18 @@ public void standardDeclarations_includeIdentifiers() {
.containsExactly(StandardIdentifier.INT.identDecl(), StandardIdentifier.UINT.identDecl());
}

@Test
public void standardDeclarations_includeDurationAndTimestampIdentifiers() {
CelStandardDeclarations celStandardDeclaration =
CelStandardDeclarations.newBuilder()
.includeIdentifiers(StandardIdentifier.DURATION, StandardIdentifier.TIMESTAMP)
.build();

assertThat(celStandardDeclaration.identifierDecls())
.containsExactly(
StandardIdentifier.DURATION.identDecl(), StandardIdentifier.TIMESTAMP.identDecl());
}

@Test
public void standardDeclarations_excludeIdentifiers() {
CelStandardDeclarations celStandardDeclaration =
Expand All @@ -222,6 +234,45 @@ public void standardDeclarations_excludeIdentifiers() {
.doesNotContain(StandardIdentifier.UINT.identDecl());
}

@Test
public void standardEnvironment_excludeDurationIdentifier_compilationFails() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardDeclarations(
CelStandardDeclarations.newBuilder()
.excludeIdentifiers(StandardIdentifier.DURATION)
.build())
.build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() -> celCompiler.compile("google.protobuf.Duration == type(duration('1h'))").getAst());

assertThat(e).hasMessageThat().contains("undeclared reference to 'google'");
}

@Test
public void standardEnvironment_excludeTimestampIdentifier_compilationFails() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardDeclarations(
CelStandardDeclarations.newBuilder()
.excludeIdentifiers(StandardIdentifier.TIMESTAMP)
.build())
.build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() ->
celCompiler
.compile("google.protobuf.Timestamp == type(timestamp('2023-01-01T00:00:00Z'))")
.getAst());

assertThat(e).hasMessageThat().contains("undeclared reference to 'google'");
}

@Test
public void standardDeclarations_filterIdentifiers() {
CelStandardDeclarations celStandardDeclaration =
Expand Down
4 changes: 4 additions & 0 deletions checker/src/test/java/dev/cel/checker/ExprCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,10 @@ public void types() throws Exception {
runTest();
source = "{}.map(c,[c,type(c)])";
runTest();
source =
"google.protobuf.Duration == type(duration('1h')) "
+ "&& google.protobuf.Timestamp == type(timestamp(0))";
runTest();
}

// Enum Values
Expand Down
219 changes: 217 additions & 2 deletions checker/src/test/java/dev/cel/checker/TypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@
package dev.cel.checker;

import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;

import dev.cel.expr.Type;
import dev.cel.expr.Type.PrimitiveType;
import com.google.protobuf.Duration;
import com.google.protobuf.Timestamp;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
Expand All @@ -37,9 +44,8 @@
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
@RunWith(TestParameterInjector.class)
public class TypesTest {

@Test
Expand Down Expand Up @@ -350,6 +356,215 @@ public void compiler_typeParamInTypeType_resolvesReturnTypeString() throws Excep
assertThat(ast.getResultType()).isEqualTo(SimpleType.STRING);
}

private enum WellKnownTypeIdentTestCase {
DURATION_QUALIFIED("google.protobuf.Duration", TypeType.create(SimpleType.DURATION)),
DURATION_LEADING_DOT(".google.protobuf.Duration", TypeType.create(SimpleType.DURATION)),
DURATION_UNQUALIFIED("Duration", TypeType.create(SimpleType.DURATION)),
TIMESTAMP_QUALIFIED("google.protobuf.Timestamp", TypeType.create(SimpleType.TIMESTAMP)),
TIMESTAMP_LEADING_DOT(".google.protobuf.Timestamp", TypeType.create(SimpleType.TIMESTAMP)),
TIMESTAMP_UNQUALIFIED("Timestamp", TypeType.create(SimpleType.TIMESTAMP));

private final String expression;
private final CelType expectedType;

WellKnownTypeIdentTestCase(String expression, CelType expectedType) {
this.expression = expression;
this.expectedType = expectedType;
}
}

@Test
public void compiler_wellKnownProtoTypeIdent_resolvesToSimpleType(
@TestParameter WellKnownTypeIdentTestCase testCase) throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Duration.getDescriptor(), Timestamp.getDescriptor())
.setContainer(CelContainer.ofName("google.protobuf"))
.build();

CelAbstractSyntaxTree ast = celCompiler.compile(testCase.expression).getAst();

assertThat(ast.getResultType()).isEqualTo(testCase.expectedType);
}

private enum WellKnownTypeParamTestCase {
DURATION_QUALIFIED_CAST("cast('1h', google.protobuf.Duration)", SimpleType.DURATION),
DURATION_QUALIFIED_EQUALITY(
"cast('1h', google.protobuf.Duration) == duration('1h')", SimpleType.BOOL),
DURATION_UNQUALIFIED_COMPARISON("cast('1h', Duration) > duration('0s')", SimpleType.BOOL),
TIMESTAMP_QUALIFIED_CAST("cast(0, google.protobuf.Timestamp)", SimpleType.TIMESTAMP),
TIMESTAMP_QUALIFIED_EQUALITY(
"cast(0, google.protobuf.Timestamp) == timestamp(0)", SimpleType.BOOL),
TIMESTAMP_UNQUALIFIED_COMPARISON("cast(0, Timestamp) > timestamp(0)", SimpleType.BOOL);

private final String expression;
private final CelType expectedType;

WellKnownTypeParamTestCase(String expression, CelType expectedType) {
this.expression = expression;
this.expectedType = expectedType;
}
}

@Test
public void compiler_typeParamInTypeType_withWellKnownProto_resolvesWellKnownOverloads(
@TestParameter WellKnownTypeParamTestCase testCase) throws Exception {
TypeParamType typeParamT = TypeParamType.create("T");
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Duration.getDescriptor(), Timestamp.getDescriptor())
.setContainer(CelContainer.ofName("google.protobuf"))
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
"cast",
CelOverloadDecl.newGlobalOverload(
"cast_t", typeParamT, SimpleType.DYN, TypeType.create(typeParamT))))
.build();

CelAbstractSyntaxTree ast = celCompiler.compile(testCase.expression).getAst();

assertThat(ast.getResultType()).isEqualTo(testCase.expectedType);
}

@Test
public void compiler_durationIdent_withoutMessageTypes_resolvesToSimpleType() throws Exception {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelAbstractSyntaxTree ast = celCompiler.compile("google.protobuf.Duration").getAst();

assertThat(ast.getResultType()).isEqualTo(TypeType.create(SimpleType.DURATION));
}

@Test
public void compiler_timestampIdent_withoutMessageTypes_resolvesToSimpleType() throws Exception {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelAbstractSyntaxTree ast = celCompiler.compile("google.protobuf.Timestamp").getAst();

assertThat(ast.getResultType()).isEqualTo(TypeType.create(SimpleType.TIMESTAMP));
}

@Test
public void compiler_durationStructCreation_withDescriptor_success() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Duration.getDescriptor())
.build();

CelAbstractSyntaxTree ast =
celCompiler.compile("google.protobuf.Duration{seconds: 10, nanos: 20}").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.DURATION);
}

@Test
public void compiler_timestampStructCreation_withDescriptor_success() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Timestamp.getDescriptor())
.build();

CelAbstractSyntaxTree ast =
celCompiler.compile("google.protobuf.Timestamp{seconds: 100, nanos: 200}").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.TIMESTAMP);
}

@Test
public void compiler_durationStructCreation_emptyFields_success() throws Exception {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelAbstractSyntaxTree ast = celCompiler.compile("google.protobuf.Duration{}").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.DURATION);
}

@Test
public void compiler_timestampStructCreation_emptyFields_success() throws Exception {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelAbstractSyntaxTree ast = celCompiler.compile("google.protobuf.Timestamp{}").getAst();

assertThat(ast.getResultType()).isEqualTo(SimpleType.TIMESTAMP);
}

@Test
public void compiler_durationStructCreation_withoutDescriptor_throws() {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() -> celCompiler.compile("google.protobuf.Duration{seconds: 10}").getAst());

assertThat(e)
.hasMessageThat()
.contains(
"Message type resolution failure while referencing field 'seconds'."
+ " Ensure that the descriptor for type 'google.protobuf.Duration' was added to the"
+ " environment");
}

@Test
public void compiler_timestampStructCreation_withoutDescriptor_throws() {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() -> celCompiler.compile("google.protobuf.Timestamp{seconds: 10}").getAst());

assertThat(e)
.hasMessageThat()
.contains(
"Message type resolution failure while referencing field 'seconds'. Ensure that the"
+ " descriptor for type 'google.protobuf.Timestamp' was added to the environment");
}

@Test
public void compiler_durationStructCreation_typeMismatch_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Duration.getDescriptor())
.build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() -> celCompiler.compile("google.protobuf.Duration{seconds: 'bad'}").getAst());

assertThat(e)
.hasMessageThat()
.contains("expected type of field 'seconds' is 'int' but provided type is 'string'");
}

@Test
public void compiler_timestampStructCreation_typeMismatch_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addMessageTypes(Timestamp.getDescriptor())
.build();

CelValidationException e =
assertThrows(
CelValidationException.class,
() -> celCompiler.compile("google.protobuf.Timestamp{seconds: 'bad'}").getAst());

assertThat(e)
.hasMessageThat()
.contains("expected type of field 'seconds' is 'int' but provided type is 'string'");
}

@Test
public void compiler_structCreation_primitiveType_throws() {
CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder().build();

CelValidationException e =
assertThrows(CelValidationException.class, () -> celCompiler.compile("int{}").getAst());

assertThat(e).hasMessageThat().contains("'int' is not a message type");
}

@Test
public void compiler_typeParamInCompositeTypeType_resolvesReturnType() throws Exception {
TypeParamType typeParamT = TypeParamType.create("T");
Expand Down
Loading
Loading