DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor handling of path Prefix and Exact

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-11-08 11:30:43 -03:00
parent 52726abaee
commit 3f153add00
10 changed files with 316 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/e2e/annotations/rewrite.go
View file

@ -95,7 +95,8 @@ var _ = framework.DescribeAnnotation("rewrite-target use-regex enable-rewrite-lo
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `location ~* "^/" {`) && strings.Contains(server, `location ~* "^/.well-known/acme/challenge" {`)
return strings.Contains(server, `location ~* "^/" {`) &&
strings.Contains(server, `location ~* "^/.well-known/acme/challenge" {`)
})
ginkgo.By("making a second request to the non-rewritten location")
@ -116,7 +117,7 @@ var _ = framework.DescribeAnnotation("rewrite-target use-regex enable-rewrite-lo
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "location /foo {")
return strings.Contains(server, "location /foo/ {")
})
ginkgo.By(`creating an ingress definition with the use-regex amd rewrite-target annotation`)
@ -129,7 +130,8 @@ var _ = framework.DescribeAnnotation("rewrite-target use-regex enable-rewrite-lo
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `location ~* "^/foo" {`) && strings.Contains(server, `location ~* "^/foo.+" {`)
return strings.Contains(server, `location ~* "^/foo" {`) &&
strings.Contains(server, `location ~* "^/foo.+" {`)
})
ginkgo.By("ensuring '/foo' matches '~* ^/foo'")