From ad3391e27e7b4588194b2cbfa36f78a472bb2908 Mon Sep 17 00:00:00 2001 From: Wayne Zhang Date: Fri, 4 May 2018 21:03:13 +0000 Subject: [PATCH] Update Envoy sha to 2b2c299144600fb9e525d21aabf39bf48e64fb1f --- WORKSPACE | 4 +--- istio.deps | 2 +- src/envoy/http/authn/http_filter_factory.cc | 10 +++++----- src/envoy/http/jwt_auth/http_filter_factory.cc | 12 ++++++------ .../http_filter_integration_test.cc | 2 -- src/envoy/http/mixer/filter_factory.cc | 18 ++++++++++-------- src/envoy/tcp/mixer/filter_factory.cc | 10 +++++----- 7 files changed, 28 insertions(+), 30 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c6a795745f0..b864fa6513a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,7 +38,7 @@ git_repository( ) # When updating envoy sha manually please update the sha in istio.deps file also -ENVOY_SHA = "d338e45e31be628f19c895003d0aeee6be18d32f" +ENVOY_SHA = "2b2c299144600fb9e525d21aabf39bf48e64fb1f" http_archive( name = "envoy", @@ -60,8 +60,6 @@ load("@com_lyft_protoc_gen_validate//bazel:go_proto_library.bzl", "go_proto_repo go_proto_repositories(shared=0) go_rules_dependencies() go_register_toolchains() -load("@io_bazel_rules_go//proto:def.bzl", "proto_register_toolchains") -proto_register_toolchains() load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( diff --git a/istio.deps b/istio.deps index dccaf244e85..e1de0566466 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "d338e45e31be628f19c895003d0aeee6be18d32f" + "lastStableSHA": "2b2c299144600fb9e525d21aabf39bf48e64fb1f" } ] \ No newline at end of file diff --git a/src/envoy/http/authn/http_filter_factory.cc b/src/envoy/http/authn/http_filter_factory.cc index 18ce537248b..dcf344fac78 100644 --- a/src/envoy/http/authn/http_filter_factory.cc +++ b/src/envoy/http/authn/http_filter_factory.cc @@ -34,9 +34,9 @@ const std::string kAuthnFactoryName("istio_authn"); class AuthnFilterConfig : public NamedHttpFilterConfigFactory, public Logger::Loggable { public: - HttpFilterFactoryCb createFilterFactory(const Json::Object& config, - const std::string&, - FactoryContext&) override { + Http::FilterFactoryCb createFilterFactory(const Json::Object& config, + const std::string&, + FactoryContext&) override { ENVOY_LOG(debug, "Called AuthnFilterConfig : {}", __func__); google::protobuf::util::Status status = @@ -54,7 +54,7 @@ class AuthnFilterConfig : public NamedHttpFilterConfigFactory, } } - HttpFilterFactoryCb createFilterFactoryFromProto( + Http::FilterFactoryCb createFilterFactoryFromProto( const Protobuf::Message& proto_config, const std::string&, FactoryContext&) override { filter_config_ = dynamic_cast(proto_config); @@ -69,7 +69,7 @@ class AuthnFilterConfig : public NamedHttpFilterConfigFactory, std::string name() override { return kAuthnFactoryName; } private: - HttpFilterFactoryCb createFilter() { + Http::FilterFactoryCb createFilter() { ENVOY_LOG(debug, "Called AuthnFilterConfig : {}", __func__); return [&](Http::FilterChainFactoryCallbacks& callbacks) -> void { diff --git a/src/envoy/http/jwt_auth/http_filter_factory.cc b/src/envoy/http/jwt_auth/http_filter_factory.cc index 4656902e786..018b8a65788 100644 --- a/src/envoy/http/jwt_auth/http_filter_factory.cc +++ b/src/envoy/http/jwt_auth/http_filter_factory.cc @@ -27,15 +27,15 @@ namespace Configuration { class JwtVerificationFilterConfig : public NamedHttpFilterConfigFactory { public: - HttpFilterFactoryCb createFilterFactory(const Json::Object& config, - const std::string&, - FactoryContext& context) override { + Http::FilterFactoryCb createFilterFactory(const Json::Object& config, + const std::string&, + FactoryContext& context) override { JwtAuthentication proto_config; MessageUtil::loadFromJson(config.asJsonString(), proto_config); return createFilter(proto_config, context); } - HttpFilterFactoryCb createFilterFactoryFromProto( + Http::FilterFactoryCb createFilterFactoryFromProto( const Protobuf::Message& proto_config, const std::string&, FactoryContext& context) override { return createFilter( @@ -51,8 +51,8 @@ class JwtVerificationFilterConfig : public NamedHttpFilterConfigFactory { std::string name() override { return "jwt-auth"; } private: - HttpFilterFactoryCb createFilter(const JwtAuthentication& proto_config, - FactoryContext& context) { + Http::FilterFactoryCb createFilter(const JwtAuthentication& proto_config, + FactoryContext& context) { auto store_factory = std::make_shared( proto_config, context); Upstream::ClusterManager& cm = context.clusterManager(); diff --git a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc index c750f014629..5d53ba3cff3 100644 --- a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc +++ b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc @@ -358,8 +358,6 @@ INSTANTIATE_TEST_CASE_P( TEST_P(JwtVerificationFilterIntegrationTestWithInjectedJwtResult, InjectedJwtResultSanitized) { - // Issuer is not called by passing empty pubkey. - std::string pubkey = ""; // Create a request without JWT. // With allow_missing_or_failed option being true, a request without JWT // will reach the backend. This is to test the injected JWT result. diff --git a/src/envoy/http/mixer/filter_factory.cc b/src/envoy/http/mixer/filter_factory.cc index f8a5165a342..4f045d479ba 100644 --- a/src/envoy/http/mixer/filter_factory.cc +++ b/src/envoy/http/mixer/filter_factory.cc @@ -30,9 +30,9 @@ namespace Configuration { class MixerConfigFactory : public NamedHttpFilterConfigFactory { public: - HttpFilterFactoryCb createFilterFactory(const Json::Object& config_json, - const std::string& prefix, - FactoryContext& context) override { + Http::FilterFactoryCb createFilterFactory(const Json::Object& config_json, + const std::string& prefix, + FactoryContext& context) override { HttpClientConfig config_pb; if (!Utils::ReadV2Config(config_json, &config_pb) && !Utils::ReadV1Config(config_json, &config_pb)) { @@ -42,7 +42,7 @@ class MixerConfigFactory : public NamedHttpFilterConfigFactory { return createFilterFactory(config_pb, prefix, context); } - HttpFilterFactoryCb createFilterFactoryFromProto( + Http::FilterFactoryCb createFilterFactoryFromProto( const Protobuf::Message& proto_config, const std::string& prefix, FactoryContext& context) override { return createFilterFactory( @@ -58,7 +58,9 @@ class MixerConfigFactory : public NamedHttpFilterConfigFactory { } Router::RouteSpecificFilterConfigConstSharedPtr - createRouteSpecificFilterConfig(const Protobuf::Message& config) override { + createRouteSpecificFilterConfig( + const Protobuf::Message& config, + Envoy::Server::Configuration::FactoryContext&) override { auto obj = std::make_shared(); // TODO: use downcastAndValidate once client_config.proto adds validate // rules. @@ -70,9 +72,9 @@ class MixerConfigFactory : public NamedHttpFilterConfigFactory { std::string name() override { return "mixer"; } private: - HttpFilterFactoryCb createFilterFactory(const HttpClientConfig& config_pb, - const std::string&, - FactoryContext& context) { + Http::FilterFactoryCb createFilterFactory(const HttpClientConfig& config_pb, + const std::string&, + FactoryContext& context) { std::unique_ptr config_obj( new Http::Mixer::Config(config_pb)); auto control_factory = std::make_shared( diff --git a/src/envoy/tcp/mixer/filter_factory.cc b/src/envoy/tcp/mixer/filter_factory.cc index 7290226c1f8..fe9732a8865 100644 --- a/src/envoy/tcp/mixer/filter_factory.cc +++ b/src/envoy/tcp/mixer/filter_factory.cc @@ -26,8 +26,8 @@ namespace Configuration { class FilterFactory : public NamedNetworkFilterConfigFactory { public: - NetworkFilterFactoryCb createFilterFactory(const Json::Object& config_json, - FactoryContext& context) override { + Network::FilterFactoryCb createFilterFactory( + const Json::Object& config_json, FactoryContext& context) override { TcpClientConfig config_pb; if (!Utils::ReadV2Config(config_json, &config_pb) && !Utils::ReadV1Config(config_json, &config_pb)) { @@ -37,7 +37,7 @@ class FilterFactory : public NamedNetworkFilterConfigFactory { return createFilterFactory(config_pb, context); } - NetworkFilterFactoryCb createFilterFactoryFromProto( + Network::FilterFactoryCb createFilterFactoryFromProto( const Protobuf::Message& config, FactoryContext& context) override { return createFilterFactory(dynamic_cast(config), context); @@ -50,8 +50,8 @@ class FilterFactory : public NamedNetworkFilterConfigFactory { std::string name() override { return "mixer"; } private: - NetworkFilterFactoryCb createFilterFactory(const TcpClientConfig& config_pb, - FactoryContext& context) { + Network::FilterFactoryCb createFilterFactory(const TcpClientConfig& config_pb, + FactoryContext& context) { std::unique_ptr config_obj( new Tcp::Mixer::Config(config_pb));