From e9083383ffc21a5d3ec4fed8c42520cc7e8e39c7 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 22 Oct 2017 19:09:28 -0300 Subject: [PATCH] Fix cors tests --- pkg/ingress/controller/annotations.go | 4 ++-- pkg/ingress/controller/util_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/ingress/controller/annotations.go b/pkg/ingress/controller/annotations.go index a1445e3d3..d251db4eb 100644 --- a/pkg/ingress/controller/annotations.go +++ b/pkg/ingress/controller/annotations.go @@ -130,7 +130,7 @@ const ( sessionAffinity = "SessionAffinity" serviceUpstream = "ServiceUpstream" serverAlias = "Alias" - enableCors = "EnableCORS" + corsConfig = "CorsConfig" clientBodyBufferSize = "ClientBodyBufferSize" certificateAuth = "CertificateAuth" serverSnippet = "ServerSnippet" @@ -177,7 +177,7 @@ func (e *annotationExtractor) SessionAffinity(ing *extensions.Ingress) *sessiona } 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) } diff --git a/pkg/ingress/controller/util_test.go b/pkg/ingress/controller/util_test.go index cf19d94ea..3b4465522 100644 --- a/pkg/ingress/controller/util_test.go +++ b/pkg/ingress/controller/util_test.go @@ -46,7 +46,7 @@ func TestMergeLocationAnnotations(t *testing.T) { "Backend": "foo_backend", "BasicDigestAuth": auth.BasicDigest{}, DeniedKeyName: &fakeError{}, - "EnableCORS": cors.CorsConfig{}, + "CorsConfig": cors.CorsConfig{}, "ExternalAuth": authreq.External{}, "RateLimit": ratelimit.RateLimit{}, "Redirect": redirect.Redirect{},