fix testdata

Signed-off-by: Jesse Haka <haka.jesse@gmail.com>
envoyproxy · Feb 23, 2024 · 5e98b6a · 5e98b6a
1 parent a54f8dd
commit 5e98b6a
Show file tree

Hide file tree

Showing 124 changed files with 202 additions and 144 deletions.
diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go
@@ -68,6 +68,8 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute) (*routev3.Route, error) {
 				routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirrors)
 			}
 		}
+		// Allow websocket upgrades for HTTP 1.1
+		// Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Protocol_upgrade_mechanism
 		routeAction.UpgradeConfigs = []*routev3.RouteAction_UpgradeConfig{
 			{
 				UpgradeType: "websocket",

diff --git a/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: extension-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: extension-listener
   perConnectionBufferLimitBytes: 32768

diff --git a/...rnal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml b/...rnal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml
@@ -29,3 +29,5 @@
           value: foo.example.io/v1alpha1
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml
@@ -21,3 +21,5 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml
@@ -138,8 +138,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml
@@ -34,8 +34,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml
@@ -10,6 +10,8 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.basic_auth_first-route:
           '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig

diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml
@@ -10,3 +10,5 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml
@@ -26,8 +26,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
         xffNumTrustedHops: 2
   name: first-listener
@@ -66,8 +64,6 @@
           routeConfigName: second-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: false
   name: second-listener
   perConnectionBufferLimitBytes: 32768
@@ -107,8 +103,6 @@
           routeConfigName: third-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: false
   name: third-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml
@@ -10,6 +10,8 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
 - ignorePortInHostMatching: true
   name: second-listener
   virtualHosts:
@@ -22,6 +24,8 @@
       name: second-route
       route:
         cluster: second-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
 - ignorePortInHostMatching: true
   name: third-listener
   virtualHosts:
@@ -34,3 +38,5 @@
       name: third-route
       route:
         cluster: third-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml
@@ -29,8 +29,6 @@
         requestTimeout: 5s
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml
@@ -10,3 +10,5 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml
@@ -31,8 +31,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml
@@ -10,6 +10,8 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.cors:
           '@type': type.googleapis.com/envoy.extensions.filters.http.cors.v3.CorsPolicy

diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml
@@ -55,8 +55,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml
@@ -10,6 +10,8 @@
       name: httproute/default/httproute-1/rule/0/match/0/www_example_com
       route:
         cluster: httproute/default/httproute-1/rule/0
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.ext_authz_httproute/default/httproute-1/rule/0/match/0/www_example_com:
           '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig
@@ -19,6 +21,8 @@
       name: httproute/default/httproute-2/rule/0/match/0/www_example_com
       route:
         cluster: httproute/default/httproute-2/rule/0
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.ext_authz_httproute/default/httproute-2/rule/0/match/0/www_example_com:
           '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig

diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml
@@ -31,8 +31,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml
@@ -10,6 +10,8 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.fault:
           '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault
@@ -23,6 +25,8 @@
       name: second-route
       route:
         cluster: second-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.fault:
           '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault
@@ -36,6 +40,8 @@
       name: third-route
       route:
         cluster: third-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.fault:
           '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault
@@ -54,6 +60,8 @@
       name: fourth-route
       route:
         cluster: fourth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
       typedPerFilterConfig:
         envoy.filters.http.fault:
           '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault
@@ -72,3 +80,5 @@
       name: fifth-route
       route:
         cluster: fifth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml
@@ -10,18 +10,26 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
     - match:
         prefix: /
       name: second-route
       route:
         cluster: second-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
     - match:
         prefix: /
       name: third-route
       route:
         cluster: third-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
     - match:
         prefix: /
       name: fourth-route
       route:
         cluster: fourth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml
@@ -14,3 +14,5 @@
       name: first-route
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml
@@ -10,3 +10,5 @@
       name: mirror-route
       route:
         cluster: route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml
@@ -14,11 +14,15 @@
       name: envoy-gateway/httproute-2/rule/0/match/0/example.com
       route:
         cluster: first-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
     - match:
         pathSeparatedPrefix: /v1/example
       name: envoy-gateway/httproute-3/rule/0/match/0/example.com
       route:
         cluster: second-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
   - domains:
     - example.net
     name: first-listener/example_net
@@ -32,11 +36,15 @@
       name: envoy-gateway/httproute-4/rule/0/match/0/example.net
       route:
         cluster: third-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
     - match:
         pathSeparatedPrefix: /v1/status
       name: envoy-gateway/httproute-5/rule/0/match/0/example.net
       route:
         cluster: fourth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
   - domains:
     - '*.com'
     name: first-listener/*_com
@@ -46,6 +54,8 @@
       name: envoy-gateway/httproute-1/rule/0/match/0/*.com
       route:
         cluster: fifth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
   - domains:
     - '*.net'
     name: first-listener/*_net
@@ -55,6 +65,8 @@
       name: envoy-gateway/httproute-1/rule/0/match/0/*.net
       route:
         cluster: sixth-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
   - domains:
     - '*'
     name: first-listener/*
@@ -64,3 +76,5 @@
       name: envoy-gateway/httproute-1/rule/0/match/0/*
       route:
         cluster: seventh-route-dest
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml
@@ -28,8 +28,6 @@
           routeConfigName: first-listener
         serverHeaderTransformation: PASS_THROUGH
         statPrefix: http
-        upgradeConfigs:
-        - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml
@@ -13,3 +13,5 @@
         requestMirrorPolicies:
         - cluster: mirror-route-dest
         - cluster: mirror-route-dest1
+        upgradeConfigs:
+        - upgradeType: websocket