fix test

Signed-off-by: huabing zhao <[email protected]>
envoyproxy · Oct 25, 2023 · faa63b5 · faa63b5
1 parent fc2b8ca
commit faa63b5
Show file tree

Hide file tree

Showing 87 changed files with 135 additions and 2 deletions.
diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml
@@ -357,6 +357,7 @@ xdsIR:
         name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
   envoy-gateway/gateway-2:
@@ -379,6 +380,7 @@ xdsIR:
         headerMatches:
         - distinct: false
           exact: foo
+          ignoreCase: false
           name: magic
         hostname: '*'
         name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/*
diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml
@@ -277,8 +277,10 @@ xdsIR:
             - headerMatches:
               - distinct: false
                 exact: one
+                ignoreCase: false
                 name: x-user-id
               - distinct: true
+                ignoreCase: false
                 name: x-org-id
               limit:
                 requests: 10
@@ -309,6 +311,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/gateway_envoyproxy_io
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
         rateLimit:

diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml
@@ -137,5 +137,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/gateway_envoyproxy_io
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml
@@ -117,5 +117,6 @@ xdsIR:
         name: httproute/envoy-gateway/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml
@@ -124,6 +124,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/...nal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/...nal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml
@@ -190,6 +190,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo_bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/...istener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/...istener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml
@@ -126,6 +126,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/.../gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/.../gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml
@@ -126,6 +126,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml
@@ -123,6 +123,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml
@@ -117,5 +117,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml
@@ -123,6 +123,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml
@@ -186,6 +186,7 @@ xdsIR:
         name: httproute/default/httproute-2/rule/0/match/0/foo_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /test
       - backendWeights:
@@ -202,6 +203,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -225,6 +227,7 @@ xdsIR:
         name: httproute/default/httproute-2/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /test
       - backendWeights:
@@ -241,5 +244,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml
@@ -181,6 +181,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     tcp:

diff --git a/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml
@@ -181,6 +181,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     udp:

diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml
@@ -120,6 +120,7 @@ xdsIR:
         headerMatches:
         - distinct: false
           exact: foo
+          ignoreCase: false
           name: magic
         hostname: '*'
         name: grpcroute/default/grpcroute-1/rule/0/match/0/*
diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml
@@ -126,6 +126,7 @@ xdsIR:
         pathMatch:
           distinct: false
           exact: /com.example/Example
+          ignoreCase: false
           name: ""
       - backendWeights:
           invalid: 0
@@ -141,5 +142,6 @@ xdsIR:
         name: grpcroute/default/grpcroute-1/rule/0/match/1/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           safeRegex: /foo.*/Foobar
diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml
@@ -123,6 +123,7 @@ xdsIR:
         name: grpcroute/default/grpcroute-1/rule/0/match/1/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           safeRegex: /(?i)\.?[a-z_][a-z_0-9]*(\.[a-z_][a-z_0-9]*)*/FooBar[0-9]+
       - backendWeights:
@@ -137,6 +138,7 @@ xdsIR:
             weight: 1
         headerMatches:
         - distinct: false
+          ignoreCase: false
           name: :path
           suffix: /ExampleExact
         hostname: '*'

diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml
@@ -123,6 +123,7 @@ xdsIR:
         name: grpcroute/default/grpcroute-1/rule/0/match/1/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           safeRegex: /com.[A-Z]+/[A-Za-z_][A-Za-z_0-9]*
       - backendWeights:
@@ -139,5 +140,6 @@ xdsIR:
         name: grpcroute/default/grpcroute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /com.ExampleExact
diff --git a/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml
@@ -126,8 +126,10 @@ xdsIR:
             - headerMatches:
               - distinct: false
                 exact: one
+                ignoreCase: false
                 name: x-user-id
               - distinct: true
+                ignoreCase: false
                 name: x-org-id
               limit:
                 requests: 10

diff --git a/...gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/...gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml
@@ -356,6 +356,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -379,6 +380,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -402,6 +404,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo1_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -425,6 +428,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar1_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -448,6 +452,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo2_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -471,6 +476,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar2_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -494,6 +500,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo3_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -517,5 +524,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar3_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml
@@ -328,6 +328,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -351,6 +352,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -374,6 +376,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo1_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -397,6 +400,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar1_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -420,6 +424,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo2_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -443,6 +448,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar2_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -466,6 +472,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo3_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -489,5 +496,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar3_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml
@@ -156,6 +156,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -179,6 +180,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
       tls:

diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml
@@ -148,6 +148,7 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/foo_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
     - address: 0.0.0.0
@@ -171,5 +172,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml
@@ -117,5 +117,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml
@@ -121,5 +121,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/*
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /
diff --git a/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml
@@ -156,5 +156,6 @@ xdsIR:
         name: httproute/default/httproute-1/rule/0/match/0/bar_com
         pathMatch:
           distinct: false
+          ignoreCase: false
           name: ""
           prefix: /