From 2f5e15730ff1b54fb204446d8fecd31f519f5eb0 Mon Sep 17 00:00:00 2001 From: Geoff Macartney Date: Thu, 5 Dec 2024 09:25:12 +0000 Subject: [PATCH] rename builder method for clarity a better name is SetDefaultFilterCompression Signed-off-by: Geoff Macartney --- internal/envoy/v3/listener.go | 4 +++- internal/featuretests/v3/compression_test.go | 2 +- internal/xdscache/v3/listener.go | 6 +++--- internal/xdscache/v3/listener_test.go | 10 +++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/envoy/v3/listener.go b/internal/envoy/v3/listener.go index 5b15021d4da..da152e4f225 100644 --- a/internal/envoy/v3/listener.go +++ b/internal/envoy/v3/listener.go @@ -275,7 +275,9 @@ func (b *httpConnectionManagerBuilder) MergeSlashes(enabled bool) *httpConnectio return b } -func (b *httpConnectionManagerBuilder) Compression(compressor *contour_v1alpha1.EnvoyCompression) *httpConnectionManagerBuilder { +// SetDefaultFilterCompression configures the builder to set the compression method applied by DefaultFilters() to the +// given value `compressor`. When chaining builder method calls, this method should be called before DefaultFilters(). +func (b *httpConnectionManagerBuilder) SetDefaultFilterCompression(compressor *contour_v1alpha1.EnvoyCompression) *httpConnectionManagerBuilder { b.compression = compressor return b } diff --git a/internal/featuretests/v3/compression_test.go b/internal/featuretests/v3/compression_test.go index b374ed92e1c..9b1cf7cf53e 100644 --- a/internal/featuretests/v3/compression_test.go +++ b/internal/featuretests/v3/compression_test.go @@ -76,7 +76,7 @@ func TestCompression(t *testing.T) { rh.OnAdd(hp1) httpListener := defaultHTTPListener() httpListener.FilterChains = envoy_v3.FilterChains(envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: tc.want, }). RouteConfigName(xdscache_v3.ENVOY_HTTP_LISTENER). diff --git a/internal/xdscache/v3/listener.go b/internal/xdscache/v3/listener.go index b053493861d..9b19e3d5e92 100644 --- a/internal/xdscache/v3/listener.go +++ b/internal/xdscache/v3/listener.go @@ -396,7 +396,7 @@ func (c *ListenerCache) OnChange(root *dag.DAG) { // order for the HTTPS virtualhosts. if len(listener.VirtualHosts) > 0 { cm := envoy_v3.HTTPConnectionManagerBuilder(). - Compression(cfg.Compression). + SetDefaultFilterCompression(cfg.Compression). Codec(envoy_v3.CodecForVersions(cfg.DefaultHTTPVersions...)). DefaultFilters(). RouteConfigName(httpRouteConfigName(listener)). @@ -469,7 +469,7 @@ func (c *ListenerCache) OnChange(root *dag.DAG) { // Contour versions since the metrics prefix will be // coded into monitoring dashboards. cm := envoy_v3.HTTPConnectionManagerBuilder(). - Compression(cfg.Compression). + SetDefaultFilterCompression(cfg.Compression). Codec(envoy_v3.CodecForVersions(cfg.DefaultHTTPVersions...)). AddFilter(envoy_v3.FilterMisdirectedRequests(vh.VirtualHost.Name)). DefaultFilters(). @@ -554,7 +554,7 @@ func (c *ListenerCache) OnChange(root *dag.DAG) { } cm := envoy_v3.HTTPConnectionManagerBuilder(). - Compression(cfg.Compression). + SetDefaultFilterCompression(cfg.Compression). DefaultFilters(). AddFilter(authzFilter). RouteConfigName(fallbackCertRouteConfigName(listener)). diff --git a/internal/xdscache/v3/listener_test.go b/internal/xdscache/v3/listener_test.go index c4f464ef8c4..63c80d54cdb 100644 --- a/internal/xdscache/v3/listener_test.go +++ b/internal/xdscache/v3/listener_test.go @@ -3108,7 +3108,7 @@ func TestListenerVisit(t *testing.T) { Address: envoy_v3.SocketAddress("0.0.0.0", 8080), FilterChains: envoy_v3.FilterChains( envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: contour_v1alpha1.DisabledCompression, }). RouteConfigName(ENVOY_HTTP_LISTENER). @@ -3154,7 +3154,7 @@ func TestListenerVisit(t *testing.T) { Address: envoy_v3.SocketAddress("0.0.0.0", 8080), FilterChains: envoy_v3.FilterChains( envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: contour_v1alpha1.GzipCompression, }). RouteConfigName(ENVOY_HTTP_LISTENER). @@ -3200,7 +3200,7 @@ func TestListenerVisit(t *testing.T) { Address: envoy_v3.SocketAddress("0.0.0.0", 8080), FilterChains: envoy_v3.FilterChains( envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: contour_v1alpha1.BrotliCompression, }). RouteConfigName(ENVOY_HTTP_LISTENER). @@ -3246,7 +3246,7 @@ func TestListenerVisit(t *testing.T) { Address: envoy_v3.SocketAddress("0.0.0.0", 8080), FilterChains: envoy_v3.FilterChains( envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: contour_v1alpha1.ZstdCompression, }). RouteConfigName(ENVOY_HTTP_LISTENER). @@ -3292,7 +3292,7 @@ func TestListenerVisit(t *testing.T) { Address: envoy_v3.SocketAddress("0.0.0.0", 8080), FilterChains: envoy_v3.FilterChains( envoy_v3.HTTPConnectionManagerBuilder(). - Compression(&contour_v1alpha1.EnvoyCompression{ + SetDefaultFilterCompression(&contour_v1alpha1.EnvoyCompression{ Algorithm: contour_v1alpha1.GzipCompression, }). RouteConfigName(ENVOY_HTTP_LISTENER).