From 7d1b31c6679155d2d9cf22d8e4fd71a040e45e08 Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Thu, 24 Jun 2021 14:15:09 -0700
Subject: [PATCH 1/2] Re-add protobuf dependency.

This was incorrectly removed in #170, but it's needed by NullVM plugins
that make gRPC calls (built with -DPROXY_WASM_PROTOBUF).

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 BUILD                              |  1 +
 bazel/dependencies.bzl             |  2 ++
 bazel/repositories.bzl             | 13 ++++++++++---
 include/proxy-wasm/wasm_api_impl.h |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/BUILD b/BUILD
index c2eb5d8c2..66d16d6ce 100644
--- a/BUILD
+++ b/BUILD
@@ -79,6 +79,7 @@ cc_library(
     defines = ["PROXY_WASM_HAS_RUNTIME_NULL"],
     deps = [
         ":headers",
+        "@com_google_protobuf//:protobuf_lite",
         "@proxy_wasm_cpp_sdk//:api_lib",
     ],
 )
diff --git a/bazel/dependencies.bzl b/bazel/dependencies.bzl
index 031a962ff..c325facfe 100644
--- a/bazel/dependencies.bzl
+++ b/bazel/dependencies.bzl
@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@proxy_wasm_cpp_host//bazel/cargo:crates.bzl", "proxy_wasm_cpp_host_fetch_remote_crates")
 load("@rules_rust//rust:repositories.bzl", "rust_repositories")
 
 def proxy_wasm_cpp_host_dependencies():
+    protobuf_deps()
     rust_repositories()
     proxy_wasm_cpp_host_fetch_remote_crates()
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 1e861df7d..8824c55cb 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def proxy_wasm_cpp_host_repositories():
     http_archive(
         name = "proxy_wasm_cpp_sdk",
-        sha256 = "489768fb95ede507543ee5982610b541a2c5b57216695a9e5c2eb8c83c9d20a3",
-        strip_prefix = "proxy-wasm-cpp-sdk-9af5ac0145a8790f62ca501c43f6fa1ea24d2d93",
-        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/9af5ac0145a8790f62ca501c43f6fa1ea24d2d93.tar.gz"],
+        sha256 = "92521027a43ca79b62d92fae2f141ef0b7ce04ed4cdbfb7e226d7f1d289a80aa",
+        strip_prefix = "proxy-wasm-cpp-sdk-ebd7b1598021273964fa480720c7a7c750365f47",
+        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/ebd7b1598021273964fa480720c7a7c750365f47.tar.gz"],
     )
 
     http_archive(
@@ -36,6 +36,13 @@ def proxy_wasm_cpp_host_repositories():
         urls = ["https://github.com/google/googletest/archive/release-1.10.0.tar.gz"],
     )
 
+    http_archive(
+        name = "com_google_protobuf",
+        sha256 = "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2",
+        strip_prefix = "protobuf-3.17.3",
+        url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",
+    )
+
     http_archive(
         name = "com_github_bytecodealliance_wasm_micro_runtime",
         build_file = "@proxy_wasm_cpp_host//bazel/external:wamr.BUILD",
diff --git a/include/proxy-wasm/wasm_api_impl.h b/include/proxy-wasm/wasm_api_impl.h
index dd318c9ad..2529bf2db 100644
--- a/include/proxy-wasm/wasm_api_impl.h
+++ b/include/proxy-wasm/wasm_api_impl.h
@@ -17,6 +17,10 @@
 
 // Required by "proxy_wasm_api.h" included within null_plugin namespace.
 
+#ifdef PROXY_WASM_PROTOBUF
+#include "google/protobuf/message_lite.h"
+#endif
+
 #include <cstring>
 #include <functional>
 #include <memory>

From 2d98a5bf4143c9f00b05dc1ab6e19ddf1bdf76c3 Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Thu, 24 Jun 2021 15:36:37 -0700
Subject: [PATCH 2/2] review: use merged commit.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 bazel/repositories.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 8824c55cb..29c0c82cb 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def proxy_wasm_cpp_host_repositories():
     http_archive(
         name = "proxy_wasm_cpp_sdk",
-        sha256 = "92521027a43ca79b62d92fae2f141ef0b7ce04ed4cdbfb7e226d7f1d289a80aa",
-        strip_prefix = "proxy-wasm-cpp-sdk-ebd7b1598021273964fa480720c7a7c750365f47",
-        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/ebd7b1598021273964fa480720c7a7c750365f47.tar.gz"],
+        sha256 = "c57de2425b5c61d7f630c5061e319b4557ae1f1c7526e5a51c33dc1299471b08",
+        strip_prefix = "proxy-wasm-cpp-sdk-fd0be8405db25de0264bdb78fae3a82668c03782",
+        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/fd0be8405db25de0264bdb78fae3a82668c03782.tar.gz"],
     )
 
     http_archive(