fix test

zhaohuabing · zhaohuabing · commit 5e3755b5efb0 · 2025-07-18T03:59:14.000Z
Signed-off-by: Huabing (Robin) Zhao &lt;zhaohuabing@gmail.com&gt;
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -1126,6 +1126,14 @@ xds:
                   useRemoteAddress: true
               name: default/eg/http
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: default
+                    sectionName: http
             name: 0.0.0.0-10080
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -1238,6 +1246,14 @@ xds:
                   useRemoteAddress: true
               name: default/eg/grpc
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: default
+                    sectionName: grpc
             name: 0.0.0.0-8080
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -1322,6 +1338,10 @@ xds:
                   statPrefix: tcp-1234
               name: tcproute/default/backend
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources: []
             name: 0.0.0.0-1234
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -1413,6 +1433,10 @@ xds:
               typedConfig:
                 '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources: []
             name: 0.0.0.0-8443
             perConnectionBufferLimitBytes: 32768
       - activeState:
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -978,6 +978,20 @@
                     "name": "default/eg/http"
                   },
                   "maxConnectionsToAcceptPerSocketEvent": 1,
+                  "metadata": {
+                    "filterMetadata": {
+                      "envoy-gateway": {
+                        "resources": [
+                          {
+                            "kind": "Gateway",
+                            "name": "eg",
+                            "namespace": "default",
+                            "sectionName": "http"
+                          }
+                        ]
+                      }
+                    }
+                  },
                   "name": "0.0.0.0-10080",
                   "perConnectionBufferLimitBytes": 32768
                 }
@@ -1130,6 +1144,20 @@
                     "name": "default/eg/grpc"
                   },
                   "maxConnectionsToAcceptPerSocketEvent": 1,
+                  "metadata": {
+                    "filterMetadata": {
+                      "envoy-gateway": {
+                        "resources": [
+                          {
+                            "kind": "Gateway",
+                            "name": "eg",
+                            "namespace": "default",
+                            "sectionName": "grpc"
+                          }
+                        ]
+                      }
+                    }
+                  },
                   "name": "0.0.0.0-8080",
                   "perConnectionBufferLimitBytes": 32768
                 }
@@ -1242,6 +1270,13 @@
                     }
                   ],
                   "maxConnectionsToAcceptPerSocketEvent": 1,
+                  "metadata": {
+                    "filterMetadata": {
+                      "envoy-gateway": {
+                        "resources": []
+                      }
+                    }
+                  },
                   "name": "0.0.0.0-1234",
                   "perConnectionBufferLimitBytes": 32768
                 }
@@ -1367,6 +1402,13 @@
                     }
                   ],
                   "maxConnectionsToAcceptPerSocketEvent": 1,
+                  "metadata": {
+                    "filterMetadata": {
+                      "envoy-gateway": {
+                        "resources": []
+                      }
+                    }
+                  },
                   "name": "0.0.0.0-8443",
                   "perConnectionBufferLimitBytes": 32768
                 }
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -579,6 +579,14 @@ xds:
                   useRemoteAddress: true
               name: default/eg/http
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: default
+                    sectionName: http
             name: 0.0.0.0-10080
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -691,6 +699,14 @@ xds:
                   useRemoteAddress: true
               name: default/eg/grpc
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: default
+                    sectionName: grpc
             name: 0.0.0.0-8080
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -775,6 +791,10 @@ xds:
                   statPrefix: tcp-1234
               name: tcproute/default/backend
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources: []
             name: 0.0.0.0-1234
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -866,6 +886,10 @@ xds:
               typedConfig:
                 '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources: []
             name: 0.0.0.0-8443
             perConnectionBufferLimitBytes: 32768
       - activeState:
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml
@@ -143,6 +143,14 @@ xds:
                 useRemoteAddress: true
             name: default/eg/http
           maxConnectionsToAcceptPerSocketEvent: 1
+          metadata:
+            filterMetadata:
+              envoy-gateway:
+                resources:
+                - kind: Gateway
+                  name: eg
+                  namespace: default
+                  sectionName: http
           name: 0.0.0.0-10080
           perConnectionBufferLimitBytes: 32768
     - activeState:
@@ -255,6 +263,14 @@ xds:
                 useRemoteAddress: true
             name: default/eg/grpc
           maxConnectionsToAcceptPerSocketEvent: 1
+          metadata:
+            filterMetadata:
+              envoy-gateway:
+                resources:
+                - kind: Gateway
+                  name: eg
+                  namespace: default
+                  sectionName: grpc
           name: 0.0.0.0-8080
           perConnectionBufferLimitBytes: 32768
     - activeState:
@@ -339,6 +355,10 @@ xds:
                 statPrefix: tcp-1234
             name: tcproute/default/backend
           maxConnectionsToAcceptPerSocketEvent: 1
+          metadata:
+            filterMetadata:
+              envoy-gateway:
+                resources: []
           name: 0.0.0.0-1234
           perConnectionBufferLimitBytes: 32768
     - activeState:
