tests: rename addFilter() to prependFilter()

contrib/squash/filters/http/test/squash_filter_integration_test.cc

@@ -82,7 +82,7 @@ class SquashFilterIntegrationTest : public testing::TestWithParam<Network::Addre
 
     autonomous_upstream_ = true;
 
-    config_helper_.addFilter(ConfigHelper::defaultSquashFilter());
+    config_helper_.prependFilter(ConfigHelper::defaultSquashFilter());
 
     config_helper_.addConfigModifier([](envoy::config::bootstrap::v3::Bootstrap& bootstrap) {
       auto* squash_cluster = bootstrap.mutable_static_resources()->add_clusters();

test/config/utility.cc

@@ -1037,7 +1037,9 @@ void ConfigHelper::addVirtualHost(const envoy::config::route::v3::VirtualHost& v
   storeHttpConnectionManager(hcm_config);
 }
 
-void ConfigHelper::addFilter(const std::string& config) {
+void ConfigHelper::addFilter(const std::string& config) { prependFilter(config); }
+
+void ConfigHelper::prependFilter(const std::string& config) {
   RELEASE_ASSERT(!finalized_, "");
   envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager
       hcm_config;

test/config/utility.h

@@ -127,13 +127,13 @@ class ConfigHelper {
   static std::string httpProxyConfig(bool downstream_use_quic = false);
   // A basic configuration for L7 proxying with QUIC transport.
   static std::string quicHttpProxyConfig();
-  // A string for a basic buffer filter, which can be used with addFilter()
+  // A string for a basic buffer filter, which can be used with prependFilter()
   static std::string defaultBufferFilter();
-  // A string for a small buffer filter, which can be used with addFilter()
+  // A string for a small buffer filter, which can be used with prependFilter()
   static std::string smallBufferFilter();
-  // A string for a health check filter which can be used with addFilter()
+  // A string for a health check filter which can be used with prependFilter()
   static std::string defaultHealthCheckFilter();
-  // A string for a squash filter which can be used with addFilter()
+  // A string for a squash filter which can be used with prependFilter()
   static std::string defaultSquashFilter();
   // A string for startTls transport socket config.
   static std::string startTlsConfig();
@@ -213,6 +213,10 @@ class ConfigHelper {
   void addVirtualHost(const envoy::config::route::v3::VirtualHost& vhost);
 
   // Add an HTTP filter prior to existing filters.
+  void prependFilter(const std::string& filter_yaml);
+
+  // Add an HTTP filter prior to existing filters.
+  // TODO(rgs1): remove once envoy-filter-example has been updated.
   void addFilter(const std::string& filter_yaml);
 
   // Add a network filter prior to existing filters.

test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.h

@@ -41,7 +41,7 @@ class AdaptiveConcurrencyIntegrationTest
   void customInit() {
     setDownstreamProtocol(Http::CodecType::HTTP2);
     setUpstreamProtocol(Http::CodecType::HTTP2);
-    config_helper_.addFilter(ADAPTIVE_CONCURRENCY_CONFIG);
+    config_helper_.prependFilter(ADAPTIVE_CONCURRENCY_CONFIG);
     initialize();
     codec_client_ = makeHttpConnection(lookupPort("http"));
   }

test/extensions/filters/http/admission_control/admission_control_integration_test.cc

@@ -46,7 +46,7 @@ class AdmissionControlIntegrationTest : public Event::TestUsingSimulatedTime,
 
   void initialize() override {
     config_helper_.addConfigModifier(setEnableDownstreamTrailersHttp1());
-    config_helper_.addFilter(ADMISSION_CONTROL_CONFIG);
+    config_helper_.prependFilter(ADMISSION_CONTROL_CONFIG);
     HttpIntegrationTest::initialize();
   }
 

test/extensions/filters/http/alternate_protocols_cache/filter_integration_test.cc

@@ -25,7 +25,7 @@ name: alternate_protocols_cache
   alternate_protocols_cache_options:
     name: default_alternate_protocols_cache
 )EOF";
-    config_helper_.addFilter(filter);
+    config_helper_.prependFilter(filter);
 
     upstream_tls_ = true;
     config_helper_.configureUpstreamTls(/*use_alpn=*/true, /*http3=*/true,

test/extensions/filters/http/aws_lambda/aws_lambda_filter_integration_test.cc

@@ -37,7 +37,7 @@ class AwsLambdaFilterIntegrationTest : public testing::TestWithParam<Network::Ad
               arn: "arn:aws:lambda:us-west-2:123456789:function:test"
               payload_passthrough: {}
             )EOF";
-    config_helper_.addFilter(fmt::format(filter, passthrough));
+    config_helper_.prependFilter(fmt::format(filter, passthrough));
 
     constexpr auto metadata_yaml = R"EOF(
         com.amazonaws.lambda:

test/extensions/filters/http/buffer/buffer_filter_integration_test.cc

@@ -15,32 +15,32 @@ INSTANTIATE_TEST_SUITE_P(Protocols, BufferIntegrationTest,
                          HttpProtocolIntegrationTest::protocolTestParamsToString);
 
 TEST_P(BufferIntegrationTest, RouterNotFoundBodyBuffer) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   testRouterNotFoundWithBody();
 }
 
 TEST_P(BufferIntegrationTest, RouterRequestAndResponseWithGiantBodyBuffer) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   testRouterRequestAndResponseWithBody(4 * 1024 * 1024, 4 * 1024 * 1024, false);
 }
 
 TEST_P(BufferIntegrationTest, RouterHeaderOnlyRequestAndResponseBuffer) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   testRouterHeaderOnlyRequestAndResponse();
 }
 
 TEST_P(BufferIntegrationTest, RouterRequestAndResponseWithBodyBuffer) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   testRouterRequestAndResponseWithBody(1024, 512, false);
 }
 
 TEST_P(BufferIntegrationTest, RouterRequestAndResponseWithZeroByteBodyBuffer) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   testRouterRequestAndResponseWithBody(0, 0, false);
 }
 
 TEST_P(BufferIntegrationTest, RouterRequestPopulateContentLength) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   initialize();
 
   codec_client_ = makeHttpConnection(lookupPort("http"));
