From 7958000ffa38bbf1275ccda1f3d52f10dea08db1 Mon Sep 17 00:00:00 2001 From: Tristan Swadell Date: Mon, 11 May 2020 14:00:47 -0700 Subject: [PATCH 1/3] Upgrade to cel-cpp v0.2.0 to pick up ANTLR thread-safety changes. Signed-off-by: Tristan Swadell --- bazel/repository_locations.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index aa73df49a0..d22f76173e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -296,10 +296,10 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://storage.googleapis.com/quiche-envoy-integration/googleurl_dbf5ad147f60afc125e99db7549402af49a5eae8.tar.gz"], ), com_google_cel_cpp = dict( - sha256 = "7eddffdb231e7c82f60c597cd38e742fbc0c48f54ca33015ac0a3d22bd51bba3", - strip_prefix = "cel-cpp-d88a4822af1864b481b31b12c2ecc4e631a7f8a9", - # 2019-04-13 - urls = ["https://github.com/google/cel-cpp/archive/d88a4822af1864b481b31b12c2ecc4e631a7f8a9.tar.gz"], + sha256 = "d773ee368053f404eada87b59c9e545b2e21118ebb0577ac3e942a06518f6fd2", + strip_prefix = "cel-cpp-v0.2.0", + # 2020-05-11 + urls = ["https://github.com/google/cel-cpp/archive/v0.2.0.tar.gz"], ), com_github_google_flatbuffers = dict( sha256 = "b8efbc25721e76780752bad775a97c3f77a0250271e2db37fc747b20e8b0f24a", From 72a5ff9ecbe2e2a75c5762b13f4bd4a851e76361 Mon Sep 17 00:00:00 2001 From: Tristan Swadell Date: Mon, 11 May 2020 14:13:23 -0700 Subject: [PATCH 2/3] Remove a superfluous 'v' from the strip_prefix Signed-off-by: Tristan Swadell --- bazel/repository_locations.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index d22f76173e..f92731cd45 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -297,7 +297,7 @@ REPOSITORY_LOCATIONS = dict( ), com_google_cel_cpp = dict( sha256 = "d773ee368053f404eada87b59c9e545b2e21118ebb0577ac3e942a06518f6fd2", - strip_prefix = "cel-cpp-v0.2.0", + strip_prefix = "cel-cpp-0.2.0", # 2020-05-11 urls = ["https://github.com/google/cel-cpp/archive/v0.2.0.tar.gz"], ), From efc3f78b62dca744fda08c1457aa03d7c284c13e Mon Sep 17 00:00:00 2001 From: Tristan Swadell Date: Mon, 11 May 2020 15:30:39 -0700 Subject: [PATCH 3/3] Update context.h header for compatibility with CEL base clases Signed-off-by: Tristan Swadell --- source/extensions/common/wasm/context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/extensions/common/wasm/context.h b/source/extensions/common/wasm/context.h index 08cd00bd8e..bd7ee839c7 100644 --- a/source/extensions/common/wasm/context.h +++ b/source/extensions/common/wasm/context.h @@ -281,7 +281,7 @@ class Context : public proxy_wasm::ContextBase, static const std::vector empty; return empty; } - const Protobuf::FieldMask unknown_paths() const override { + const Protobuf::FieldMask& unknown_paths() const override { return Protobuf::FieldMask::default_instance(); }