Merge branch 'master' into FactoryPluginImplementation

Signed-off-by: William Juan <[email protected]>
envoyproxy · Nov 11, 2020 · dc5d9c8 · dc5d9c8
2 parents b6b5b64 + 683ef62
commit dc5d9c8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -34,7 +34,8 @@ function do_test() {
 }
 
 function do_clang_tidy() {
-    ci/run_clang_tidy.sh
+    # TODO(#546): deflake clang tidy runs, and remove '|| true' here.
+    ci/run_clang_tidy.sh || true
 }
 
 function do_unit_test_coverage() {

diff --git 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
@@ -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<Envoy::Http::Code>(500),

diff --git 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
@@ -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<EffectiveFilterConfigurationPtr> 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
@@ -31,15 +31,15 @@ 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;
 }
 
 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;