redirect filters: add hostname definitions to test manifests

Signed-off-by: AliceProxy <alicewasko@datawire.io>
envoyproxy · Sep 1, 2022 · 037147f · 037147f
1 parent 3446cc6
commit 037147f
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 6 deletions.
diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -68,10 +71,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           destinations:
             - host: 7.7.7.7
               port: 8080

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -66,10 +69,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           destinations:
             - host: 7.7.7.7
               port: 8080

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -69,10 +72,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           # I believe the correct way to handle an invalid filter should be to allow the HTTPRoute to function
           # normally but leave out the filter config and set the status, but this behaviour can be changed.
           destinations:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -69,10 +72,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           # I believe the correct way to handle an invalid filter should be to allow the HTTPRoute to function
           # normally but leave out the filter config and set the status, but this behaviour can be changed.
           destinations:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -69,10 +72,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           # I believe the correct way to handle an invalid filter should be to allow the HTTPRoute to function
           # normally but leave out the filter config and set the status, but this behaviour can be changed.
           destinations:

diff --git a/.../gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml b/.../gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml
@@ -10,6 +10,7 @@ gateways:
       - name: http
         protocol: HTTP
         port: 80
+        hostname: "*.envoyproxy.io"
         allowedRoutes:
           namespaces:
             from: All
@@ -20,6 +21,8 @@ httpRoutes:
     namespace: default
     name: httproute-1
   spec:
+    hostnames:
+      - gateway.envoyproxy.io
     parentRefs:
       - namespace: envoy-gateway
         name: gateway-1

diff --git a/...gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/...gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml
@@ -10,6 +10,7 @@ gateways:
         - name: http
           protocol: HTTP
           port: 80
+          hostname: "*.envoyproxy.io"
           allowedRoutes:
             namespaces:
               from: All
@@ -32,6 +33,8 @@ httpRoutes:
       namespace: default
       name: httproute-1
     spec:
+      hostnames:
+      - gateway.envoyproxy.io
       parentRefs:
         - namespace: envoy-gateway
           name: gateway-1
@@ -69,10 +72,15 @@ xdsIR:
     - name: envoy-gateway-gateway-1-http
       address: 0.0.0.0
       port: 80
+      hostnames:
+      - "*.envoyproxy.io"
       routes:
-        - name: default-httproute-1-rule-0-match-0-*
+        - name: default-httproute-1-rule-0-match-0-gateway.envoyproxy.io
           pathMatch:
             prefix: "/"
+          headerMatches:
+            - name: ":authority"
+              exact: gateway.envoyproxy.io
           destinations:
             - host: 7.7.7.7
               port: 8080