Update envoy sha (istio#3111)

* update envoy sha * format * update
twghu · Nov 23, 2020 · 08e4256 · 08e4256
1 parent 61d3648
commit 08e4256
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 21 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -38,10 +38,10 @@ bind(
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
 # Note: this is needed by release builder to resolve envoy dep sha to tag.
-# Commit date: 2020-11-09
-ENVOY_SHA = "7a15e5d200f9e4e5f5cfe0347fe1c337e534be4b"
+# Commit date: 2020-11-20
+ENVOY_SHA = "31e225b628a316322a0bcbd237a143eade995d22"
 
-ENVOY_SHA256 = "898b7954622d81883f59788a3bcb8d0b606f4aacc0b8914fe12721e93ebcb827"
+ENVOY_SHA256 = "079516e413c07e2ca19374c9baa1cafe7c6ee1b160e74c6427b9fee0709fa953"
 
 ENVOY_ORG = "envoyproxy"
 

diff --git a/envoy.bazelrc b/envoy.bazelrc
@@ -246,7 +246,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b480535e8423b5fd7c102fd30c92f4785519e33a
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:19a268cfe3d12625380e7c61d2467c8779b58b56
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

diff --git a/extensions/access_log_policy/BUILD b/extensions/access_log_policy/BUILD
@@ -24,6 +24,6 @@ envoy_cc_library(
         "//extensions/common:context",
         "//extensions/common:istio_dimensions",
         "@envoy//source/common/common:base64_lib",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
diff --git a/extensions/attributegen/BUILD b/extensions/attributegen/BUILD
@@ -42,7 +42,7 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":config_cc_proto",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
         "@proxy_wasm_cpp_sdk//contrib:contrib_lib",
     ],
 )
@@ -70,6 +70,7 @@ envoy_extension_cc_test(
     deps = [
         ":attributegen_plugin",
         "@envoy//source/extensions/filters/http/wasm:wasm_filter_lib",
+        "@envoy//test/extensions/common/wasm:wasm_runtime",
         "@envoy//test/mocks/grpc:grpc_mocks",
         "@envoy//test/mocks/http:http_mocks",
         "@envoy//test/mocks/network:network_mocks",

diff --git a/extensions/attributegen/plugin_test.cc b/extensions/attributegen/plugin_test.cc
@@ -53,6 +53,7 @@ namespace HttpFilters {
 namespace Wasm {
 
 using envoy::config::core::v3::TrafficDirection;
+using Envoy::Extensions::Common::Wasm::PluginHandleSharedPtr;
 using Envoy::Extensions::Common::Wasm::PluginSharedPtr;
 using Envoy::Extensions::Common::Wasm::Wasm;
 using Envoy::Extensions::Common::Wasm::WasmHandleSharedPtr;
@@ -194,23 +195,24 @@ class WasmHttpFilterTest : public testing::TestWithParam<TestParams> {
           return new TestRoot(wasm, plugin);
         });
     if (wasm_) {
-      wasm_ = getOrCreateThreadLocalWasm(
+      plugin_handle_ = getOrCreateThreadLocalPlugin(
           wasm_, plugin_, dispatcher_,
           [root_context = &root_context_](
               Wasm* wasm, const std::shared_ptr<Common::Wasm::Plugin>& plugin) {
             *root_context = new TestRoot(wasm, plugin);
             return *root_context;
           });
+      wasm_ = plugin_handle_->wasmHandleForTest();
     }
     if (!c.do_not_add_filter) {
-      setupFilter(c.root_id);
+      setupFilter();
     }
   }
 
-  void setupFilter(const std::string root_id = "") {
-    filter_ = std::make_unique<TestFilter>(
-        wasm_->wasm().get(), wasm_->wasm()->getRootContext(root_id)->id(),
-        plugin_);
+  void setupFilter() {
+    auto wasm = wasm_ ? wasm_->wasm().get() : nullptr;
+    int root_context_id = wasm ? wasm->getRootContext(plugin_, false)->id() : 0;
+    filter_ = std::make_unique<TestFilter>(wasm, root_context_id, plugin_);
     filter_->setDecoderFilterCallbacks(decoder_callbacks_);
     filter_->setEncoderFilterCallbacks(encoder_callbacks_);
 
@@ -258,6 +260,7 @@ class WasmHttpFilterTest : public testing::TestWithParam<TestParams> {
   NiceMock<Init::MockManager> init_manager_;
   WasmHandleSharedPtr wasm_;
   PluginSharedPtr plugin_;
+  PluginHandleSharedPtr plugin_handle_;
   std::unique_ptr<TestFilter> filter_;
   NiceMock<Envoy::Ssl::MockConnectionInfo> ssl_;
   NiceMock<Envoy::Network::MockConnection> connection_;

diff --git a/extensions/common/BUILD b/extensions/common/BUILD
@@ -47,7 +47,7 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":node_info_fb_cc",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 
@@ -64,7 +64,7 @@ envoy_cc_library(
     deps = [
         ":node_info_fb_cc",
         "@com_google_protobuf//:protobuf",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 

diff --git a/extensions/metadata_exchange/BUILD b/extensions/metadata_exchange/BUILD
@@ -29,7 +29,7 @@ envoy_cc_library(
         "//extensions/common:proto_util",
         "@envoy//source/common/common:base64_lib",
         "@envoy//source/extensions/common/wasm/ext:declare_property_cc_proto",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 

diff --git a/extensions/stackdriver/BUILD b/extensions/stackdriver/BUILD
@@ -43,7 +43,7 @@ envoy_cc_library(
         "//extensions/stackdriver/log:logger",
         "//extensions/stackdriver/metric",
         "@io_opencensus_cpp//opencensus/exporters/stats/stackdriver:stackdriver_exporter",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
         "@proxy_wasm_cpp_sdk//contrib:contrib_lib",
     ],
 )
diff --git a/extensions/stackdriver/common/BUILD b/extensions/stackdriver/common/BUILD
@@ -74,6 +74,6 @@ envoy_cc_library(
         "//extensions/stackdriver/log:__pkg__",
     ],
     deps = [
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
diff --git a/extensions/stackdriver/edges/BUILD b/extensions/stackdriver/edges/BUILD
@@ -67,7 +67,7 @@ envoy_cc_library(
         "//extensions/stackdriver/common:constants",
         "//extensions/stackdriver/common:metrics",
         "//extensions/stackdriver/common:utils",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 
@@ -86,7 +86,7 @@ envoy_cc_library(
         ":mesh_edges_service_client",
         "//extensions/common:context",
         "//extensions/stackdriver/common:constants",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 

diff --git a/extensions/stackdriver/log/BUILD b/extensions/stackdriver/log/BUILD
@@ -60,7 +60,7 @@ envoy_cc_library(
         "//extensions/stackdriver/common:metrics",
         "//extensions/stackdriver/common:utils",
         "@com_google_googleapis//google/logging/v2:logging_cc_proto",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 

diff --git a/extensions/stats/BUILD b/extensions/stats/BUILD
@@ -39,7 +39,7 @@ envoy_cc_library(
     deps = [
         "//extensions/common:context",
         "//extensions/common:json_util",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
         "@proxy_wasm_cpp_sdk//contrib:contrib_lib",
     ],
 )