Merge pull request #1571 from aledbf/fix-tests

Fix cors tests
kubernetes · Oct 22, 2017 · 10c594f · 10c594f
2 parents e2790c8 + e908338
commit 10c594f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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{},