Removed breaking changes

marking old public constants as deprecated Signed-off-by: Peter Klijn <[email protected]>
zalando · Sep 20, 2021 · f588346 · f588346
1 parent b3ea08e
commit f588346
Show file tree

Hide file tree

Showing 42 changed files with 329 additions and 3 deletions.
diff --git a/filters/accesslog/control.go b/filters/accesslog/control.go
@@ -3,6 +3,11 @@ package accesslog
 import "github.com/zalando/skipper/filters"
 
 const (
+	// Deprecated, use filters.DisableAccessLogName instead
+	DisableAccessLogName = filters.DisableAccessLogName
+
+	// Deprecated, use filters.EnableAccessLogName instead
+	EnableAccessLogName = filters.EnableAccessLogName
 
 	// AccessLogEnabledKey is the key used in the state bag to pass the access log state to the proxy.
 	AccessLogEnabledKey = "statebag:access_log:proxy:enabled"

diff --git a/filters/apiusagemonitoring/spec.go b/filters/apiusagemonitoring/spec.go
@@ -13,6 +13,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.ApiUsageMonitoringName instead
+	Name = filters.ApiUsageMonitoringName
+
 	unknownPlaceholder = "{unknown}"
 	noMatchPlaceholder = "{no-match}"
 	noTagPlaceholder   = "{no-tag}"

diff --git a/filters/auth/basic.go b/filters/auth/basic.go
@@ -7,6 +7,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.BasicAuthName instead
+	Name = filters.BasicAuthName
+
 	ForceBasicAuthHeaderName  = "WWW-Authenticate"
 	ForceBasicAuthHeaderValue = "Basic realm="
 	DefaultRealmName          = "Basic Realm"

diff --git a/filters/auth/bearer.go b/filters/auth/bearer.go
@@ -5,6 +5,11 @@ import (
 	"github.com/zalando/skipper/secrets"
 )
 
+const (
+	// Deprecated, use filters.BearerInjectorName instead
+	BearerInjectorName = filters.BearerInjectorName
+)
+
 type (
 	bearerInjectorSpec struct {
 		secretsReader secrets.SecretsReader

diff --git a/filters/auth/forwardtoken.go b/filters/auth/forwardtoken.go
@@ -9,6 +9,11 @@ import (
 	"golang.org/x/net/http/httpguts"
 )
 
+const (
+	// Deprecated, use filters.ForwardTokenName instead
+	ForwardTokenName = filters.ForwardTokenName
+)
+
 type (
 	forwardTokenSpec   struct{}
 	forwardTokenFilter struct {

diff --git a/filters/auth/grant.go b/filters/auth/grant.go
@@ -13,6 +13,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.OAuthGrantName instead
+	OAuthGrantName = filters.OAuthGrantName
+
 	secretsRefreshInternal = time.Minute
 	tokenWasRefreshed      = "oauth-did-refresh"
 )

diff --git a/filters/auth/grantcallback.go b/filters/auth/grantcallback.go
@@ -8,6 +8,9 @@ import (
 	"golang.org/x/oauth2"
 )
 
+// Deprecated, use filters.GrantCallbackName instead
+const GrantCallbackName = filters.GrantCallbackName
+
 type grantCallbackSpec struct {
 	config OAuthConfig
 }

diff --git a/filters/auth/grantclaimsquery.go b/filters/auth/grantclaimsquery.go
@@ -9,6 +9,9 @@ package auth
 
 import "github.com/zalando/skipper/filters"
 
+// Deprecated, use filters.GrantClaimsQueryName instead
+const GrantClaimsQueryName = filters.GrantClaimsQueryName
+
 type grantClaimsQuerySpec struct {
 	oidcSpec oidcIntrospectionSpec
 }

diff --git a/filters/auth/grantlogout.go b/filters/auth/grantlogout.go
@@ -14,6 +14,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.GrantLogoutName instead
+	GrantLogoutName = filters.GrantLogoutName
+
 	revokeTokenKey          = "token"
 	revokeTokenTypeKey      = "token_type_hint"
 	refreshTokenType        = "refresh_token"

diff --git a/filters/auth/oidc.go b/filters/auth/oidc.go
@@ -27,6 +27,13 @@ import (
 )
 
 const (
+	// Deprecated, use filters.OAuthOidcUserInfoName instead
+	OidcUserInfoName = filters.OAuthOidcUserInfoName
+	// Deprecated, use filters.OAuthOidcAnyClaimsName instead
+	OidcAnyClaimsName = filters.OAuthOidcAnyClaimsName
+	// Deprecated, use filters.OAuthOidcAllClaimsName instead
+	OidcAllClaimsName = filters.OAuthOidcAllClaimsName
+
 	oauthOidcCookieName = "skipperOauthOidc"
 	stateValidity       = 1 * time.Minute
 	oidcInfoHeader      = "Skipper-Oidc-Info"

diff --git a/filters/auth/oidc_introspection.go b/filters/auth/oidc_introspection.go
@@ -13,6 +13,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.OidcClaimsQueryName instead
+	OidcClaimsQueryName = filters.OidcClaimsQueryName
+
 	oidcClaimsCacheKey = "oidcclaimscachekey"
 )
 

diff --git a/filters/auth/tokeninfo.go b/filters/auth/tokeninfo.go
@@ -11,6 +11,15 @@ import (
 )
 
 const (
+	// Deprecated, use filters.OAuthTokeninfoAnyScopeName instead
+	OAuthTokeninfoAnyScopeName = filters.OAuthTokeninfoAnyScopeName
+	// Deprecated, use filters.OAuthTokeninfoAllScopeName instead
+	OAuthTokeninfoAllScopeName = filters.OAuthTokeninfoAllScopeName
+	// Deprecated, use filters.OAuthTokeninfoAnyKVName instead
+	OAuthTokeninfoAnyKVName = filters.OAuthTokeninfoAnyKVName
+	// Deprecated, use filters.OAuthTokeninfoAllKVName instead
+	OAuthTokeninfoAllKVName = filters.OAuthTokeninfoAllKVName
+
 	tokeninfoCacheKey = "tokeninfo"
 )
 

diff --git a/filters/auth/tokenintrospection.go b/filters/auth/tokenintrospection.go
@@ -15,6 +15,23 @@ import (
 )
 
 const (
+	// Deprecated, use filters.OAuthTokenintrospectionAnyClaimsName instead
+	OAuthTokenintrospectionAnyClaimsName = filters.OAuthTokenintrospectionAnyClaimsName
+	// Deprecated, use filters.OAuthTokenintrospectionAllClaimsName instead
+	OAuthTokenintrospectionAllClaimsName = filters.OAuthTokenintrospectionAllClaimsName
+	// Deprecated, use filters.OAuthTokenintrospectionAnyKVName instead
+	OAuthTokenintrospectionAnyKVName = filters.OAuthTokenintrospectionAnyKVName
+	// Deprecated, use filters.OAuthTokenintrospectionAllKVName instead
+	OAuthTokenintrospectionAllKVName = filters.OAuthTokenintrospectionAllKVName
+	// Deprecated, use filters.SecureOAuthTokenintrospectionAnyClaimsName instead
+	SecureOAuthTokenintrospectionAnyClaimsName = filters.SecureOAuthTokenintrospectionAnyClaimsName
+	// Deprecated, use filters.SecureOAuthTokenintrospectionAllClaimsName instead
+	SecureOAuthTokenintrospectionAllClaimsName = filters.SecureOAuthTokenintrospectionAllClaimsName
+	// Deprecated, use filters.SecureOAuthTokenintrospectionAnyKVName instead
+	SecureOAuthTokenintrospectionAnyKVName = filters.SecureOAuthTokenintrospectionAnyKVName
+	// Deprecated, use filters.SecureOAuthTokenintrospectionAllKVName instead
+	SecureOAuthTokenintrospectionAllKVName = filters.SecureOAuthTokenintrospectionAllKVName
+
 	tokenintrospectionCacheKey   = "tokenintrospection"
 	TokenIntrospectionConfigPath = "/.well-known/openid-configuration"
 )

diff --git a/filters/auth/webhook.go b/filters/auth/webhook.go
@@ -13,6 +13,11 @@ import (
 	"github.com/zalando/skipper/filters"
 )
 
+const (
+	// Deprecated, use filters.WebhookName instead
+	WebhookName = filters.WebhookName
+)
+
 type WebhookOptions struct {
 	Timeout      time.Duration
 	MaxIdleConns int

diff --git a/filters/builtin/builtin.go b/filters/builtin/builtin.go
@@ -33,6 +33,83 @@ const (
 
 	// Deprecated: use redirectTo
 	RedirectName = "redirect"
+
+	// Deprecated, use filters.SetRequestHeaderName instead
+	SetRequestHeaderName = filters.SetRequestHeaderName
+	// Deprecated, use filters.SetResponseHeaderName instead
+	SetResponseHeaderName = filters.SetResponseHeaderName
+	// Deprecated, use filters.AppendRequestHeaderName instead
+	AppendRequestHeaderName = filters.AppendRequestHeaderName
+	// Deprecated, use filters.AppendResponseHeaderName instead
+	AppendResponseHeaderName = filters.AppendResponseHeaderName
+	// Deprecated, use filters.DropRequestHeaderName instead
+	DropRequestHeaderName = filters.DropRequestHeaderName
+	// Deprecated, use filters.DropResponseHeaderName instead
+	DropResponseHeaderName = filters.DropResponseHeaderName
+	// Deprecated, use filters.SetContextRequestHeaderName instead
+	SetContextRequestHeaderName = filters.SetContextRequestHeaderName
+	// Deprecated, use filters.AppendContextRequestHeaderName instead
+	AppendContextRequestHeaderName = filters.AppendContextRequestHeaderName
+	// Deprecated, use filters.SetContextResponseHeaderName instead
+	SetContextResponseHeaderName = filters.SetContextResponseHeaderName
+	// Deprecated, use filters.AppendContextResponseHeaderName instead
+	AppendContextResponseHeaderName = filters.AppendContextResponseHeaderName
+	// Deprecated, use filters.CopyRequestHeaderName instead
+	CopyRequestHeaderName = filters.CopyRequestHeaderName
+	// Deprecated, use filters.CopyResponseHeaderName instead
+	CopyResponseHeaderName = filters.CopyResponseHeaderName
+
+	// Deprecated, use filters.SetDynamicBackendHostFromHeader instead
+	SetDynamicBackendHostFromHeader = filters.SetDynamicBackendHostFromHeader
+	// Deprecated, use filters.SetDynamicBackendSchemeFromHeader instead
+	SetDynamicBackendSchemeFromHeader = filters.SetDynamicBackendSchemeFromHeader
+	// Deprecated, use filters.SetDynamicBackendUrlFromHeader instead
+	SetDynamicBackendUrlFromHeader = filters.SetDynamicBackendUrlFromHeader
+	// Deprecated, use filters.SetDynamicBackendHost instead
+	SetDynamicBackendHost = filters.SetDynamicBackendHost
+	// Deprecated, use filters.SetDynamicBackendScheme instead
+	SetDynamicBackendScheme = filters.SetDynamicBackendScheme
+	// Deprecated, use filters.SetDynamicBackendUrl instead
+	SetDynamicBackendUrl = filters.SetDynamicBackendUrl
+
+	// Deprecated, use filters.HealthCheckName instead
+	HealthCheckName = filters.HealthCheckName
+	// Deprecated, use filters.ModPathName instead
+	ModPathName = filters.ModPathName
+	// Deprecated, use filters.SetPathName instead
+	SetPathName = filters.SetPathName
+	// Deprecated, use filters.ModRequestHeaderName instead
+	ModRequestHeaderName = filters.ModRequestHeaderName
+	// Deprecated, use filters.RedirectToName instead
+	RedirectToName = filters.RedirectToName
+	// Deprecated, use filters.RedirectToLowerName instead
+	RedirectToLowerName = filters.RedirectToLowerName
+	// Deprecated, use filters.StaticName instead
+	StaticName = filters.StaticName
+	// Deprecated, use filters.StripQueryName instead
+	StripQueryName = filters.StripQueryName
+	// Deprecated, use filters.PreserveHostName instead
+	PreserveHostName = filters.PreserveHostName
+	// Deprecated, use filters.SetFastCgiFilenameName instead
+	SetFastCgiFilenameName = filters.SetFastCgiFilenameName
+	// Deprecated, use filters.StatusName instead
+	StatusName = filters.StatusName
+	// Deprecated, use filters.CompressName instead
+	CompressName = filters.CompressName
+	// Deprecated, use filters.SetQueryName instead
+	SetQueryName = filters.SetQueryName
+	// Deprecated, use filters.DropQueryName instead
+	DropQueryName = filters.DropQueryName
+	// Deprecated, use filters.InlineContentName instead
+	InlineContentName = filters.InlineContentName
+	// Deprecated, use filters.InlineContentIfStatusName instead
+	InlineContentIfStatusName = filters.InlineContentIfStatusName
+	// Deprecated, use filters.HeaderToQueryName instead
+	HeaderToQueryName = filters.HeaderToQueryName
+	// Deprecated, use filters.QueryToHeaderName instead
+	QueryToHeaderName = filters.QueryToHeaderName
+	// Deprecated, use filters.BackendTimeoutName instead
+	BackendTimeoutName = filters.BackendTimeoutName
 )
 
 // Returns a Registry object initialized with the default set of filter

diff --git a/filters/builtin/originmarker.go b/filters/builtin/originmarker.go
@@ -7,6 +7,11 @@ import (
 	"github.com/zalando/skipper/filters"
 )
 
+const (
+	// Deprecated, use filters.OriginMarkerName instead
+	OriginMarkerName = filters.OriginMarkerName
+)
+
 type originMarkerSpec struct{}
 
 // OriginMarker carries information about the origin of a route

diff --git a/filters/circuit/breaker.go b/filters/circuit/breaker.go
@@ -13,6 +13,13 @@ import (
 )
 
 const (
+	// Deprecated, use filters.ConsecutiveBreakerName instead
+	ConsecutiveBreakerName = filters.ConsecutiveBreakerName
+	// Deprecated, use filters.RateBreakerName instead
+	RateBreakerName = filters.RateBreakerName
+	// Deprecated, use filters.DisableBreakerName instead
+	DisableBreakerName = filters.DisableBreakerName
+
 	RouteSettingsKey = "#circuitbreakersettings"
 )
 

diff --git a/filters/cookie/cookie.go b/filters/cookie/cookie.go
@@ -44,6 +44,13 @@ import (
 )
 
 const (
+	// Deprecated, use filters.RequestCookieName instead
+	RequestCookieFilterName = filters.RequestCookieName
+	// Deprecated, use filters.ResponseCookieName instead
+	ResponseCookieFilterName = filters.ResponseCookieName
+	// Deprecated, use filters.JsCookieName instead
+	ResponseJSCookieFilterName = filters.JsCookieName
+
 	ChangeOnlyArg       = "change-only"
 	SetCookieHttpHeader = "Set-Cookie"
 )

diff --git a/filters/diag/absorb.go b/filters/diag/absorb.go
@@ -11,6 +11,12 @@ import (
 	"github.com/zalando/skipper/logging"
 )
 
+// Deprecated, use filters.AbsorbName instead
+const AbsorbName = filters.AbsorbName
+
+// Deprecated, use filters.AbsorbSilentName instead
+const AbsorbSilentName = filters.AbsorbSilentName
+
 const loggingInterval = time.Second
 
 type absorb struct {

diff --git a/filters/diag/diag.go b/filters/diag/diag.go
@@ -22,6 +22,25 @@ import (
 
 const defaultChunkSize = 512
 
+const (
+	// Deprecated, use filters.RandomContentName instead
+	RandomName = filters.RandomContentName
+	// Deprecated, use filters.RepeatContentName instead
+	RepeatName = filters.RepeatContentName
+	// Deprecated, use filters.LatencyName instead
+	LatencyName = filters.LatencyName
+	// Deprecated, use filters.ChunksName instead
+	ChunksName = filters.ChunksName
+	// Deprecated, use filters.BandwidthName instead
+	BandwidthName = filters.BandwidthName
+	// Deprecated, use filters.BackendLatencyName instead
+	BackendLatencyName = filters.BackendLatencyName
+	// Deprecated, use filters.BackendBandwidthName instead
+	BackendBandwidthName = filters.BackendBandwidthName
+	// Deprecated, use filters.BackendChunksName instead
+	BackendChunksName = filters.BackendChunksName
+)
+
 type throttleType int
 
 const (

diff --git a/filters/fadein/fadein.go b/filters/fadein/fadein.go
@@ -13,6 +13,13 @@ import (
 	"github.com/zalando/skipper/routing"
 )
 
+const (
+	// Deprecated, use filters.FadeInName instead
+	FadeInName = filters.FadeInName
+	// Deprecated, use filters.EndpointCreatedName instead
+	EndpointCreatedName = filters.EndpointCreatedName
+)
+
 type (
 	fadeIn struct {
 		duration time.Duration

diff --git a/filters/flowid/filter.go b/filters/flowid/filter.go
@@ -9,6 +9,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.FlowIdName instead
+	Name = filters.FlowIdName
+
 	ReuseParameterValue = "reuse"
 	HeaderName          = "X-Flow-Id"
 )

diff --git a/filters/log/log.go b/filters/log/log.go
@@ -20,6 +20,9 @@ import (
 )
 
 const (
+	// Deprecated, use filters.AuditLogName instead
+	AuditLogName = filters.AuditLogName
+
 	// AuthUserKey is used by the auth package to set the user
 	// information into the state bag to pass the information to
 	// the auditLog filter.
@@ -29,6 +32,9 @@ const (
 	// information to the auditLog filter.
 	AuthRejectReasonKey = "auth-reject-reason"
 
+	// Deprecated, use filters.UnverifiedAuditLogName instead
+	UnverifiedAuditLogName = filters.UnverifiedAuditLogName
+
 	// UnverifiedAuditHeader is the name of the header added to the request which contains the unverified audit details
 	UnverifiedAuditHeader        = "X-Unverified-Audit"
 	authHeaderName               = "Authorization"

diff --git a/filters/rfc/rfc.go b/filters/rfc/rfc.go
@@ -5,6 +5,9 @@ import (
 	"github.com/zalando/skipper/rfc"
 )
 
+// Deprecated, use filters.RfcPathName instead
+const Name = filters.RfcPathName
+
 type path struct{}
 
 // NewPath creates a filter specification for the rfcPath() filter, that
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,9 @@ import ( @@
     )
     const (
+    	// Deprecated, use filters.OidcClaimsQueryName instead
+    	OidcClaimsQueryName = filters.OidcClaimsQueryName
     	oidcClaimsCacheKey = "oidcclaimscachekey"
     )
@@ Expand Down @@