Deny location mapping in case of specific errors

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

@@ -17,7 +17,6 @@ limitations under the License.
 package ratelimit
 
 import (
-	"errors"
 	"fmt"
 
 	"k8s.io/kubernetes/pkg/apis/extensions"
@@ -37,11 +36,6 @@ const (
 	defSharedSize = 5
 )
 
-var (
-	// ErrInvalidRateLimit is returned when the annotation caontains invalid values
-	ErrInvalidRateLimit = errors.New("invalid rate limit value. Must be > 0")
-)
-
 // RateLimit returns rate limit configuration for an Ingress rule
 // Is possible to limit the number of connections per IP address or
 // connections per second.
@@ -63,12 +57,17 @@ type Zone struct {
 	SharedSize int `json:"sharedSize"`
 }
 
+type ratelimit struct {
+}
+
+// NewParser creates a new ratelimit annotation parser
+func NewParser() parser.IngressAnnotation {
+	return ratelimit{}
+}
+
 // ParseAnnotations parses the annotations contained in the ingress
 // rule used to rewrite the defined paths
-func ParseAnnotations(ing *extensions.Ingress) (*RateLimit, error) {
-	if ing.GetAnnotations() == nil {
-		return &RateLimit{}, parser.ErrMissingAnnotations
-	}
+func (a ratelimit) Parse(ing *extensions.Ingress) (interface{}, error) {
 
 	rps, _ := parser.GetIntAnnotation(limitRPS, ing)
 	conn, _ := parser.GetIntAnnotation(limitIP, ing)
@@ -77,7 +76,7 @@ func ParseAnnotations(ing *extensions.Ingress) (*RateLimit, error) {
 		return &RateLimit{
 			Connections: Zone{},
 			RPS:         Zone{},
-		}, ErrInvalidRateLimit
+		}, nil
 	}
 
 	zoneName := fmt.Sprintf("%v_%v", ing.GetNamespace(), ing.GetName())

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

@@ -61,9 +61,9 @@ func buildIngress() *extensions.Ingress {
 
 func TestWithoutAnnotations(t *testing.T) {
 	ing := buildIngress()
-	_, err := ParseAnnotations(ing)
-	if err == nil {
-		t.Error("Expected error with ingress without annotations")
+	_, err := NewParser().Parse(ing)
+	if err != nil {
+		t.Error("unexpected error with ingress without annotations")
 	}
 }
 
@@ -75,9 +75,9 @@ func TestBadRateLimiting(t *testing.T) {
 	data[limitRPS] = "0"
 	ing.SetAnnotations(data)
 
-	_, err := ParseAnnotations(ing)
-	if err == nil {
-		t.Errorf("Expected error with invalid limits (0)")
+	_, err := NewParser().Parse(ing)
+	if err != nil {
+		t.Errorf("unexpected error with invalid limits (0)")
 	}
 
 	data = map[string]string{}
@@ -85,16 +85,18 @@ func TestBadRateLimiting(t *testing.T) {
 	data[limitRPS] = "100"
 	ing.SetAnnotations(data)
 
-	rateLimit, err := ParseAnnotations(ing)
+	i, err := NewParser().Parse(ing)
 	if err != nil {
-		t.Errorf("Uxpected error: %v", err)
+		t.Errorf("unexpected error: %v", err)
+	}
+	rateLimit, ok := i.(*RateLimit)
+	if !ok {
+		t.Errorf("expected a RateLimit type")
 	}
-
 	if rateLimit.Connections.Limit != 5 {
-		t.Errorf("Expected 5 in limit by ip but %v was returend", rateLimit.Connections)
+		t.Errorf("expected 5 in limit by ip but %v was returend", rateLimit.Connections)
 	}
-
 	if rateLimit.RPS.Limit != 100 {
-		t.Errorf("Expected 100 in limit by rps but %v was returend", rateLimit.RPS)
+		t.Errorf("expected 100 in limit by rps but %v was returend", rateLimit.RPS)
 	}
 }