Move deprecated constants back, as the staticcheck does not approve

Signed-off-by: Peter Klijn <[email protected]>
zalando · Aug 13, 2021 · 8d2e3c0 · 8d2e3c0
1 parent 9cc68a1
commit 8d2e3c0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 21 deletions.
diff --git a/filters/accesslog/disable.go b/filters/accesslog/disable.go
@@ -4,6 +4,11 @@ import (
 	"github.com/zalando/skipper/filters"
 )
 
+const (
+	// Deprecated: use DisableAccessLogName or EnableAccessLogName
+	AccessLogDisabledName = "accessLogDisabled"
+)
+
 type accessLogDisabled struct {
 	disabled bool
 }
@@ -16,7 +21,7 @@ func NewAccessLogDisabled() filters.Spec {
 	return &accessLogDisabled{}
 }
 
-func (*accessLogDisabled) Name() string { return filters.AccessLogDisabledName }
+func (*accessLogDisabled) Name() string { return AccessLogDisabledName }
 
 func (*accessLogDisabled) CreateFilter(args []interface{}) (filters.Filter, error) {
 	if len(args) != 1 {

diff --git a/filters/builtin/builtin.go b/filters/builtin/builtin.go
@@ -24,6 +24,17 @@ import (
 	"github.com/zalando/skipper/script"
 )
 
+const (
+	// Deprecated: use setRequestHeader or appendRequestHeader
+	RequestHeaderName = "requestHeader"
+
+	// Deprecated: use setResponseHeader or appendResponseHeader
+	ResponseHeaderName = "responseHeader"
+
+	// Deprecated: use redirectTo
+	RedirectName = "redirect"
+)
+
 // Returns a Registry object initialized with the default set of filter
 // specifications found in the filters package. (including the builtin
 // and the flowid subdirectories.)

diff --git a/filters/builtin/headerfilter.go b/filters/builtin/headerfilter.go
@@ -207,9 +207,9 @@ func (spec *headerFilter) Name() string {
 	case dropResponseHeader:
 		return filters.DropResponseHeaderName
 	case depRequestHeader:
-		return filters.RequestHeaderName
+		return RequestHeaderName
 	case depResponseHeader:
-		return filters.ResponseHeaderName
+		return ResponseHeaderName
 	case setContextRequestHeader:
 		return filters.SetContextRequestHeaderName
 	case appendContextRequestHeader:

diff --git a/filters/builtin/redirect.go b/filters/builtin/redirect.go
@@ -64,7 +64,7 @@ func NewRedirectLower() filters.Spec { return &redirect{typ: redToLower} }
 func (spec *redirect) Name() string {
 	switch spec.typ {
 	case redDeprecated:
-		return filters.RedirectName
+		return RedirectName
 	case redToLower:
 		return filters.RedirectToLowerName
 	default:

diff --git a/filters/builtin/redirect_test.go b/filters/builtin/redirect_test.go
@@ -118,7 +118,7 @@ func TestRedirect(t *testing.T) {
 			name string
 		}{{
 			"deprecated",
-			filters.RedirectName,
+			RedirectName,
 		}, {
 			"not deprecated",
 			filters.RedirectToName,

diff --git a/filters/filters.go b/filters/filters.go
@@ -291,19 +291,6 @@ const (
 	ConsistentHashKeyName                      = "consistentHashKey"
 	ConsistentHashBalanceFactorName            = "consistentHashBalanceFactor"
 
-	// Deprecated: use setRequestHeader or appendRequestHeader
-	RequestHeaderName = "requestHeader"
-	// Deprecated: use setResponseHeader or appendResponseHeader
-	ResponseHeaderName = "responseHeader"
-	// Deprecated: use redirectTo
-	RedirectName = "redirect"
-	// Deprecated: use ClientRatelimitName instead
-	LocalRatelimitName = "localRatelimit"
-	// Deprecated: use DisableAccessLogName or EnableAccessLogName
-	AccessLogDisabledName = "accessLogDisabled"
-	// Deprecated: use TeeName
-	DeprecatedTeeName = "Tee"
-
 	// Undocumented filters
 	HealthCheckName        = "healthcheck"
 	SetFastCgiFilenameName = "setFastCgiFilename"

diff --git a/filters/ratelimit/ratelimit.go b/filters/ratelimit/ratelimit.go
@@ -63,7 +63,7 @@ func NewRatelimitProvider(registry *ratelimit.Registry) RatelimitProvider {
 
 // NewLocalRatelimit is *DEPRECATED*, use NewClientRatelimit, instead
 func NewLocalRatelimit(provider RatelimitProvider) filters.Spec {
-	return &spec{typ: ratelimit.LocalRatelimit, provider: provider, filterName: filters.LocalRatelimitName}
+	return &spec{typ: ratelimit.LocalRatelimit, provider: provider, filterName: ratelimit.LocalRatelimitName}
 }
 
 // NewClientRatelimit creates a instance based client rate limit.  If

diff --git a/filters/tee/tee.go b/filters/tee/tee.go
@@ -12,6 +12,11 @@ import (
 	"github.com/zalando/skipper/filters"
 )
 
+const (
+	// Deprecated: use TeeName
+	DeprecatedTeeName = "Tee"
+)
+
 const defaultTeeTimeout = time.Second
 
 type teeSpec struct {
@@ -269,7 +274,7 @@ func (spec *teeSpec) CreateFilter(config []interface{}) (filters.Filter, error)
 
 func (spec *teeSpec) Name() string {
 	if spec.deprecated {
-		return filters.DeprecatedTeeName
+		return DeprecatedTeeName
 	}
 	if spec.options.NoFollow {
 		return filters.TeenfName

diff --git a/ratelimit/ratelimit.go b/ratelimit/ratelimit.go
@@ -23,6 +23,9 @@ const (
 	// RetryHeader is name of the header which will be used to indicate how
 	// long a client should wait before making a new request
 	RetryAfterHeader = "Retry-After"
+
+	// LocalRatelimitName *DEPRECATED*, use ClientRatelimitName instead
+	LocalRatelimitName = "localRatelimit"
 )
 
 // RatelimitType defines the type of  the used ratelimit
@@ -117,7 +120,7 @@ func (rt RatelimitType) String() string {
 	case ClusterServiceRatelimit:
 		return filters.ClusterRatelimitName
 	case LocalRatelimit:
-		return filters.LocalRatelimitName
+		return LocalRatelimitName
 	case ServiceRatelimit:
 		return filters.RatelimitName
 	default: