diff --git a/bazel/cel-cpp.patch b/bazel/cel-cpp.patch deleted file mode 100644 index aee357153fdf..000000000000 --- a/bazel/cel-cpp.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/eval/public/containers/field_backed_map_impl.cc b/eval/public/containers/field_backed_map_impl.cc -index cd56f51..4d2a546 100644 ---- a/eval/public/containers/field_backed_map_impl.cc -+++ b/eval/public/containers/field_backed_map_impl.cc -@@ -117,7 +117,9 @@ int FieldBackedMapImpl::size() const { - const CelList* FieldBackedMapImpl::ListKeys() const { return key_list_.get(); } - - absl::optional FieldBackedMapImpl::operator[](CelValue key) const { --#ifdef GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND -+#ifdef XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND -+ static_assert(false); -+ - // Fast implementation. - google::protobuf::MapKey inner_key; - switch (key.type()) { -@@ -171,7 +173,7 @@ absl::optional FieldBackedMapImpl::operator[](CelValue key) const { - return CreateErrorValue(arena_, status.message()); - } - return result; --#else // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND -+#else // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND - // Slow implementation. - CelValue result = CelValue::CreateNull(); - CelValue inner_key = CelValue::CreateNull(); -@@ -228,7 +230,7 @@ absl::optional FieldBackedMapImpl::operator[](CelValue key) const { - } - - return {}; --#endif // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND -+#endif // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND - } - - } // namespace runtime diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index db873d30c16f..7020233f98ee 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -351,15 +351,7 @@ def _com_github_zlib_ng_zlib_ng(): ) def _com_google_cel_cpp(): - external_http_archive( - "com_google_cel_cpp", - patch_args = ["-p1"], - # Patches to remove "fast" protobuf-internal access - # The patch can be removed when the "fast" access is safe to be enabled back. - # This requires public visibility of Reflection::LookupMapValue in protobuf and - # any release of cel-cpp after 10/27/2020. - patches = ["@envoy//bazel:cel-cpp.patch"], - ) + external_http_archive("com_google_cel_cpp") external_http_archive("rules_antlr") # Parser dependencies diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 34f848dd9209..8d550a63cc2e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -707,8 +707,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Common Expression Language (CEL) C++ library", project_desc = "Common Expression Language (CEL) C++ library", project_url = "https://opensource.google/projects/cel", - version = "47244a458e7739ad38e178a3f3892d197de4a574", - sha256 = "51b1af23cb703a94d18fe7a5e2696f96cde5bc35a279c6c844e6363aea3982fb", + version = "9841e3ee251f3cc4cd5b6dd9deee6818bc9f2854", + sha256 = "7e42cbad7d1068d6e7891ad101e2863e727692136d6b3a817c487b3cc7bcfdcc", strip_prefix = "cel-cpp-{version}", urls = ["https://github.com/google/cel-cpp/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -721,7 +721,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.network.wasm", "envoy.stat_sinks.wasm", ], - release_date = "2020-10-25", + release_date = "2020-12-17", cpe = "N/A", ), com_github_google_flatbuffers = dict(