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

Fix cors tests

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-10-22 19:09:28 -03:00
parent e2790c8f6f
commit e9083383ff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/ingress/controller/annotations.go
View file

@ -130,7 +130,7 @@ const (
sessionAffinity = "SessionAffinity" sessionAffinity = "SessionAffinity"
serviceUpstream = "ServiceUpstream" serviceUpstream = "ServiceUpstream"
serverAlias = "Alias" serverAlias = "Alias"
enableCors = "EnableCORS" corsConfig = "CorsConfig"
clientBodyBufferSize = "ClientBodyBufferSize" clientBodyBufferSize = "ClientBodyBufferSize"
certificateAuth = "CertificateAuth" certificateAuth = "CertificateAuth"
serverSnippet = "ServerSnippet" serverSnippet = "ServerSnippet"
@ -177,7 +177,7 @@ func (e *annotationExtractor) SessionAffinity(ing *extensions.Ingress) *sessiona
} }
func (e *annotationExtractor) Cors(ing *extensions.Ingress) *cors.CorsConfig { func (e *annotationExtractor) Cors(ing *extensions.Ingress) *cors.CorsConfig {
val, _ := e.annotations[enableCors].Parse(ing) val, _ := e.annotations[corsConfig].Parse(ing)
return val.(*cors.CorsConfig) return val.(*cors.CorsConfig)
} }

2
pkg/ingress/controller/util_test.go
View file

@ -46,7 +46,7 @@ func TestMergeLocationAnnotations(t *testing.T) {
"Backend": "foo_backend", "Backend": "foo_backend",
"BasicDigestAuth": auth.BasicDigest{}, "BasicDigestAuth": auth.BasicDigest{},
DeniedKeyName: &fakeError{}, DeniedKeyName: &fakeError{},
"EnableCORS": cors.CorsConfig{}, "CorsConfig": cors.CorsConfig{},
"ExternalAuth": authreq.External{}, "ExternalAuth": authreq.External{},
"RateLimit": ratelimit.RateLimit{}, "RateLimit": ratelimit.RateLimit{},
"Redirect": redirect.Redirect{}, "Redirect": redirect.Redirect{},