rename to upstream_wait

BUILD

@@ -19,7 +19,7 @@ envoy_cc_library(
  "//source/extensions/transformers/aws_lambda:api_gateway_transformer_lib",
  "//source/extensions/filters/http/nats/streaming:nats_streaming_filter_config_lib",
  "//source/extensions/filters/http/transformation:transformation_filter_config_lib",
- "//source/extensions/filters/http/wait:config",
+ "//source/extensions/filters/http/upstream_wait:config",
  ],
 )
 

api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package envoy.config.filter.http.upstream_wait.v2;
+
+option java_package = "io.envoyproxy.envoy.config.filter.http.upstream_wait.v2";
+option java_outer_classname = "UpstreamWaitFilterProto";
+option java_multiple_files = true;
+option go_package = "upstream_wait";
+
+message UpstreamWaitFilterConfig {}

source/extensions/filters/http/solo_well_known_names.h

@@ -27,7 +27,7 @@ class SoloHttpFilterNameValues {
  // TODO(talnordan): Consider "io.solo.filters.http.transformation".
  const std::string Transformation = "io.solo.transformation";
  // Wait filter
- const std::string Wait = "io.solo.wait";
+ const std::string Wait = "io.solo.upstream_wait";
 };
 
 typedef ConstSingleton<SoloHttpFilterNameValues> SoloHttpFilterNames;

source/extensions/filters/http/wait/BUILD → source/extensions/filters/http/upstream_wait/BUILD

@@ -22,7 +22,7 @@ envoy_cc_library(
  deps = [
  ":filter",
  "//source/extensions/filters/http:solo_well_known_names",
- "//api/envoy/config/filter/http/wait/v2:pkg_cc_proto",
+ "//api/envoy/config/filter/http/upstream_wait/v2:pkg_cc_proto",
  "@envoy//envoy/router:router_interface",
  "@envoy//envoy/config:typed_config_interface",
  "@envoy//source/common/protobuf:message_validator_lib",
@@ -40,7 +40,7 @@ envoy_cc_library(
  repository = "@envoy",
  deps = [
  "//source/extensions/filters/http:solo_well_known_names",
- "//api/envoy/config/filter/http/wait/v2:pkg_cc_proto",
+ "//api/envoy/config/filter/http/upstream_wait/v2:pkg_cc_proto",
  "@envoy//envoy/router:router_interface",
  "@envoy//envoy/config:typed_config_interface",
  "@envoy//source/common/protobuf:message_validator_lib",

source/extensions/filters/http/wait/config.cc → source/extensions/filters/http/upstream_wait/config.cc

@@ -1,4 +1,4 @@
-#include "source/extensions/filters/http/wait/config.h"
+#include "source/extensions/filters/http/upstream_wait/config.h"
 
 #include <string>
 
@@ -7,16 +7,16 @@
 #include "source/common/common/macros.h"
 #include "source/common/protobuf/utility.h"
 
-#include "source/extensions/filters/http/wait/filter.h"
+#include "source/extensions/filters/http/upstream_wait/filter.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
-namespace Wait {
+namespace UpstreamWait {
 
 absl::StatusOr<Http::FilterFactoryCb>
 WaitFilterConfigFactory::createFilterFactoryFromProtoTyped(
- const WaitFilterConfig &,
+ const UpstreamWaitFilterConfig &,
  const std::string &, DualInfo,
  Server::Configuration::ServerFactoryContext &) {
 
@@ -33,7 +33,7 @@ WaitFilterConfigFactory::createFilterFactoryFromProtoTyped(
 REGISTER_FACTORY(WaitFilterConfigFactory,
  Server::Configuration::UpstreamHttpFilterConfigFactory);
 
-} // namespace Wait
+} // namespace UpstreamWait
 } // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/wait/config.h → source/extensions/filters/http/upstream_wait/config.h

@@ -7,30 +7,30 @@
 #include "source/extensions/filters/http/common/factory_base.h"
 #include "source/extensions/filters/http/solo_well_known_names.h"
 
-#include "api/envoy/config/filter/http/wait/v2/wait_filter.pb.validate.h"
+#include "api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.pb.validate.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
-namespace Wait {
+namespace UpstreamWait {
 
 // using Extensions::HttpFilters::Common::FactoryBase;
-using ::envoy::config::filter::http::wait::v2::WaitFilterConfig;
+using ::envoy::config::filter::http::upstream_wait::v2::UpstreamWaitFilterConfig;
 
 class WaitFilterConfigFactory
- : public Common::DualFactoryBase<WaitFilterConfig> {
+ : public Common::DualFactoryBase<UpstreamWaitFilterConfig> {
 public:
  WaitFilterConfigFactory()
  : DualFactoryBase(SoloHttpFilterNames::get().Wait) {}
 
 private:
  absl::StatusOr<Http::FilterFactoryCb> createFilterFactoryFromProtoTyped(
- const WaitFilterConfig &proto_config,
+ const UpstreamWaitFilterConfig &proto_config,
  const std::string &stats_prefix, DualInfo info,
  Server::Configuration::ServerFactoryContext &context) override;
 };
 
-} // namespace Wait
+} // namespace UpstreamWait
 } // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/wait/filter.cc → source/extensions/filters/http/upstream_wait/filter.cc

@@ -1,11 +1,11 @@
 #include "envoy/server/filter_config.h"
-#include "source/extensions/filters/http/wait/filter.h"
-#include "api/envoy/config/filter/http/wait/v2/wait_filter.pb.validate.h"
+#include "source/extensions/filters/http/upstream_wait/filter.h"
+#include "api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.pb.validate.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
-namespace Wait {
+namespace UpstreamWait {
 
 WaitingFilter::WaitingFilter() {}
 
@@ -33,7 +33,7 @@ WaitingFilter::decodeHeaders(Http::RequestHeaderMap &,
  return Http::FilterHeadersStatus::Continue;
 }
 
-} // namespace Wait
+} // namespace UpstreamWait
 } // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/wait/filter.h → source/extensions/filters/http/upstream_wait/filter.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include "envoy/server/filter_config.h"
-#include "api/envoy/config/filter/http/wait/v2/wait_filter.pb.validate.h"
+#include "api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.pb.validate.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
-namespace Wait {
+namespace UpstreamWait {
 
 class WaitingFilter : public Http::StreamDecoderFilter,
  Logger::Loggable<Logger::Id::filter>,
@@ -48,7 +48,7 @@ class WaitingFilter : public Http::StreamDecoderFilter,
  bool paused_iteration_{false};
 };
 
-} // namespace Wait
+} // namespace UpstreamWait
 } // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

test/integration/BUILD

@@ -34,7 +34,7 @@ envoy_gloo_cc_test(
  repository = "@envoy",
  deps = [
  "//source/extensions/filters/http/transformation:transformation_filter_config_lib",
- "//source/extensions/filters/http/wait:config",
+ "//source/extensions/filters/http/upstream_wait:config",
  "//source/extensions/filters/http:solo_well_known_names",
  "@envoy//test/integration:http_integration_lib",
  "@envoy//test/integration:integration_lib",