Skip to content

Rewrite IdentStep as Constant when variable value is provided to TypeChecker #1902

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: master
Choose a base branch
from
Open

Rewrite IdentStep as Constant when variable value is provided to TypeChecker #1902

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
11 changes: 10 additions & 1 deletion eval/compiler/qualified_reference_resolver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,17 @@ class ReferenceResolver : public cel::AstRewriterBase {
expr.mutable_const_expr().set_int64_value(
reference->value().int64_value());
return true;
} else if (expr.has_ident_expr()) {
// "google.protobuf.NullValue.NULL_VALUE" is a special case: sometimes
// it is interpreted as null value and sometimes as an enum constant.
if (reference->value().has_null_value() &&
expr.ident_expr().name() ==
"google.protobuf.NullValue.NULL_VALUE") {
return false;
}
expr.set_const_expr(reference->value());
return true;
} else {
// No update if the constant reference isn't an int (an enum value).
return false;
}
}
Expand Down
91 changes: 91 additions & 0 deletions eval/compiler/qualified_reference_resolver_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ namespace google::api::expr::runtime {

namespace {

using ::absl_testing::IsOk;
using ::absl_testing::IsOkAndHolds;
using ::absl_testing::StatusIs;
using ::cel::Ast;
Expand Down Expand Up @@ -343,6 +344,60 @@ TEST(ResolveReferences, EnumConstReferenceUsedSelect) {
})pb"));
}

// foo && bar
constexpr char kConstReferenceExpr[] = R"(
id: 1
call_expr {
function: "_&&_"
args {
id: 2
ident_expr {
name: "foo"
}
}
args {
id: 5
ident_expr {
name: "bar"
}
}
}
)";

TEST(ResolveReferences, ConstReferenceFolded) {
std::unique_ptr<Ast> expr_ast = ParseTestProto(kConstReferenceExpr);
SourceInfo source_info;

CelFunctionRegistry func_registry;
ASSERT_THAT(RegisterBuiltinFunctions(&func_registry), IsOk());
cel::TypeRegistry type_registry;
Resolver registry("", func_registry.InternalGetRegistry(), type_registry,
type_registry.GetComposedTypeProvider());
expr_ast->mutable_reference_map()[2].set_name("foo");
expr_ast->mutable_reference_map()[2].mutable_value().set_bool_value(true);
expr_ast->mutable_reference_map()[5].set_name("bar");
expr_ast->mutable_reference_map()[5].mutable_value().set_bool_value(false);
IssueCollector issues(RuntimeIssue::Severity::kError);

auto result = ResolveReferences(registry, issues, *expr_ast);

ASSERT_THAT(result, IsOkAndHolds(true));

EXPECT_THAT(ExprToProtoOrDie(expr_ast->root_expr()), EqualsProto(R"pb(
id: 1
call_expr {
function: "_&&_"
args {
id: 2
const_expr { bool_value: true }
}
args {
id: 5
const_expr { bool_value: false }
}
})pb"));
}

TEST(ResolveReferences, ConstReferenceSkipped) {
std::unique_ptr<Ast> expr_ast = ParseTestProto(kExpr);
SourceInfo source_info;
Expand Down Expand Up @@ -388,6 +443,42 @@ TEST(ResolveReferences, ConstReferenceSkipped) {
})pb"));
}

constexpr char kNullValueReferenceExpr[] = R"(
id: 1
call_expr {
function: "_+_"
args {
id: 2
ident_expr {
name: "google.protobuf.NullValue.NULL_VALUE"
}
}
args {
id: 5
const_expr { int64_value: 1 }
}
}
)";

TEST(ResolveReferences, NullValueReferenceSkipped) {
std::unique_ptr<Ast> expr_ast = ParseTestProto(kNullValueReferenceExpr);
SourceInfo source_info;

CelFunctionRegistry func_registry;
ASSERT_THAT(RegisterBuiltinFunctions(&func_registry), IsOk());
cel::TypeRegistry type_registry;
Resolver registry("", func_registry.InternalGetRegistry(), type_registry,
type_registry.GetComposedTypeProvider());
expr_ast->mutable_reference_map()[2].set_name(
"google.protobuf.NullValue.NULL_VALUE");
expr_ast->mutable_reference_map()[2].mutable_value().set_null_value(nullptr);
IssueCollector issues(RuntimeIssue::Severity::kError);

auto result = ResolveReferences(registry, issues, *expr_ast);

ASSERT_THAT(result, IsOkAndHolds(/*was_rewritten=*/false));
}

constexpr char kExtensionAndExpr[] = R"(
id: 1
call_expr {
Expand Down