diff --git a/WORKSPACE b/WORKSPACE index e89f6aa0b35..1314eb91596 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,12 +38,12 @@ 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: 2022-07-25 -ENVOY_SHA = "cc9bfc0b956cf2d53bc00675fdb11e4a505d3dd2" +# Commit date: 2022-09-14 +ENVOY_SHA = "0b10b055a6e1dbdd600f9a80f8b8d803bdd8ec9c" -ENVOY_SHA256 = "" +ENVOY_SHA256 = "85d41647adc94abdae50a0e47ba22c57638f6750bba03a62da4dcdb64eb9ec0f" -ENVOY_ORG = "istio" +ENVOY_ORG = "envoyproxy" ENVOY_REPO = "envoy" diff --git a/extensions/attributegen/plugin_test.cc b/extensions/attributegen/plugin_test.cc index b27235b84d4..f9869bda55d 100644 --- a/extensions/attributegen/plugin_test.cc +++ b/extensions/attributegen/plugin_test.cc @@ -186,14 +186,16 @@ class WasmHttpFilterTest : public testing::TestWithParam { plugin_, scope_, cluster_manager_, init_manager_, dispatcher_, *api, lifecycle_notifier_, remote_data_provider_, [this](WasmHandleSharedPtr wasm) { wasm_ = wasm; }, - [](Wasm* wasm, const std::shared_ptr& plugin) { + [](Wasm* wasm, + const std::shared_ptr& plugin) { return new TestRoot(wasm, plugin); }); if (wasm_) { plugin_handle_ = getOrCreateThreadLocalPlugin( wasm_, plugin_, dispatcher_, [root_context = &root_context_]( - Wasm* wasm, const std::shared_ptr& plugin) { + Wasm* wasm, + const std::shared_ptr& plugin) { *root_context = new TestRoot(wasm, plugin); return *root_context; }); diff --git a/extensions/common/BUILD b/extensions/common/BUILD index 96de39d8ca0..8dc9fd67a11 100644 --- a/extensions/common/BUILD +++ b/extensions/common/BUILD @@ -163,7 +163,10 @@ cc_library( hdrs = [":node_info_fbs"], features = ["-parse_headers"], linkstatic = True, - deps = ["@com_github_google_flatbuffers//:runtime_cc"], + deps = [ + "@com_github_google_flatbuffers//:flatbuffers", + "@com_github_google_flatbuffers//:runtime_cc", + ], ) envoy_cc_library( diff --git a/src/envoy/http/authn/http_filter.cc b/src/envoy/http/authn/http_filter.cc index acd67d93413..820ca1fdb50 100644 --- a/src/envoy/http/authn/http_filter.cc +++ b/src/envoy/http/authn/http_filter.cc @@ -89,7 +89,7 @@ FilterHeadersStatus AuthenticationFilter::decodeHeaders( if (!filter_config_.disable_clear_route_cache()) { // Clear the route cache after saving the dynamic metadata for routing // based on JWT claims. - decoder_callbacks_->clearRouteCache(); + decoder_callbacks_->downstreamCallbacks()->clearRouteCache(); ENVOY_LOG(debug, "Istio authn filter cleared route cache."); } }