Skip to content
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

Jump to bottom

fix(schema-validator) does not convert the null in the declarative configuration to nil #8483

Merged
merged 9 commits into from
Mar 10, 2022
Merged

fix(schema-validator) does not convert the null in the declarative configuration to nil #8483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de05089
fix(plugin) properly handle the `ngx.null` for `limits.{limit_name}.*`
ADD-SP Mar 2, 2022
42c33fe
lint fix
ADD-SP Mar 2, 2022
a9d145b
Update spec/03-plugins/24-response-rate-limiting/01-schema_spec.lua
ADD-SP Mar 2, 2022
04679b7
Update spec/03-plugins/24-response-rate-limiting/01-schema_spec.lua
ADD-SP Mar 2, 2022
da413f1
cache ngx.null at module level.
ADD-SP Mar 2, 2022
495ce48
fix function `adjust_field_for_context`
ADD-SP Mar 7, 2022
777d682
roll back one line
ADD-SP Mar 7, 2022
00b9565
fix lint
ADD-SP Mar 7, 2022
b8b0b5a
Update kong/db/schema/init.lua
ADD-SP Mar 9, 2022
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
11 changes: 9 additions & 2 deletions kong/db/schema/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,8 +1578,15 @@ local function adjust_field_for_context(field, value, context, nulls, opts)
end

if subfield then
for i = 1, #value do
value[i] = adjust_field_for_context(subfield, value[i], context, nulls, opts)
if field.type ~= "map" then
for i = 1, #value do
value[i] = adjust_field_for_context(subfield, value[i], context, nulls, opts)
end

else
for k, v in pairs(value) do
value[k] = adjust_field_for_context(subfield, v, context, nulls, opts)
end
end
end
end
Expand Down
7 changes: 7 additions & 0 deletions spec/03-plugins/24-response-rate-limiting/01-schema_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
local schema_def = require "kong.plugins.response-ratelimiting.schema"
local v = require("spec.helpers").validate_plugin_config_schema
local null = ngx.null


describe("Plugin: response-rate-limiting (schema)", function()
Expand Down Expand Up @@ -32,6 +33,12 @@ describe("Plugin: response-rate-limiting (schema)", function()
assert.falsy(ok)
assert.equal("unknown field", err.config.limits.seco)
end)
it("limits: \'null\' value does not cause 500, issue #8314", function()
local config = {limits = {video = {second = null, minute = 1}}}
local ok, err = v(config, schema_def)
assert.truthy(ok)
assert.falsy(err)
end)
it("limits: smaller unit is less than bigger unit", function()
local config = {limits = {video = {second = 2, minute = 1}}}
local ok, err = v(config, schema_def)
Expand Down