Update protovalidate

MODULE.bazel

@@ -33,4 +33,4 @@ 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")
+bazel_dep(name = "protovalidate", version = "1.1.1", repo_name = "com_github_bufbuild_protovalidate")

buf/validate/internal/cel_rules.h

@@ -53,6 +53,7 @@ MAP_RULES_TO_FIELD_NUMBER(RepeatedRules, FieldRules::kRepeatedFieldNumber)
 MAP_RULES_TO_FIELD_NUMBER(MapRules, FieldRules::kMapFieldNumber)
 MAP_RULES_TO_FIELD_NUMBER(AnyRules, FieldRules::kAnyFieldNumber)
 MAP_RULES_TO_FIELD_NUMBER(DurationRules, FieldRules::kDurationFieldNumber)
+MAP_RULES_TO_FIELD_NUMBER(FieldMaskRules, FieldRules::kFieldMaskFieldNumber)
 MAP_RULES_TO_FIELD_NUMBER(TimestampRules, FieldRules::kTimestampFieldNumber)
 
 #undef MAP_RULES_TO_FIELD_NUMBER

buf/validate/internal/cel_validation_rules.cc

@@ -125,6 +125,14 @@ 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) {  
+  return Add(builder, expression, "", expression, 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.h

@@ -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/field_rules.cc

@@ -237,6 +237,22 @@ absl::StatusOr<std::unique_ptr<FieldValidationRules>> NewFieldRules(
         }
       }
       break;
+    case FieldRules::kFieldMask:
+      if (field->cpp_type() != google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE ||
+          field->message_type()->full_name() !=
+              google::protobuf::FieldMask::descriptor()->full_name()) {
+        return absl::InvalidArgumentError("field_mask field validator on non-field_mask field");
+      } else {
+        auto result = std::make_unique<FieldValidationRules>(field, fieldLvl);
+        auto status = BuildCelRules(
+            messageFactory, allowUnknownFields, arena, builder, fieldLvl.field_mask(), *result);
+        if (!status.ok()) {
+          rules_or = status;
+        } else {
+          rules_or = std::move(result);
+        }
+      }
+      break;
     case FieldRules::kTimestamp:
       if (field->cpp_type() != google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE ||
           field->message_type()->full_name() !=
@@ -341,6 +357,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/message_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;

buf/validate/internal/rules.cc

@@ -112,6 +112,7 @@ absl::Status FieldValidationRules::Validate(
             std::move(violation),
             ProtoField{&message, field_},
             ProtoField{&fieldRules_, requiredField});
+        return absl::OkStatus();
       }
     }
   } else if (field_->is_repeated()) {
@@ -132,6 +133,7 @@ absl::Status FieldValidationRules::Validate(
             std::move(violation),
             ProtoField{&message, field_},
             ProtoField{&fieldRules_, requiredField});
+        return absl::OkStatus();
       }
     }
   } else {

deps/shared_deps.json

@@ -38,10 +38,10 @@
   },
   "protovalidate": {
     "meta": {
-      "version": "1.0.0"
+      "version": "1.1.1"
     },
     "source": {
-      "sha256": "39a3f262614ffc23e89507f4dbdae535d8d73021713f580733b6a8dfdf06f734",
+      "sha256": "297dba5cdc25fa478c597e53af6c4ccf330c826e566384774b5176c13c8d3bd8",
       "strip_prefix": "protovalidate-{version}",
       "urls": [
         "https://github.com/bufbuild/protovalidate/releases/download/v{version}/protovalidate-{version}.tar.gz"