fix test

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

Author: zhaohuabing

internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml

@@ -10,14 +10,14 @@ envoyPatchPolicies:
   namespace: "default"
   jsonPatches:
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: first-listener
+    name: "::-10080"
     operation:
       op: "add"
       jsonPath: "$.filter_chains[0].filters[0].typed_config"
       path: "/preserve_external_request_id"
       value: true
   - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "add"
       jsonPath: "filter_chains[0].filters[0].typed_config.http_filters[0]"
@@ -34,7 +34,7 @@ envoyPatchPolicies:
                 cluster_name: rate-limit-cluster
             transport_api_version: V3
   - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "add"
       jsonPath: "virtual_hosts[0]"
@@ -43,7 +43,7 @@ envoyPatchPolicies:
       - actions:
         - remote_address: {}
   - type: "type.googleapis.com/envoy.config.route.v3.RouteConfiguration"
-    name: "first-listener"
+    name: "::-10080"
     operation:
       op: "replace"
       jsonPath: "..routes[?(@.name=='second-route')].route.upgrade_configs"

internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.envoypatchpolicies.yaml

@@ -9,7 +9,7 @@
         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'
+        message: 'Unable to find xds resources: type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080,type.googleapis.com/envoy.config.route.v3.RouteConfiguration/::-10080'
         reason: ResourceNotFound
         status: "False"
         type: Programmed

internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.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: {}

internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.routes.yaml

@@ -4,9 +4,6 @@
   - domains:
     - '*'
     name: first-listener/*
-    rateLimits:
-    - actions:
-      - remoteAddress: {}
     routes:
     - match:
         headers:
@@ -32,5 +29,4 @@
       route:
         cluster: second-route-dest
         upgradeConfigs:
-        - connectConfig: {}
-          upgradeType: CONNECT
+        - upgradeType: websocket

internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.listeners.yaml

@@ -103,11 +103,11 @@
         - kind: Gateway
           name: gateway-1
           namespace: envoy-gateway
-          sectionName: https-2
+          sectionName: https-1
         - kind: Gateway
           name: gateway-1
           namespace: envoy-gateway
-          sectionName: https-1
+          sectionName: https-2
   name: 0.0.0.0-10443
   perConnectionBufferLimitBytes: 32768
 - address: