Skip to content

Update Envoy sha to 2b2c299144600fb9e525d21aabf39bf48e64fb1f #1734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiwzhang merged 1 commit into from
May 4, 2018
Merged

Update Envoy sha to 2b2c299144600fb9e525d21aabf39bf48e64fb1f #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "d338e45e31be628f19c895003d0aeee6be18d32f"
"lastStableSHA": "2b2c299144600fb9e525d21aabf39bf48e64fb1f"
}
]
10 changes: 5 additions & 5 deletions src/envoy/http/authn/http_filter_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ const std::string kAuthnFactoryName("istio_authn");
class AuthnFilterConfig : public NamedHttpFilterConfigFactory,
public Logger::Loggable<Logger::Id::filter> {
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 =
Expand All @@ -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<const FilterConfig&>(proto_config);
Expand All @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions src/envoy/http/jwt_auth/http_filter_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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<Http::JwtAuth::JwtAuthStoreFactory>(
proto_config, context);
Upstream::ClusterManager& cm = context.clusterManager();
Expand Down
2 changes: 0 additions & 2 deletions src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 10 additions & 8 deletions src/envoy/http/mixer/filter_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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(
Expand All @@ -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<Http::Mixer::PerRouteServiceConfig>();
// TODO: use downcastAndValidate once client_config.proto adds validate
// rules.
Expand All @@ -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<Http::Mixer::Config> config_obj(
new Http::Mixer::Config(config_pb));
auto control_factory = std::make_shared<Http::Mixer::ControlFactory>(
Expand Down
10 changes: 5 additions & 5 deletions src/envoy/tcp/mixer/filter_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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<const TcpClientConfig&>(config),
context);
Expand All @@ -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<Tcp::Mixer::Config> config_obj(
new Tcp::Mixer::Config(config_pb));

Expand Down