From e1f41520a682d3eec08e9975fab0bda4dc0c20f8 Mon Sep 17 00:00:00 2001 From: Eitan Yarmush Date: Mon, 3 Jun 2024 13:57:49 +0000 Subject: [PATCH] rename to upstream_wait --- BUILD | 2 +- .../filter/http/{wait => upstream_wait}/v2/BUILD | 0 .../http/upstream_wait/v2/upstream_wait_filter.proto | 10 ++++++++++ .../config/filter/http/wait/v2/wait_filter.proto | 10 ---------- .../extensions/filters/http/solo_well_known_names.h | 2 +- .../filters/http/{wait => upstream_wait}/BUILD | 4 ++-- .../filters/http/{wait => upstream_wait}/config.cc | 10 +++++----- .../filters/http/{wait => upstream_wait}/config.h | 12 ++++++------ .../filters/http/{wait => upstream_wait}/filter.cc | 8 ++++---- .../filters/http/{wait => upstream_wait}/filter.h | 6 +++--- test/integration/BUILD | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) rename api/envoy/config/filter/http/{wait => upstream_wait}/v2/BUILD (100%) create mode 100644 api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.proto delete mode 100644 api/envoy/config/filter/http/wait/v2/wait_filter.proto rename source/extensions/filters/http/{wait => upstream_wait}/BUILD (89%) rename source/extensions/filters/http/{wait => upstream_wait}/config.cc (79%) rename source/extensions/filters/http/{wait => upstream_wait}/config.h (68%) rename source/extensions/filters/http/{wait => upstream_wait}/filter.cc (80%) rename source/extensions/filters/http/{wait => upstream_wait}/filter.h (90%) diff --git a/BUILD b/BUILD index 23e458b65..c64db02b9 100644 --- a/BUILD +++ b/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", ], ) diff --git a/api/envoy/config/filter/http/wait/v2/BUILD b/api/envoy/config/filter/http/upstream_wait/v2/BUILD similarity index 100% rename from api/envoy/config/filter/http/wait/v2/BUILD rename to api/envoy/config/filter/http/upstream_wait/v2/BUILD diff --git a/api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.proto b/api/envoy/config/filter/http/upstream_wait/v2/upstream_wait_filter.proto new file mode 100644 index 000000000..163ff93f2 --- /dev/null +++ b/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 {} diff --git a/api/envoy/config/filter/http/wait/v2/wait_filter.proto b/api/envoy/config/filter/http/wait/v2/wait_filter.proto deleted file mode 100644 index af08ba870..000000000 --- a/api/envoy/config/filter/http/wait/v2/wait_filter.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package envoy.config.filter.http.wait.v2; - -option java_package = "io.envoyproxy.envoy.config.filter.http.wait.v2"; -option java_outer_classname = "WaitFilterProto"; -option java_multiple_files = true; -option go_package = "wait"; - -message WaitFilterConfig {} diff --git a/source/extensions/filters/http/solo_well_known_names.h b/source/extensions/filters/http/solo_well_known_names.h index f36fc3d32..22e5b4dd1 100644 --- a/source/extensions/filters/http/solo_well_known_names.h +++ b/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 SoloHttpFilterNames; diff --git a/source/extensions/filters/http/wait/BUILD b/source/extensions/filters/http/upstream_wait/BUILD similarity index 89% rename from source/extensions/filters/http/wait/BUILD rename to source/extensions/filters/http/upstream_wait/BUILD index d652c5fbd..c9d4e8e97 100644 --- a/source/extensions/filters/http/wait/BUILD +++ b/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", diff --git a/source/extensions/filters/http/wait/config.cc b/source/extensions/filters/http/upstream_wait/config.cc similarity index 79% rename from source/extensions/filters/http/wait/config.cc rename to source/extensions/filters/http/upstream_wait/config.cc index 23fb24701..572f3a5b7 100644 --- a/source/extensions/filters/http/wait/config.cc +++ b/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 @@ -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 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 diff --git a/source/extensions/filters/http/wait/config.h b/source/extensions/filters/http/upstream_wait/config.h similarity index 68% rename from source/extensions/filters/http/wait/config.h rename to source/extensions/filters/http/upstream_wait/config.h index c94c5c6c8..05429f2e2 100644 --- a/source/extensions/filters/http/wait/config.h +++ b/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 { + : public Common::DualFactoryBase { public: WaitFilterConfigFactory() : DualFactoryBase(SoloHttpFilterNames::get().Wait) {} private: absl::StatusOr 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 diff --git a/source/extensions/filters/http/wait/filter.cc b/source/extensions/filters/http/upstream_wait/filter.cc similarity index 80% rename from source/extensions/filters/http/wait/filter.cc rename to source/extensions/filters/http/upstream_wait/filter.cc index 3c6cbfb53..95d448946 100644 --- a/source/extensions/filters/http/wait/filter.cc +++ b/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 diff --git a/source/extensions/filters/http/wait/filter.h b/source/extensions/filters/http/upstream_wait/filter.h similarity index 90% rename from source/extensions/filters/http/wait/filter.h rename to source/extensions/filters/http/upstream_wait/filter.h index 1fe3c6d45..ce1137a78 100644 --- a/source/extensions/filters/http/wait/filter.h +++ b/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, @@ -48,7 +48,7 @@ class WaitingFilter : public Http::StreamDecoderFilter, bool paused_iteration_{false}; }; -} // namespace Wait +} // namespace UpstreamWait } // namespace HttpFilters } // namespace Extensions } // namespace Envoy diff --git a/test/integration/BUILD b/test/integration/BUILD index 0e55ac1cf..a07a1ae51 100644 --- a/test/integration/BUILD +++ b/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",