From d4fcdb81e70064a94e0684671bda124e0873a96d Mon Sep 17 00:00:00 2001 From: Yi Tao Date: Mon, 31 Jul 2023 15:48:53 +0800 Subject: [PATCH] update golden test --- .../httproute-example/expression-routes-on_golden.yaml | 3 +-- .../ingress-v1-empty-path/expression-routes-on_golden.yaml | 3 +-- .../expression-routes-on_golden.yaml | 6 ++---- .../expression-routes-on_golden.yaml | 3 +-- .../expression-routes-on_golden.yaml | 3 +-- .../expression-routes-on_golden.yaml | 3 +-- .../expression-routes-on_golden.yaml | 3 +-- .../expression-routes-on_golden.yaml | 6 ++---- .../expression-routes-on_golden.yaml | 1 - .../expression-routes-on_golden.yaml | 3 +-- 10 files changed, 11 insertions(+), 23 deletions(-) diff --git a/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml index ab5d8b66fc..29fde19ff6 100644 --- a/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/httproute-example/expression-routes-on_golden.yaml @@ -7,8 +7,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: ((net.protocol == "http") || (net.protocol == "https")) && ((http.path - == "/httproute-testing") || (http.path ^= "/httproute-testing/")) + - expression: (http.path == "/httproute-testing") || (http.path ^= "/httproute-testing/") https_redirect_status_code: 426 name: httproute..httproute-testing._.0.0 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml index d5be1d73dd..be6c47d147 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-empty-path/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml index 29d7a6c26f..783bd201fa 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-multiple-ports-for-one-service/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.net") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.net") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.net.8000 preserve_host: true @@ -39,8 +38,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml index c727407ce2..126bc64a71 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-ports-defined-by-name/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.regex-prefix.foo-svc.example.com.http preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/expression-routes-on_golden.yaml index 6acaacf23c..3d3cc454e4 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefix-exact-rule/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path == "/whatever") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path == "/whatever") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefixed-path/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefixed-path/expression-routes-on_golden.yaml index 8cf1085015..3ee102bb31 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefixed-path/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-regex-prefixed-path/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path ~ "^/foo/\\d{3}") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ~ "^/foo/\\d{3}") https_redirect_status_code: 426 name: foo-namespace.regex-prefix.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-rule-with-tls/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-rule-with-tls/expression-routes-on_golden.yaml index ea97bfca2d..40d3594d2b 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-rule-with-tls/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-rule-with-tls/expression-routes-on_golden.yaml @@ -76,8 +76,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path == "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path == "/") https_redirect_status_code: 426 name: bar-namespace.ing-with-tls.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-single-service-in-multiple-ingresses/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-single-service-in-multiple-ingresses/expression-routes-on_golden.yaml index d816bc5543..e05be36c80 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-single-service-in-multiple-ingresses/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-single-service-in-multiple-ingresses/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.com.80 preserve_host: true @@ -24,8 +23,7 @@ services: - k8s-kind:Ingress - k8s-group:networking.k8s.io - k8s-version:v1 - - expression: (http.host == "example.com") && (http.path ^= "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path ^= "/") https_redirect_status_code: 426 name: foo-namespace.foo-2.foo-svc.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-with-acme-like-path/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-with-acme-like-path/expression-routes-on_golden.yaml index 9bfe4c196e..d367a95235 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-with-acme-like-path/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-with-acme-like-path/expression-routes-on_golden.yaml @@ -10,7 +10,6 @@ services: retries: 5 routes: - expression: (http.host == "example.com") && (http.path ^= "/.well-known/acme-challenge/yolo") - && ((net.protocol == "http") || (net.protocol == "https")) https_redirect_status_code: 426 name: foo-namespace.foo.cert-manager-solver-pod.example.com.80 preserve_host: true diff --git a/internal/dataplane/parser/testdata/golden/ingress-v1-with-default-backend/expression-routes-on_golden.yaml b/internal/dataplane/parser/testdata/golden/ingress-v1-with-default-backend/expression-routes-on_golden.yaml index 5d3a6ba279..99dd0c15bf 100644 --- a/internal/dataplane/parser/testdata/golden/ingress-v1-with-default-backend/expression-routes-on_golden.yaml +++ b/internal/dataplane/parser/testdata/golden/ingress-v1-with-default-backend/expression-routes-on_golden.yaml @@ -9,8 +9,7 @@ services: read_timeout: 60000 retries: 5 routes: - - expression: (http.host == "example.com") && (http.path == "/") && ((net.protocol - == "http") || (net.protocol == "https")) + - expression: (http.host == "example.com") && (http.path == "/") https_redirect_status_code: 426 name: foo-namespace.foo.foo-svc.example.com.80 preserve_host: true