Update CEL to v0.10.0, update intertwined dependencies (#67)

jchadwick-buf · web-flow · commit 1961a559d11b · 2025-01-24T18:47:35.000-05:00
diff --git a/.bazelrc b/.bazelrc
@@ -1,3 +1,5 @@
+common --noenable_bzlmod
+
 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
 build --cxxopt=-fsized-deallocation
 
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.4.0
+7.4.0
diff --git a/WORKSPACE b/WORKSPACE
@@ -4,6 +4,16 @@ load("//bazel:deps.bzl", "protovalidate_cc_dependencies")
 
 protovalidate_cc_dependencies()
 
+load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
+
+rules_java_dependencies()
+
+rules_java_toolchains()
+
+load("@rules_python//python:repositories.bzl", "py_repositories")
+
+py_repositories()
+
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
diff --git a/bazel/abseil.patch b/bazel/abseil.patch
diff --git a/bazel/cel_cpp.patch b/bazel/cel_cpp.patch
diff --git a/bazel/deps.bzl b/bazel/deps.bzl
@@ -16,28 +16,44 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 _dependencies = {
-    # This is needed due to an unresolved issue with protobuf v27+.
+    # cel-cpp needs a newer version of absl, otherwise it will fail to build in
+    # a very strange manner.
+    "com_google_absl": {
+        "sha256": "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
+        "strip_prefix": "abseil-cpp-20240722.0",
+        "urls": [
+            "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz",
+        ],
+    },
+    # These extra dependencies are needed by protobuf.
+    # This may be alleviated somewhat by protobuf v30.
     # https://github.com/protocolbuffers/protobuf/issues/17200
-    "rules_python": {
-        "sha256": "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578",
-        "strip_prefix": "rules_python-0.24.0",
+    "rules_cc": {
+        "sha256": "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
+        "strip_prefix": "rules_cc-0.0.17",
         "urls": [
-            "https://github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz",
+            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz"
         ],
     },
-    "bazel_skylib": {
-        "sha256": "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
+    "rules_java": {
+        "sha256": "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
         "urls": [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
+            "https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz"
+        ],
+    },
+    "rules_python": {
+        "sha256": "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c",
+        "strip_prefix": "rules_python-1.1.0",
+        "urls": [
+            "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz",
         ],
     },
     "com_google_protobuf": {
-        "sha256": "e4ff2aeb767da6f4f52485c2e72468960ddfe5262483879ef6ad552e52757a77",
-        "strip_prefix": "protobuf-27.2",
+        "sha256": "63150aba23f7a90fd7d87bdf514e459dd5fe7023fdde01b56ac53335df64d4bd",
+        "strip_prefix": "protobuf-29.2",
         "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v27.2.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v27.2.tar.gz",
+            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v29.2.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/v29.2.tar.gz",
         ],
     },
     "rules_proto": {
@@ -55,12 +71,14 @@ _dependencies = {
         ],
     },
     "com_google_cel_cpp": {
-        "sha256": "d62b93fd07c6151749e83855157f3f2778d62c168318f9c40dfcfe1c336c496f",
-        "strip_prefix": "cel-cpp-da0aba702f44a41ec6d2eb4bbf6a9f01efc2746d",
+        "sha256": "dd06b708a9f4c3728e76037ec9fb14fc9f6d9c9980e5d5f3a1d047f3855a8b98",
+        "strip_prefix": "cel-cpp-0.10.0",
         "urls": [
-            "https://github.com/google/cel-cpp/archive/da0aba702f44a41ec6d2eb4bbf6a9f01efc2746d.tar.gz",
+            "https://github.com/google/cel-cpp/archive/v0.10.0.tar.gz",
+        ],
+        "patches": [
+            "@com_github_bufbuild_protovalidate_cc//bazel:patches/cel_cpp/0001-Allow-message-field-access-using-index-operator.patch"
         ],
-        "patches": ["@com_github_bufbuild_protovalidate_cc//bazel:cel_cpp.patch"],
         "patch_args": ["-p1"],
     },
     # NOTE: Keep Version in sync with `/Makefile`.
diff --git a/bazel/patches/cel_cpp/0001-Allow-message-field-access-using-index-operator.patch b/bazel/patches/cel_cpp/0001-Allow-message-field-access-using-index-operator.patch
@@ -0,0 +1,84 @@
+From b8881a537441bfc4995f38a1e8d80f9b22f5f095 Mon Sep 17 00:00:00 2001
+From: John Chadwick <jchadwick@buf.build>
+Date: Fri, 24 Jan 2025 18:19:56 -0500
+Subject: [PATCH] Allow message field access using index operator
+
+CEL doesn't yet have a standard way to access field names that conflict
+with identifiers. This temporary workaround enables the index operator
+to access fields from a message. It can be used as follows:
+
+    dyn(message)["field_name"]
+---
+ eval/eval/container_access_step.cc | 35 ++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+diff --git a/eval/eval/container_access_step.cc b/eval/eval/container_access_step.cc
+index 67a783ad..ddb49375 100644
+--- a/eval/eval/container_access_step.cc
++++ b/eval/eval/container_access_step.cc
+@@ -3,6 +3,7 @@
+ #include <cstdint>
+ #include <memory>
+ #include <utility>
++#include <csignal>
+ 
+ #include "absl/status/status.h"
+ #include "absl/status/statusor.h"
+@@ -22,6 +23,8 @@
+ #include "eval/eval/evaluator_core.h"
+ #include "eval/eval/expression_step_base.h"
+ #include "eval/internal/errors.h"
++#include "eval/public/structs/legacy_type_adapter.h"
++#include "eval/public/structs/legacy_type_info_apis.h"
+ #include "internal/casts.h"
+ #include "internal/number.h"
+ #include "internal/status_macros.h"
+@@ -196,6 +199,34 @@ void LookupInList(const ListValue& cel_list, const Value& key,
+   }
+ }
+ 
++void LookupInMessage(const cel::StructValue& struct_value, const Value& key, ExecutionFrameBase& frame, Value& result) {
++  if (!key.IsString()) {
++    result = frame.value_manager().CreateErrorValue(
++        absl::UnknownError(
++            absl::StrCat(
++                "Index error: expected string type, got '", ValueKindToString(key->kind()), "'")));
++    return;
++  }
++  auto found = struct_value.HasFieldByName(key.GetString().ToString());
++  if (!found.ok()) {
++    result = frame.value_manager().CreateErrorValue(found.status());
++    return;
++  }
++  if (!*found) {
++    result = cel::NoSuchFieldError(key.AsString()->ToString());
++    return;
++  }
++  auto status = struct_value.GetFieldByName(
++      frame.value_manager(),
++      key.GetString().ToString(),
++      result,
++      ProtoWrapperTypeOptions::kUnsetProtoDefault);
++  if (!status.ok()) {
++    result = frame.value_manager().CreateErrorValue(status);
++  }
++  return;
++}
++
+ void LookupInContainer(const Value& container, const Value& key,
+                        ExecutionFrameBase& frame, Value& result) {
+   // Select steps can be applied to either maps or messages
+@@ -208,6 +239,10 @@ void LookupInContainer(const Value& container, const Value& key,
+       LookupInList(Cast<ListValue>(container), key, frame, result);
+       return;
+     }
++    case ValueKind::kStruct: {
++      LookupInMessage(*container.AsStruct(), key, frame, result);
++      return;
++    }
+     default:
+       result =
+           frame.value_manager().CreateErrorValue(absl::InvalidArgumentError(
+-- 
+2.47.0
+
diff --git a/buf/validate/internal/BUILD.bazel b/buf/validate/internal/BUILD.bazel
@@ -22,12 +22,12 @@ cc_library(
         ":constraint_rules",
         "@com_google_cel_cpp//eval/public:activation",
         "@com_google_cel_cpp//eval/public:cel_expression",
+        "@com_google_cel_cpp//eval/public:cel_value",
         "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper",
         "@com_google_cel_cpp//eval/public/containers:field_access",
         "@com_google_cel_cpp//eval/public/containers:field_backed_list_impl",
         "@com_google_cel_cpp//eval/public/containers:field_backed_map_impl",
         "@com_google_cel_cpp//parser",
-        "@com_google_cel_cpp//base:value"
     ],
 )
 
diff --git a/buf/validate/internal/cel_constraint_rules.cc b/buf/validate/internal/cel_constraint_rules.cc
@@ -14,7 +14,7 @@
 
 #include "buf/validate/internal/cel_constraint_rules.h"
 
-#include "base/values/struct_value.h"
+#include "common/values/struct_value.h"
 #include "eval/public/containers/field_access.h"
 #include "eval/public/containers/field_backed_list_impl.h"
 #include "eval/public/containers/field_backed_map_impl.h"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+common --noenable_bzlmod`
	`2`	`+`
`1`	`3`	`build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17`
`2`	`4`	`build --cxxopt=-fsized-deallocation`
`3`	`5`