Support cel_expression

Signed-off-by: Sri Krishna <skrishna@buf.build>

Author: srikrsna-buf

.bazelversion

@@ -1 +1 @@
-8.0.0
+8.4.2

MODULE.bazel

@@ -34,3 +34,5 @@ bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_a
 bazel_dep(name = "cel-cpp", version = "0.11.0", repo_name = "com_google_cel_cpp")
 
 bazel_dep(name = "protovalidate", version = "1.0.0", repo_name = "com_github_bufbuild_protovalidate")
+
+git_override(module_name = "protovalidate", remote = "https://github.com/bufbuild/protovalidate", commit = "774f3764e09fcfc921b3ef5a42271754f0b7063a")

MODULE.bazel.lock

@@ -34,3 +34,5 @@ bazel_dep(name = "abseil-cpp", version = "{{absl.meta.version}}", repo_name = "c
 bazel_dep(name = "cel-cpp", version = "{{cel_cpp.meta.version}}", repo_name = "com_google_cel_cpp")
 
 bazel_dep(name = "protovalidate", version = "{{protovalidate.meta.version}}", repo_name = "com_github_bufbuild_protovalidate")
+
+git_override(module_name = "protovalidate", remote = "https://github.com/bufbuild/protovalidate", commit = "774f3764e09fcfc921b3ef5a42271754f0b7063a")

MODULE.bazel.tmpl

@@ -10,7 +10,8 @@ BIN := .tmp/bin
 COPYRIGHT_YEARS := 2023-2025
 LICENSE_IGNORE := -e internal/testdata/
 LICENSE_HEADER_VERSION := 0294fdbe1ce8649ebaf5e87e8cdd588e33730bbb
-PROTOVALIDATE_VERSION ?= v$(shell <./deps/shared_deps.json jq -j .protovalidate.meta.version)
+# PROTOVALIDATE_VERSION ?= v$(shell <./deps/shared_deps.json jq -j .protovalidate.meta.version)
+PROTOVALIDATE_VERSION ?= 774f3764e09fcfc921b3ef5a42271754f0b7063a
 
 # Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
 GO ?= go

Makefile

@@ -125,6 +125,16 @@ absl::Status CelValidationRules::Add(
   return Add(builder, rule, std::move(rulePath), ruleField);
 }
 
+absl::Status CelValidationRules::Add(
+    google::api::expr::runtime::CelExpressionBuilder& builder,
+    std::string_view expression,
+    absl::optional<FieldPath> rulePath,
+    const google::protobuf::FieldDescriptor* ruleField) {
+  Rule rule;
+  *rule.mutable_expression() = expression;
+  return Add(builder, rule, std::move(rulePath), ruleField);
+}
+
 absl::Status CelValidationRules::ValidateCel(
     RuleContext& ctx, google::api::expr::runtime::Activation& activation) const {
   activation.InsertValue("rules", rules_);

buf/validate/internal/cel_validation_rules.cc

@@ -51,6 +51,11 @@ class CelValidationRules : public ValidationRules {
       std::string_view expression,
       absl::optional<FieldPath> rulePath,
       const google::protobuf::FieldDescriptor* ruleField);
+  absl::Status Add(
+      google::api::expr::runtime::CelExpressionBuilder& builder,
+      std::string_view expression,
+      absl::optional<FieldPath> rulePath,
+      const google::protobuf::FieldDescriptor* ruleField);
 
   // Validate all the cel rules given the activation that already has 'this' bound.
   absl::Status ValidateCel(

buf/validate/internal/cel_validation_rules.h

@@ -341,6 +341,18 @@ absl::StatusOr<std::unique_ptr<FieldValidationRules>> NewFieldRules(
           absl::StrFormat("unknown field validator type %d", fieldLvl.type_case()));
   }
   if (rules_or.ok()) {
+    for (int i = 0; i < fieldLvl.cel_expression_size(); i++) {
+      const auto& expr = fieldLvl.cel_expression(i);
+      FieldPathElement celElement =
+          staticFieldPathElement<FieldRules, FieldRules::kCelExpressionFieldNumber>();
+      celElement.set_index(i);
+      FieldPath rulePath;
+      *rulePath.mutable_elements()->Add() = celElement;
+      auto status = rules_or.value()->Add(builder, expr, rulePath, nullptr);
+      if (!status.ok()) {
+        return status;
+      }
+    }
     for (int i = 0; i < fieldLvl.cel_size(); i++) {
       const auto& rule = fieldLvl.cel(i);
       FieldPathElement celElement =

buf/validate/internal/field_rules.cc

@@ -24,6 +24,11 @@ namespace buf::validate::internal {
 absl::StatusOr<std::unique_ptr<MessageValidationRules>> BuildMessageRules(
     google::api::expr::runtime::CelExpressionBuilder& builder, const MessageRules& rules) {
   auto result = std::make_unique<MessageValidationRules>();
+  for (const auto& expr: rules.cel_expression()) {
+    if (auto status = result->Add(builder, expr, absl::nullopt, nullptr); !status.ok()) {
+      return status;
+    }
+  }
   for (const auto& rule : rules.cel()) {
     if (auto status = result->Add(builder, rule, absl::nullopt, nullptr); !status.ok()) {
       return status;