rename listener using its address and port

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

Author: zhaohuabing

internal/xds/translator/listener.go

@@ -7,6 +7,7 @@ package translator
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"strconv"
 	"strings"
@@ -185,7 +186,7 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin
 // buildXdsTCPListener creates a xds Listener resource
 // TODO: Improve function parameters
 func buildXdsTCPListener(
-	name, address string,
+	address string,
 	port uint32,
 	ipFamily *egv1a1.IPFamily,
 	keepalive *ir.TCPKeepalive,
@@ -200,7 +201,7 @@ func buildXdsTCPListener(
 	bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection)
 	maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection)
 	listener := &listenerv3.Listener{
-		Name:                                 name,
+		Name:                                 tcpListenerName(address, port),
 		AccessLog:                            al,
 		SocketOptions:                        socketOptions,
 		PerConnectionBufferLimitBytes:        bufferLimitBytes,
@@ -226,6 +227,10 @@ func buildXdsTCPListener(
 	return listener, nil
 }
 
+func tcpListenerName(address string, port uint32) string {
+	return fmt.Sprintf("%s-%d", address, port)
+}
+
 func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value {
 	if connection != nil && connection.BufferLimitBytes != nil {
 		return wrapperspb.UInt32(*connection.BufferLimitBytes)

internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml

@@ -10,7 +10,7 @@ envoyPatchPolicies:
   namespace: "default"
   jsonPatches:
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "add"
       path: "/this/path/never/existed"

internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml

@@ -38,9 +38,8 @@
         cluster: tcp-route-dest
         statPrefix: tcp-10080
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: envoy-gateway/gateway-1/http1
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768
-  statPrefix: envoy-gateway/gateway-1/http1
 - address:
     socketAddress:
       address: 0.0.0.0

internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: custom-backend-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: custom-backend-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: multiple-custom-backends-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: multiple-custom-backends-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: custom-backend-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: custom-backend-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: multiple-custom-backends-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: multiple-custom-backends-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: multiple-custom-backends-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: multiple-custom-backends-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768

internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml

@@ -31,6 +31,5 @@
         useRemoteAddress: true
     name: extension-listener
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: extension-listener
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768
-  statPrefix: mock-extension-inserted-prefix

internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.listeners.yaml

@@ -31,5 +31,5 @@
         useRemoteAddress: true
     name: extension-post-xdslistener-hook-error
   maxConnectionsToAcceptPerSocketEvent: 1
-  name: extension-post-xdslistener-hook-error
+  name: 0.0.0.0-10080
   perConnectionBufferLimitBytes: 32768