@@ -67,7 +67,7 @@ TEST_P(BufferIntegrationTest, RouterRequestPopulateContentLength) {
 }
 
 TEST_P(BufferIntegrationTest, RouterRequestPopulateContentLengthOnTrailers) {
-  config_helper_.addFilter(ConfigHelper::defaultBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::defaultBufferFilter());
   initialize();
 
   codec_client_ = makeHttpConnection(lookupPort("http"));
@@ -103,7 +103,7 @@ TEST_P(BufferIntegrationTest, RouterRequestBufferLimitExceeded) {
   config_helper_.addConfigModifier(
       [](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
              hcm) { hcm.mutable_delayed_close_timeout()->set_seconds(2000 * 1000); });
-  config_helper_.addFilter(ConfigHelper::smallBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::smallBufferFilter());
   initialize();
 
   codec_client_ = makeHttpConnection(lookupPort("http"));
@@ -142,7 +142,7 @@ ConfigHelper::HttpModifierFunction overrideConfig(const std::string& json_config
 TEST_P(BufferIntegrationTest, RouteDisabled) {
   ConfigHelper::HttpModifierFunction mod = overrideConfig(R"EOF({"disabled": true})EOF");
   config_helper_.addConfigModifier(mod);
-  config_helper_.addFilter(ConfigHelper::smallBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::smallBufferFilter());
   config_helper_.setBufferLimits(1024, 1024);
 
   initialize();
@@ -169,7 +169,7 @@ TEST_P(BufferIntegrationTest, RouteOverride) {
     "max_request_bytes": 5242880
   }})EOF");
   config_helper_.addConfigModifier(mod);
-  config_helper_.addFilter(ConfigHelper::smallBufferFilter());
+  config_helper_.prependFilter(ConfigHelper::smallBufferFilter());
 
   initialize();
 

test/extensions/filters/http/cache/cache_filter_integration_test.cc

@@ -33,7 +33,7 @@ class CacheIntegrationTest : public Event::TestUsingSimulatedTime,
   }
 
   void initializeFilter(const std::string& config) {
-    config_helper_.addFilter(config);
+    config_helper_.prependFilter(config);
     initialize();
     codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http"))));
   }

test/extensions/filters/http/cdn_loop/filter_integration_test.cc

@@ -31,7 +31,7 @@ name: envoy.filters.http.cdn_loop
 class CdnLoopFilterIntegrationTest : public HttpProtocolIntegrationTest {};
 
 TEST_P(CdnLoopFilterIntegrationTest, NoCdnLoopHeader) {
-  config_helper_.addFilter(MaxDefaultConfig);
+  config_helper_.prependFilter(MaxDefaultConfig);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -48,7 +48,7 @@ TEST_P(CdnLoopFilterIntegrationTest, NoCdnLoopHeader) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, CdnLoopHeaderWithOtherCdns) {
-  config_helper_.addFilter(MaxDefaultConfig);
+  config_helper_.prependFilter(MaxDefaultConfig);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -68,7 +68,7 @@ TEST_P(CdnLoopFilterIntegrationTest, CdnLoopHeaderWithOtherCdns) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, MultipleCdnLoopHeaders) {
-  config_helper_.addFilter(MaxDefaultConfig);
+  config_helper_.prependFilter(MaxDefaultConfig);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -86,7 +86,7 @@ TEST_P(CdnLoopFilterIntegrationTest, MultipleCdnLoopHeaders) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, CdnLoop0Allowed1Seen) {
-  config_helper_.addFilter(MaxDefaultConfig);
+  config_helper_.prependFilter(MaxDefaultConfig);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -103,7 +103,7 @@ TEST_P(CdnLoopFilterIntegrationTest, CdnLoop0Allowed1Seen) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, UnparseableHeader) {
-  config_helper_.addFilter(MaxDefaultConfig);
+  config_helper_.prependFilter(MaxDefaultConfig);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -120,7 +120,7 @@ TEST_P(CdnLoopFilterIntegrationTest, UnparseableHeader) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, CdnLoop2Allowed1Seen) {
-  config_helper_.addFilter(MaxOf2Config);
+  config_helper_.prependFilter(MaxOf2Config);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -140,7 +140,7 @@ TEST_P(CdnLoopFilterIntegrationTest, CdnLoop2Allowed1Seen) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, CdnLoop2Allowed2Seen) {
-  config_helper_.addFilter(MaxOf2Config);
+  config_helper_.prependFilter(MaxOf2Config);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 
@@ -160,7 +160,7 @@ TEST_P(CdnLoopFilterIntegrationTest, CdnLoop2Allowed2Seen) {
 }
 
 TEST_P(CdnLoopFilterIntegrationTest, CdnLoop2Allowed3Seen) {
-  config_helper_.addFilter(MaxOf2Config);
+  config_helper_.prependFilter(MaxOf2Config);
   initialize();
   codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
 

test/extensions/filters/http/composite/composite_filter_integration_test.cc

@@ -16,7 +16,7 @@ class CompositeFilterIntegrationTest : public testing::TestWithParam<Network::Ad
   void initialize() override {
     config_helper_.addRuntimeOverride("envoy.reloadable_features.experimental_matching_api",
                                       "true");
-    config_helper_.addFilter(R"EOF(
+    config_helper_.prependFilter(R"EOF(
   name: composite
   typed_config:
     "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher

test/extensions/filters/http/compressor/compressor_filter_integration_test.cc

@@ -20,7 +20,7 @@ class CompressorIntegrationTest : public testing::TestWithParam<Network::Address
   void TearDown() override { cleanupUpstreamAndDownstream(); }
 
   void initializeFilter(const std::string& config) {
-    config_helper_.addFilter(config);
+    config_helper_.prependFilter(config);
     initialize();
     codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http"))));
   }

test/extensions/filters/http/compressor/compressor_integration_tests.cc

@@ -145,7 +145,7 @@ void WebsocketWithCompressorIntegrationTest::initialize() {
         [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
                 hcm) -> void { hcm.mutable_http2_protocol_options()->set_allow_connect(true); });
   }
-  config_helper_.addFilter(compressorFilterConfig);
+  config_helper_.prependFilter(compressorFilterConfig);
   HttpProtocolIntegrationTest::initialize();
 }
 
@@ -247,7 +247,7 @@ void CompressorProxyingConnectIntegrationTest::initialize() {
   config_helper_.addConfigModifier(
       [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
               hcm) -> void { ConfigHelper::setConnectConfig(hcm, false, false); });
-  config_helper_.addFilter(compressorFilterConfig);
+  config_helper_.prependFilter(compressorFilterConfig);
   HttpProtocolIntegrationTest::initialize();
 }
 

test/extensions/filters/http/cors/cors_filter_integration_test.cc

@@ -14,7 +14,7 @@ class CorsFilterIntegrationTest : public testing::TestWithParam<Network::Address
   CorsFilterIntegrationTest() : HttpIntegrationTest(Http::CodecType::HTTP1, GetParam()) {}
 
   void initialize() override {
-    config_helper_.addFilter("name: envoy.filters.http.cors");
+    config_helper_.prependFilter("name: envoy.filters.http.cors");
     config_helper_.addConfigModifier(
         [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
                 hcm) -> void {

test/extensions/filters/http/csrf/csrf_filter_integration_test.cc

@@ -79,7 +79,7 @@ INSTANTIATE_TEST_SUITE_P(Protocols, CsrfFilterIntegrationTest,
                          HttpProtocolIntegrationTest::protocolTestParamsToString);
 
 TEST_P(CsrfFilterIntegrationTest, TestCsrfSuccess) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PUT"},
       {":path", "/"},
@@ -93,7 +93,7 @@ TEST_P(CsrfFilterIntegrationTest, TestCsrfSuccess) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestCsrfDisabled) {
-  config_helper_.addFilter(CSRF_DISABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_DISABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PUT"},
       {":path", "/"},
@@ -107,7 +107,7 @@ TEST_P(CsrfFilterIntegrationTest, TestCsrfDisabled) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestNonMutationMethod) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "GET"},
       {":path", "/"},
@@ -121,7 +121,7 @@ TEST_P(CsrfFilterIntegrationTest, TestNonMutationMethod) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestOriginMismatch) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PUT"},
       {":path", "/"},
@@ -135,7 +135,7 @@ TEST_P(CsrfFilterIntegrationTest, TestOriginMismatch) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestEnforcesPost) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "POST"},
       {":path", "/"},
@@ -149,7 +149,7 @@ TEST_P(CsrfFilterIntegrationTest, TestEnforcesPost) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestEnforcesDelete) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "DELETE"},
       {":path", "/"},
@@ -163,7 +163,7 @@ TEST_P(CsrfFilterIntegrationTest, TestEnforcesDelete) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestEnforcesPatch) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PATCH"},
       {":path", "/"},
