From 0ab2e72e95b27e0880280faf23db699518375c9b Mon Sep 17 00:00:00 2001 From: schaefec Date: Wed, 16 Oct 2019 15:35:49 +0100 Subject: [PATCH] Doesn't fail if proxy-ssl-name annotation is not specified --- internal/ingress/annotations/proxyssl/main.go | 13 ++++++------- internal/ingress/annotations/proxyssl/main_test.go | 5 ++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/internal/ingress/annotations/proxyssl/main.go b/internal/ingress/annotations/proxyssl/main.go index eb44ae803..51fd1eff7 100644 --- a/internal/ingress/annotations/proxyssl/main.go +++ b/internal/ingress/annotations/proxyssl/main.go @@ -45,11 +45,11 @@ var ( // and the configured VerifyDepth type Config struct { resolver.AuthSSLCert - Ciphers string `json:"ciphers"` - Protocols string `json:"protocols"` - ProxySSLName string `json:"proxySSLName"` - Verify string `json:"verify"` - VerifyDepth int `json:"verifyDepth"` + Ciphers string `json:"ciphers"` + Protocols string `json:"protocols"` + ProxySSLName string `json:"proxySSLName"` + Verify string `json:"verify"` + VerifyDepth int `json:"verifyDepth"` } // Equal tests for equality between two Config types @@ -146,8 +146,7 @@ func (p proxySSL) Parse(ing *networking.Ingress) (interface{}, error) { config.ProxySSLName, err = parser.GetStringAnnotation("proxy-ssl-name", ing) if err != nil { - e := errors.Wrap(err, "error obtaining proxy-ssl-name") - return &Config{}, ing_errors.LocationDenied{Reason: e} + config.ProxySSLName = "" } config.Verify, err = parser.GetStringAnnotation("proxy-ssl-verify", ing) diff --git a/internal/ingress/annotations/proxyssl/main_test.go b/internal/ingress/annotations/proxyssl/main_test.go index 5f63c992e..1c35ed683 100644 --- a/internal/ingress/annotations/proxyssl/main_test.go +++ b/internal/ingress/annotations/proxyssl/main_test.go @@ -94,7 +94,6 @@ func TestAnnotations(t *testing.T) { data[parser.GetAnnotationWithPrefix("proxy-ssl-session-reuse")] = "off" data[parser.GetAnnotationWithPrefix("proxy-ssl-verify")] = "on" data[parser.GetAnnotationWithPrefix("proxy-ssl-verify-depth")] = "3" - data[parser.GetAnnotationWithPrefix("proxy-ssl-name")] = "testname.namespace" ing.SetAnnotations(data) @@ -129,8 +128,8 @@ func TestAnnotations(t *testing.T) { if u.VerifyDepth != 3 { t.Errorf("expected %v but got %v", 3, u.VerifyDepth) } - if u.ProxySSLName != "testname.namespace" { - t.Errorf("expected %v but got %v", "testname.namespace", u.ProxySSLName) + if u.ProxySSLName != "$host" { + t.Errorf("expected %v but got %v", "$host", u.ProxySSLName) } }