@@ -430,6 +450,10 @@ xds:
             typedConfig:
               '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
           maxConnectionsToAcceptPerSocketEvent: 1
+          metadata:
+            filterMetadata:
+              envoy-gateway:
+                resources: []
           name: 0.0.0.0-8443
           perConnectionBufferLimitBytes: 32768
     - activeState:
diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
@@ -689,6 +689,20 @@
                     "name": "envoy-gateway-system/eg/http"
                   },
                   "maxConnectionsToAcceptPerSocketEvent": 1,
+                  "metadata": {
+                    "filterMetadata": {
+                      "envoy-gateway": {
+                        "resources": [
+                          {
+                            "kind": "Gateway",
+                            "name": "eg",
+                            "namespace": "envoy-gateway-system",
+                            "sectionName": "http"
+                          }
+                        ]
+                      }
+                    }
+                  },
                   "name": "0.0.0.0-10080",
                   "perConnectionBufferLimitBytes": 32768
                 }
diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
@@ -417,6 +417,14 @@ xds:
                   useRemoteAddress: true
               name: envoy-gateway-system/eg/http
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: envoy-gateway-system
+                    sectionName: http
             name: 0.0.0.0-10080
             perConnectionBufferLimitBytes: 32768
     - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml
@@ -163,5 +163,13 @@ xds:
                 useRemoteAddress: true
             name: envoy-gateway-system/eg/http
           maxConnectionsToAcceptPerSocketEvent: 1
+          metadata:
+            filterMetadata:
+              envoy-gateway:
+                resources:
+                - kind: Gateway
+                  name: eg
+                  namespace: envoy-gateway-system
+                  sectionName: http
           name: 0.0.0.0-10080
           perConnectionBufferLimitBytes: 32768
diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
@@ -352,6 +352,14 @@ xds:
                   useRemoteAddress: true
               name: envoy-gateway-system/eg/http
             maxConnectionsToAcceptPerSocketEvent: 1
+            metadata:
+              filterMetadata:
+                envoy-gateway:
+                  resources:
+                  - kind: Gateway
+                    name: eg
+                    namespace: envoy-gateway-system
+                    sectionName: http
             name: 0.0.0.0-10080
             perConnectionBufferLimitBytes: 32768
     - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.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: "/filter_chains/0/filters/0/typed_config/http_filters/0"
diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml
@@ -1,6 +1,6 @@
 jsonPatches:
 - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-  name: "first-listener"
+  name: "0.0.0.0-10080"
   operation:
     op: "add"
     path: "/default_filter_chain/filters/0/typed_config/http_filters/0"
diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid.yaml
@@ -4,7 +4,7 @@ envoyPatchPolicies:
   namespace: "default"
   jsonPatches:
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: "first-listener"
+    name: "0.0.0.0-10080"
     operation:
       op: "add"
       path: "/default_filter_chain/filters/0/typed_config/http_filters/0"
diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.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: "/filter_chains/0/filters/0/typed_config/http_filters/0"
@@ -27,7 +27,7 @@ envoyPatchPolicies:
                 cluster_name: rate-limit-cluster
             transport_api_version: V3
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "remove"
       from: "/filter_chains/0/filters/0/typed_config/http_filters/0"
diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml
@@ -10,13 +10,13 @@ envoyPatchPolicies:
   namespace: "default"
   jsonPatches:
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: first-listener
+    name: "::-10080"
     operation:
       op: add
       path: "/filter_chains/0/filters/0/typed_config/preserve_external_request_id"
       value: true
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "add"
       path: "/filter_chains/0/filters/0/typed_config/http_filters/0"
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.envoypatchpolicies.yaml
@@ -9,8 +9,8 @@
         namespace: default
       conditions:
       - lastTransitionTime: null
-        message: 'Unable to find xds resources: type.googleapis.com/envoy.config.listener.v3.Listener/first-listener,type.googleapis.com/envoy.config.listener.v3.Listener/first-listener'
-        reason: ResourceNotFound
-        status: "False"
+        message: Patches have been successfully applied.
+        reason: Programmed
+        status: "True"
         type: Programmed
       controllerName: ""
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml
@@ -14,13 +14,25 @@
           initialStreamWindowSize: 65536
           maxConcurrentStreams: 100
         httpFilters:
+        - name: envoy.filters.http.ratelimit
+          typedConfig:
+            '@type': type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit
+            domain: eg-ratelimit
+            failureModeDeny: true
+            rateLimitService:
+              grpcService:
+                envoyGrpc:
+                  clusterName: rate-limit-cluster
+              transportApiVersion: V3
+            timeout: 1s
         - name: envoy.filters.http.router
           typedConfig:
             '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             suppressEnvoyHeaders: true
         mergeSlashes: true
         normalizePath: true
         pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT
+        preserveExternalRequestId: true
         rds:
           configSource:
             ads: {}
