Skip to content

fix(plugins): add old_default to redis shorthand fields to prevent spurious deprecation warnings #14804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexezio wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −10
Open

fix(plugins): add old_default to redis shorthand fields to prevent spurious deprecation warnings #14804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions kong/plugins/rate-limiting/schema.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ return {
deprecation = {
replaced_with = { { path = { 'redis', 'port' } } },
message = "rate-limiting: config.redis_port is deprecated, please use config.redis.port instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 6379, },
func = function(value)
return { redis = { port = value } }
end
Expand Down Expand Up @@ -146,7 +147,8 @@ return {
deprecation = {
replaced_with = { { path = { 'redis', 'ssl' } } },
message = "rate-limiting: config.redis_ssl is deprecated, please use config.redis.ssl instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = false, },
func = function(value)
return { redis = { ssl = value } }
end
Expand All @@ -156,7 +158,8 @@ return {
deprecation = {
replaced_with = { { path = { 'redis', 'ssl_verify' } } },
message = "rate-limiting: config.redis_ssl_verify is deprecated, please use config.redis.ssl_verify instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = false, },
func = function(value)
return { redis = { ssl_verify = value } }
end
Expand All @@ -176,7 +179,8 @@ return {
deprecation = {
replaced_with = { { path = { 'redis', 'timeout' } } },
message = "rate-limiting: config.redis_timeout is deprecated, please use config.redis.timeout instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 2000, },
func = function(value)
return { redis = { timeout = value } }
end
Expand All @@ -186,7 +190,8 @@ return {
deprecation = {
replaced_with = { { path = { 'redis', 'database' } } },
message = "rate-limiting: config.redis_database is deprecated, please use config.redis.database instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 0, },
func = function(value)
return { redis = { database = value } }
end
Expand Down
15 changes: 10 additions & 5 deletions kong/plugins/response-ratelimiting/schema.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ return {
deprecation = {
replaced_with = { { path = {'redis', 'port'} } },
message = "response-ratelimiting: config.redis_port is deprecated, please use config.redis.port instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 6379, },
func = function(value)
return { redis = { port = value } }
end
Expand Down Expand Up @@ -185,7 +186,8 @@ return {
deprecation = {
replaced_with = { { path = {'redis', 'ssl'} } },
message = "response-ratelimiting: config.redis_ssl is deprecated, please use config.redis.ssl instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = false, },
func = function(value)
return { redis = { ssl = value } }
end
Expand All @@ -195,7 +197,8 @@ return {
deprecation = {
replaced_with = { { path = {'redis', 'ssl_verify'} } },
message = "response-ratelimiting: config.redis_ssl_verify is deprecated, please use config.redis.ssl_verify instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = false, },
func = function(value)
return { redis = { ssl_verify = value } }
end
Expand All @@ -215,7 +218,8 @@ return {
deprecation = {
replaced_with = { { path = {'redis', 'timeout'} } },
message = "response-ratelimiting: config.redis_timeout is deprecated, please use config.redis.timeout instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 2000, },
func = function(value)
return { redis = { timeout = value } }
end
Expand All @@ -225,7 +229,8 @@ return {
deprecation = {
replaced_with = { { path = {'redis', 'database'} } },
message = "response-ratelimiting: config.redis_database is deprecated, please use config.redis.database instead",
removal_in_version = "4.0", },
removal_in_version = "4.0",
old_default = 0, },
func = function(value)
return { redis = { database = value } }
end
Expand Down