From 5a8ed1099bde57168a9d4b965c3879e458a4e039 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Fri, 6 Nov 2020 08:39:02 +0530 Subject: [PATCH] chore: enhance naming of bool maybeSendErrorReply Signed-off-by: Kush Trivedi --- source/server/http_dynamic_delay_filter.cc | 4 ++-- source/server/http_filter_config_base.cc | 2 +- source/server/http_filter_config_base.h | 2 +- source/server/http_test_server_filter.cc | 4 ++-- source/server/http_time_tracking_filter.cc | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/server/http_dynamic_delay_filter.cc b/source/server/http_dynamic_delay_filter.cc index ebc3254fc..9536b8434 100644 --- a/source/server/http_dynamic_delay_filter.cc +++ b/source/server/http_dynamic_delay_filter.cc @@ -47,7 +47,7 @@ HttpDynamicDelayDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& head maybeRequestFaultFilterDelay(delay_ms, headers); } else { if (end_stream) { - config_->maybeSendErrorReply(*decoder_callbacks_); + config_->validateOrSendError(*decoder_callbacks_); return Envoy::Http::FilterHeadersStatus::StopIteration; } return Envoy::Http::FilterHeadersStatus::Continue; @@ -59,7 +59,7 @@ Envoy::Http::FilterDataStatus HttpDynamicDelayDecoderFilter::decodeData(Envoy::Buffer::Instance& buffer, bool end_stream) { if (!config_->getEffectiveConfiguration().ok()) { if (end_stream) { - config_->maybeSendErrorReply(*decoder_callbacks_); + config_->validateOrSendError(*decoder_callbacks_); return Envoy::Http::FilterDataStatus::StopIterationNoBuffer; } return Envoy::Http::FilterDataStatus::Continue; diff --git a/source/server/http_filter_config_base.cc b/source/server/http_filter_config_base.cc index b76505023..0c8396139 100644 --- a/source/server/http_filter_config_base.cc +++ b/source/server/http_filter_config_base.cc @@ -33,7 +33,7 @@ void FilterConfigurationBase::computeEffectiveConfiguration( } } -bool FilterConfigurationBase::maybeSendErrorReply( +bool FilterConfigurationBase::validateOrSendError( Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const { if (!effective_config_.ok()) { decoder_callbacks.sendLocalReply(static_cast(500), diff --git a/source/server/http_filter_config_base.h b/source/server/http_filter_config_base.h index 9f3f700fe..7569df17a 100644 --- a/source/server/http_filter_config_base.h +++ b/source/server/http_filter_config_base.h @@ -52,7 +52,7 @@ class FilterConfigurationBase { * @param decoder_callbacks Decoder used to generate the reply. * @return true iff an error reply was generated. */ - bool maybeSendErrorReply(Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const; + bool validateOrSendError(Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const; /** * @brief Get the effective configuration. Depending on state ,this could be one of static diff --git a/source/server/http_test_server_filter.cc b/source/server/http_test_server_filter.cc index 5dd51851a..bac840bc1 100644 --- a/source/server/http_test_server_filter.cc +++ b/source/server/http_test_server_filter.cc @@ -40,7 +40,7 @@ HttpTestServerDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& header bool end_stream) { config_->computeEffectiveConfiguration(headers); if (end_stream) { - if (!config_->maybeSendErrorReply(*decoder_callbacks_)) { + if (!config_->validateOrSendError(*decoder_callbacks_)) { const absl::StatusOr effective_config = config_->getEffectiveConfiguration(); if (effective_config.value()->echo_request_headers()) { @@ -57,7 +57,7 @@ HttpTestServerDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& header Envoy::Http::FilterDataStatus HttpTestServerDecoderFilter::decodeData(Envoy::Buffer::Instance&, bool end_stream) { if (end_stream) { - if (!config_->maybeSendErrorReply(*decoder_callbacks_)) { + if (!config_->validateOrSendError(*decoder_callbacks_)) { sendReply(*config_->getEffectiveConfiguration().value()); } } diff --git a/source/server/http_time_tracking_filter.cc b/source/server/http_time_tracking_filter.cc index aba57d46f..a6d787f02 100644 --- a/source/server/http_time_tracking_filter.cc +++ b/source/server/http_time_tracking_filter.cc @@ -31,7 +31,7 @@ HttpTimeTrackingFilter::HttpTimeTrackingFilter(HttpTimeTrackingFilterConfigShare Envoy::Http::FilterHeadersStatus HttpTimeTrackingFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& headers, bool end_stream) { config_->computeEffectiveConfiguration(headers); - if (end_stream && config_->maybeSendErrorReply(*decoder_callbacks_)) { + if (end_stream && config_->validateOrSendError(*decoder_callbacks_)) { return Envoy::Http::FilterHeadersStatus::StopIteration; } return Envoy::Http::FilterHeadersStatus::Continue; @@ -39,7 +39,7 @@ HttpTimeTrackingFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& headers, bo Envoy::Http::FilterDataStatus HttpTimeTrackingFilter::decodeData(Envoy::Buffer::Instance&, bool end_stream) { - if (end_stream && config_->maybeSendErrorReply(*decoder_callbacks_)) { + if (end_stream && config_->validateOrSendError(*decoder_callbacks_)) { return Envoy::Http::FilterDataStatus::StopIterationNoBuffer; } return Envoy::Http::FilterDataStatus::Continue;