From 7136091c7b4f3150de8c331cd90dc9c03c041787 Mon Sep 17 00:00:00 2001 From: lmineiro Date: Fri, 16 Oct 2015 10:36:42 +0200 Subject: [PATCH] Moved general error instance to the filters package to be reused Closes #18 --- filters/filters.go | 5 +++++ filters/flowid/filter.go | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/filters/filters.go b/filters/filters.go index e53fe8673a..685092e187 100644 --- a/filters/filters.go +++ b/filters/filters.go @@ -3,6 +3,7 @@ package filters import ( // import filter packages here: + "errors" "github.com/zalando/skipper/filters/healthcheck" "github.com/zalando/skipper/filters/humanstxt" "github.com/zalando/skipper/filters/pathrewrite" @@ -14,6 +15,10 @@ import ( "github.com/zalando/skipper/skipper" ) +var ( + ErrInvalidFilterParameters = errors.New("Invalid filter parameters") +) + // takes a registry object and registers the filter spec in the package func Register(registry skipper.FilterRegistry) { registry.Add( diff --git a/filters/flowid/filter.go b/filters/flowid/filter.go index ec6d181233..585de9f2b7 100644 --- a/filters/flowid/filter.go +++ b/filters/flowid/filter.go @@ -1,7 +1,7 @@ package flowid import ( - "errors" + "github.com/zalando/skipper/filters" "github.com/zalando/skipper/skipper" ) @@ -16,10 +16,6 @@ type flowId struct { flowIdLength uint8 } -var ( - ErrInvalidFilterParameters = errors.New("Invalid filter parameters") -) - func New(id string, allowOverride bool, len uint8) skipper.Filter { return &flowId{id, allowOverride, len} } @@ -53,7 +49,7 @@ func (this *flowId) MakeFilter(id string, fc skipper.FilterConfig) (skipper.Filt if r, ok := fc[0].(bool); ok { reuseExisting = r } else { - return nil, ErrInvalidFilterParameters + return nil, filters.ErrInvalidFilterParameters } } var flowIdLength uint8 = defaultLen @@ -61,7 +57,7 @@ func (this *flowId) MakeFilter(id string, fc skipper.FilterConfig) (skipper.Filt if l, ok := fc[1].(float64); ok && l >= minLength && l <= maxLength { flowIdLength = uint8(l) } else { - return nil, ErrInvalidFilterParameters + return nil, filters.ErrInvalidFilterParameters } } return New(id, reuseExisting, flowIdLength), nil