@@ -177,7 +177,7 @@ TEST_P(CsrfFilterIntegrationTest, TestEnforcesPatch) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestRefererFallback) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{":method", "DELETE"},
                                             {":path", "/"},
                                             {":scheme", "http"},
@@ -189,7 +189,7 @@ TEST_P(CsrfFilterIntegrationTest, TestRefererFallback) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestMissingOrigin) {
-  config_helper_.addFilter(CSRF_FILTER_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_FILTER_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {
       {{":method", "DELETE"}, {":path", "/"}, {":scheme", "http"}, {"host", "test-origin"}}};
   const auto& response = sendRequest(headers);
@@ -198,7 +198,7 @@ TEST_P(CsrfFilterIntegrationTest, TestMissingOrigin) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestShadowOnlyMode) {
-  config_helper_.addFilter(CSRF_SHADOW_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_SHADOW_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PUT"},
       {":path", "/"},
@@ -212,7 +212,7 @@ TEST_P(CsrfFilterIntegrationTest, TestShadowOnlyMode) {
 }
 
 TEST_P(CsrfFilterIntegrationTest, TestFilterAndShadowEnabled) {
-  config_helper_.addFilter(CSRF_ENABLED_CONFIG);
+  config_helper_.prependFilter(CSRF_ENABLED_CONFIG);
   Http::TestRequestHeaderMapImpl headers = {{
       {":method", "PUT"},
       {":path", "/"},