Deny location mapping in case of specific errors

core/pkg/ingress/annotations/proxy/main.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/kubernetes/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress/core/pkg/ingress/resolver"
 )
 
 const (
@@ -38,37 +38,38 @@ type Configuration struct {
 	BufferSize     string `json:"bufferSize"`
 }
 
+type proxy struct {
+	backendResolver resolver.DefaultBackend
+}
+
+// NewParser creates a new reverse proxy configuration annotation parser
+func NewParser(br resolver.DefaultBackend) parser.IngressAnnotation {
+	return proxy{br}
+}
+
 // ParseAnnotations parses the annotations contained in the ingress
 // rule used to configure upstream check parameters
-func ParseAnnotations(cfg defaults.Backend, ing *extensions.Ingress) *Configuration {
-	if ing == nil || ing.GetAnnotations() == nil {
-		return &Configuration{
-			cfg.ProxyConnectTimeout,
-			cfg.ProxySendTimeout,
-			cfg.ProxyReadTimeout,
-			cfg.ProxyBufferSize,
-		}
-	}
-
+func (a proxy) Parse(ing *extensions.Ingress) (interface{}, error) {
+	defBackend := a.backendResolver.GetDefaultBackend()
 	ct, err := parser.GetIntAnnotation(connect, ing)
 	if err != nil {
-		ct = cfg.ProxyConnectTimeout
+		ct = defBackend.ProxyConnectTimeout
 	}
 
 	st, err := parser.GetIntAnnotation(send, ing)
 	if err != nil {
-		st = cfg.ProxySendTimeout
+		st = defBackend.ProxySendTimeout
 	}
 
 	rt, err := parser.GetIntAnnotation(read, ing)
 	if err != nil {
-		rt = cfg.ProxyReadTimeout
+		rt = defBackend.ProxyReadTimeout
 	}
 
 	bs, err := parser.GetStringAnnotation(bufferSize, ing)
 	if err != nil || bs == "" {
-		bs = cfg.ProxyBufferSize
+		bs = defBackend.ProxyBufferSize
 	}
 
-	return &Configuration{ct, st, rt, bs}
+	return &Configuration{ct, st, rt, bs}, nil
 }

core/pkg/ingress/annotations/proxy/main_test.go

@@ -61,7 +61,14 @@ func buildIngress() *extensions.Ingress {
 	}
 }
 
-func TestIngressHealthCheck(t *testing.T) {
+type mockBackend struct {
+}
+
+func (m mockBackend) GetDefaultBackend() defaults.Backend {
+	return defaults.Backend{UpstreamFailTimeout: 1}
+}
+
+func TestProxy(t *testing.T) {
 	ing := buildIngress()
 
 	data := map[string]string{}
@@ -71,20 +78,24 @@ func TestIngressHealthCheck(t *testing.T) {
 	data[bufferSize] = "1k"
 	ing.SetAnnotations(data)
 
-	cfg := defaults.Backend{UpstreamFailTimeout: 1}
-
-	p := ParseAnnotations(cfg, ing)
-
+	i, err := NewParser(mockBackend{}).Parse(ing)
+	if err != nil {
+		t.Errorf("unexpected error parsing a valid")
+	}
+	p, ok := i.(*Configuration)
+	if !ok {
+		t.Errorf("expected a Configuration type")
+	}
 	if p.ConnectTimeout != 1 {
-		t.Errorf("Expected 1 as connect-timeout but returned %v", p.ConnectTimeout)
+		t.Errorf("expected 1 as connect-timeout but returned %v", p.ConnectTimeout)
 	}
 	if p.SendTimeout != 2 {
-		t.Errorf("Expected 2 as send-timeout but returned %v", p.SendTimeout)
+		t.Errorf("expected 2 as send-timeout but returned %v", p.SendTimeout)
 	}
 	if p.ReadTimeout != 3 {
-		t.Errorf("Expected 3 as read-timeout but returned %v", p.ReadTimeout)
+		t.Errorf("expected 3 as read-timeout but returned %v", p.ReadTimeout)
 	}
 	if p.BufferSize != "1k" {
-		t.Errorf("Expected 1k as buffer-size but returned %v", p.BufferSize)
+		t.Errorf("expected 1k as buffer-size but returned %v", p.BufferSize)
 	}
 }