feat(translator): prefix TCP FilterChain name by irListener name

internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml

@@ -1029,7 +1029,7 @@ xds:
                       path: /dev/stdout
                   cluster: tcproute/default/backend/rule/-1
                   statPrefix: tcp
-              name: tcproute/default/backend
+              name: default/eg/tcp/tcproute/default/backend
             name: default/eg/tcp
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -1072,7 +1072,7 @@ xds:
                       path: /dev/stdout
                   cluster: tlsroute/default/backend/rule/-1
                   statPrefix: passthrough
-              name: tlsroute/default/backend
+              name: default/eg/tls-passthrough/tlsroute/default/backend
             listenerFilters:
             - name: envoy.filters.listener.tls_inspector
               typedConfig:

internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json

@@ -858,7 +858,7 @@
                           }
                         }
                       ],
-                      "name": "tcproute/default/backend"
+                      "name": "default/eg/tcp/tcproute/default/backend"
                     }
                   ],
                   "name": "default/eg/tcp",
@@ -929,7 +929,7 @@
                           }
                         }
                       ],
-                      "name": "tlsroute/default/backend"
+                      "name": "default/eg/tls-passthrough/tlsroute/default/backend"
                     }
                   ],
                   "listenerFilters": [

internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml

@@ -510,7 +510,7 @@ xds:
                       path: /dev/stdout
                   cluster: tcproute/default/backend/rule/-1
                   statPrefix: tcp
-              name: tcproute/default/backend
+              name: default/eg/tcp/tcproute/default/backend
             name: default/eg/tcp
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -553,7 +553,7 @@ xds:
                       path: /dev/stdout
                   cluster: tlsroute/default/backend/rule/-1
                   statPrefix: passthrough
-              name: tlsroute/default/backend
+              name: default/eg/tls-passthrough/tlsroute/default/backend
             listenerFilters:
             - name: envoy.filters.listener.tls_inspector
               typedConfig:

internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml

@@ -167,7 +167,7 @@ xds:
                     path: /dev/stdout
                 cluster: tcproute/default/backend/rule/-1
                 statPrefix: tcp
-            name: tcproute/default/backend
+            name: default/eg/tcp/tcproute/default/backend
           name: default/eg/tcp
           perConnectionBufferLimitBytes: 32768
     - activeState:
@@ -210,7 +210,7 @@ xds:
                     path: /dev/stdout
                 cluster: tlsroute/default/backend/rule/-1
                 statPrefix: passthrough
-            name: tlsroute/default/backend
+            name: default/eg/tls-passthrough/tlsroute/default/backend
           listenerFilters:
           - name: envoy.filters.listener.tls_inspector
             typedConfig:

internal/xds/translator/listener.go

@@ -7,6 +7,7 @@ package translator
 
 import (
 	"errors"
+	"fmt"
 
 	xdscore "github.com/cncf/xds/go/xds/core/v3"
 	matcher "github.com/cncf/xds/go/xds/type/matcher/v3"
@@ -391,7 +392,7 @@ func findXdsHTTPRouteConfigName(xdsListener *listenerv3.Listener) string {
 	return ""
 }
 
-func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute,
+func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irListener *ir.TCPListener, irRoute *ir.TCPRoute,
 	clusterName string, accesslog *ir.AccessLog, timeout *ir.ClientTimeout,
 	connection *ir.ClientConnection,
 ) error {
@@ -444,7 +445,7 @@ func addXdsTCPFilterChain(xdsListener *listenerv3.Listener, irRoute *ir.TCPRoute
 
 	filterChain := &listenerv3.FilterChain{
 		Filters: filters,
-		Name:    irRoute.Name,
+		Name:    fmt.Sprintf("%s/%s", irListener.Name, irRoute.Name),
 	}
 
 	if isTLSPassthrough {

internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml

@@ -45,7 +45,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-dest
         statPrefix: tcp
-    name: tcp-route-dest
+    name: second-listener/tcp-route-dest
   name: second-listener
   perConnectionBufferLimitBytes: 1500
 - address:

internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml

@@ -45,6 +45,6 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-dest
         statPrefix: tcp
-    name: tcp-route-dest
+    name: second-listener/tcp-route-dest
   name: second-listener
   perConnectionBufferLimitBytes: 1500

internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml

@@ -48,6 +48,6 @@
         cluster: second-route-dest
         idleTimeout: 1200s
         statPrefix: tcp
-    name: second-route
+    name: second-listener/second-route
   name: second-listener
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml

@@ -72,7 +72,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-route-dest
         statPrefix: tcp
-    name: tcp-route-dest
+    name: second-listener/tcp-route-dest
   listenerFilters:
   - name: envoy.filters.listener.proxy_protocol
     typedConfig:

internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml

@@ -127,7 +127,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-dest
         statPrefix: passthrough
-    name: fifth-route
+    name: fifth-listener/fifth-route
   - filterChainMatch:
       serverNames:
       - bar.net
@@ -137,7 +137,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-route-dest
         statPrefix: passthrough
-    name: sixth-route
+    name: sixth-listener/sixth-route
   listenerFilters:
   - name: envoy.filters.listener.tls_inspector
     typedConfig:

internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml

@@ -10,34 +10,34 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-dest
         statPrefix: tcp
-    name: tcp-route-simple
+    name: tcp-listener-simple/tcp-route-simple
   - filters:
     - name: envoy.filters.network.tcp_proxy
       typedConfig:
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-1-dest
         statPrefix: tcp
-    name: tcp-route-simple-1
+    name: tcp-listener-simple-1/tcp-route-simple-1
   - filters:
     - name: envoy.filters.network.tcp_proxy
       typedConfig:
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-2-dest
         statPrefix: tcp
-    name: tcp-route-simple-2
+    name: tcp-listener-simple-2/tcp-route-simple-2
   - filters:
     - name: envoy.filters.network.tcp_proxy
       typedConfig:
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-3-dest
         statPrefix: tcp
-    name: tcp-route-simple-3
+    name: tcp-listener-simple-3/tcp-route-simple-3
   - filters:
     - name: envoy.filters.network.tcp_proxy
       typedConfig:
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-4-dest
         statPrefix: tcp
-    name: tcp-route-simple-4
+    name: tcp-listener-simple-4/tcp-route-simple-4
   name: tcp-listener-simple
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml

@@ -68,7 +68,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-terminate-dest
         statPrefix: terminate
-    name: tls-route-terminate
+    name: second-listener/tls-route-terminate
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:

internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml

@@ -68,7 +68,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-terminate-dest
         statPrefix: terminate
-    name: tls-route-terminate
+    name: second-listener/tls-route-terminate
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:

internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml

@@ -15,7 +15,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-complex-dest
         statPrefix: passthrough
-    name: tcp-route-complex
+    name: tcp-listener-complex/tcp-route-complex
   listenerFilters:
   - name: envoy.filters.listener.tls_inspector
     typedConfig:

internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml

@@ -10,6 +10,6 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-simple-dest
         statPrefix: tcp
-    name: tcp-route-simple
+    name: tcp-listener-simple/tcp-route-simple
   name: tcp-listener-simple
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml

@@ -10,7 +10,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-terminate-dest
         statPrefix: terminate
-    name: tls-route-terminate
+    name: tls-listener-terminate/tls-route-terminate
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:
@@ -34,7 +34,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-terminate-hostname-dest
         statPrefix: terminate
-    name: tls-terminate-hostname
+    name: tls-listener-terminate/tls-terminate-hostname
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:

internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml

@@ -15,7 +15,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tcp-route-weighted-backend-dest
         statPrefix: passthrough
-    name: tcp-route-weighted-backend
+    name: tcp-listener-weighted-backend/tcp-route-weighted-backend
   listenerFilters:
   - name: envoy.filters.listener.tls_inspector
     typedConfig:

internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml

@@ -13,7 +13,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-passthrough-foo-dest
         statPrefix: passthrough
-    name: tls-route-passthrough-foo
+    name: tls-passthrough-foo/tls-route-passthrough-foo
   listenerFilters:
   - name: envoy.filters.listener.tls_inspector
     typedConfig:
@@ -35,7 +35,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-passthrough-bar-dest
         statPrefix: passthrough
-    name: tls-route-passthrough-bar
+    name: tls-passthrough-bar/tls-route-passthrough-bar
   listenerFilters:
   - name: envoy.filters.listener.tls_inspector
     typedConfig:

internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml

@@ -89,7 +89,7 @@
         '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
         cluster: tls-terminate-dest
         statPrefix: terminate
-    name: tls-route-terminate
+    name: second-listener/tls-route-terminate
     transportSocket:
       name: envoy.transport_sockets.tls
       typedConfig:

internal/xds/translator/translator.go

@@ -610,7 +610,7 @@ func (t *Translator) processTCPListenerXdsTranslation(
 					}
 				}
 			}
-			if err := addXdsTCPFilterChain(xdsListener, route, route.Destination.Name, accesslog, tcpListener.Timeout, tcpListener.Connection); err != nil {
+			if err := addXdsTCPFilterChain(xdsListener, tcpListener, route, route.Destination.Name, accesslog, tcpListener.Timeout, tcpListener.Connection); err != nil {
 				errs = errors.Join(errs, err)
 			}
 		}