Skip to content

config: add workarounds for the protobuf string type mismatch. #3142

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
mattklein123 merged 1 commit into from
Apr 20, 2018
Merged

config: add workarounds for the protobuf string type mismatch. #3142

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
3 changes: 2 additions & 1 deletion source/common/router/config_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,8 @@ ConfigImpl::ConfigImpl(const envoy::api::v2::RouteConfiguration& config, Runtime
config.response_headers_to_remove());
}

PerFilterConfigs::PerFilterConfigs(const Protobuf::Map<std::string, ProtobufWkt::Struct>& configs) {
PerFilterConfigs::PerFilterConfigs(
const Protobuf::Map<ProtobufTypes::String, ProtobufWkt::Struct>& configs) {
for (const auto& cfg : configs) {
const std::string& name = cfg.first;
const ProtobufWkt::Struct& struct_config = cfg.second;
Expand Down
2 changes: 1 addition & 1 deletion source/common/router/config_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Matchable {

class PerFilterConfigs {
public:
PerFilterConfigs(const Protobuf::Map<std::string, ProtobufWkt::Struct>& configs);
PerFilterConfigs(const Protobuf::Map<ProtobufTypes::String, ProtobufWkt::Struct>& configs);

const RouteSpecificFilterConfig* get(const std::string& name) const;

Expand Down
2 changes: 1 addition & 1 deletion source/common/upstream/health_checker_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ HealthCheckerFactory::create(const envoy::api::v2::core::HealthCheck& hc_config,
Config::Utility::getAndCheckFactory<Server::Configuration::CustomHealthCheckerFactory>(
hc_config.has_redis_health_check()
? Extensions::HealthCheckers::HealthCheckerNames::get().REDIS_HEALTH_CHECKER
: hc_config.custom_health_check().name());
: std::string(hc_config.custom_health_check().name()));
std::unique_ptr<Server::Configuration::HealthCheckerFactoryContext> context(
new HealthCheckerFactoryContextImpl(cluster, runtime, random, dispatcher));
return factory.createCustomHealthChecker(hc_config, *context);
Expand Down