Deny location mapping in case of specific errors

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

@@ -17,12 +17,10 @@ limitations under the License.
 package rewrite
 
 import (
-	"errors"
-
 	"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 (
@@ -42,19 +40,27 @@ type Redirect struct {
 	SSLRedirect bool `json:"sslRedirect"`
 }
 
+type rewrite struct {
+	backendResolver resolver.DefaultBackend
+}
+
+// NewParser creates a new reqrite annotation parser
+func NewParser(br resolver.DefaultBackend) parser.IngressAnnotation {
+	return rewrite{br}
+}
+
 // ParseAnnotations parses the annotations contained in the ingress
 // rule used to rewrite the defined paths
-func ParseAnnotations(cfg defaults.Backend, ing *extensions.Ingress) (*Redirect, error) {
-	if ing.GetAnnotations() == nil {
-		return &Redirect{}, errors.New("no annotations present")
+func (a rewrite) Parse(ing *extensions.Ingress) (interface{}, error) {
+	rt, err := parser.GetStringAnnotation(rewriteTo, ing)
+	if err != nil {
+		return nil, err
 	}
 
 	sslRe, err := parser.GetBoolAnnotation(sslRedirect, ing)
 	if err != nil {
-		sslRe = cfg.SSLRedirect
+		sslRe = a.backendResolver.GetDefaultBackend().SSLRedirect
 	}
-
-	rt, _ := parser.GetStringAnnotation(rewriteTo, ing)
 	abu, _ := parser.GetBoolAnnotation(addBaseURL, ing)
 	return &Redirect{
 		Target:      rt,

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

@@ -65,9 +65,17 @@ func buildIngress() *extensions.Ingress {
 	}
 }
 
+type mockBackend struct {
+	redirect bool
+}
+
+func (m mockBackend) GetDefaultBackend() defaults.Backend {
+	return defaults.Backend{SSLRedirect: m.redirect}
+}
+
 func TestWithoutAnnotations(t *testing.T) {
 	ing := buildIngress()
-	_, err := ParseAnnotations(defaults.Backend{}, ing)
+	_, err := NewParser(mockBackend{}).Parse(ing)
 	if err == nil {
 		t.Error("Expected error with ingress without annotations")
 	}
@@ -80,11 +88,14 @@ func TestRedirect(t *testing.T) {
 	data[rewriteTo] = defRoute
 	ing.SetAnnotations(data)
 
-	redirect, err := ParseAnnotations(defaults.Backend{}, ing)
+	i, err := NewParser(mockBackend{}).Parse(ing)
 	if err != nil {
-		t.Errorf("Uxpected error with ingress: %v", err)
+		t.Errorf("Unexpected error with ingress: %v", err)
+	}
+	redirect, ok := i.(*Redirect)
+	if !ok {
+		t.Errorf("expected a Redirect type")
 	}
-
 	if redirect.Target != defRoute {
 		t.Errorf("Expected %v as redirect but returned %s", defRoute, redirect.Target)
 	}
@@ -93,13 +104,18 @@ func TestRedirect(t *testing.T) {
 func TestSSLRedirect(t *testing.T) {
 	ing := buildIngress()
 
-	cfg := defaults.Backend{SSLRedirect: true}
-
 	data := map[string]string{}
-
+	data[rewriteTo] = defRoute
 	ing.SetAnnotations(data)
 
-	redirect, _ := ParseAnnotations(cfg, ing)
+	i, _ := NewParser(mockBackend{true}).Parse(ing)
+	redirect, ok := i.(*Redirect)
+	if !ok {
+		t.Errorf("expected a Redirect type")
+	}
+	if !redirect.SSLRedirect {
+		t.Errorf("Expected true but returned false")
+	}
 
 	if !redirect.SSLRedirect {
 		t.Errorf("Expected true but returned false")
@@ -108,8 +124,11 @@ func TestSSLRedirect(t *testing.T) {
 	data[sslRedirect] = "false"
 	ing.SetAnnotations(data)
 
-	redirect, _ = ParseAnnotations(cfg, ing)
-
+	i, _ = NewParser(mockBackend{false}).Parse(ing)
+	redirect, ok = i.(*Redirect)
+	if !ok {
+		t.Errorf("expected a Redirect type")
+	}
 	if redirect.SSLRedirect {
 		t.Errorf("Expected false but returned true")
 	}