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

chore(deps) update penlight from 1.5.4 to 1.7.0 #5127

Merged
merged 1 commit into from
Oct 18, 2019
Merged

chore(deps) update penlight from 1.5.4 to 1.7.0 #5127

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
2 changes: 1 addition & 1 deletion kong-1.3.0-0.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies = {
"inspect == 3.1.1",
"luasec == 0.8",
"luasocket == 3.0-rc1",
"penlight == 1.5.4",
"penlight == 1.7.0",
"lua-resty-http == 0.15",
"lua-resty-jit-uuid == 0.0.7",
"multipart == 0.5.5",
Expand Down
4 changes: 2 additions & 2 deletions spec/01-unit/01-db/02-db-errors_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe("DB Errors", function()
code = Errors.codes.INVALID_PRIMARY_KEY,
name = "invalid primary key",
strategy = "some_strategy",
message = [[invalid primary key: '{id2="missing2",id="missing"}']],
message = [[invalid primary key: '{id="missing",id2="missing2"}']],
fields = pk,
}, err_t)
end)
Expand All @@ -77,7 +77,7 @@ describe("DB Errors", function()
code = Errors.codes.INVALID_FOREIGN_KEY,
name = "invalid foreign key",
strategy = "some_strategy",
message = [[invalid foreign key: '{id2="missing2",id="missing"}']],
message = [[invalid foreign key: '{id="missing",id2="missing2"}']],
fields = pk,
}, err_t)
end)
Expand Down
12 changes: 6 additions & 6 deletions spec/02-integration/03-db/03-plugins_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ for _, strategy in helpers.each_strategy() do
assert.falsy(plugin)
assert.match("UNIQUE violation", err)
assert.same("unique constraint violation", err_t.name)
assert.same([[UNIQUE violation detected on '{service=null,]] ..
[[name="key-auth",route={id="]] .. route.id ..
[["},consumer=null}']], err_t.message)
assert.same([[UNIQUE violation detected on '{consumer=null,name="key-auth",]] ..
[[route={id="]] .. route.id ..
[["},service=null}']], err_t.message)
end)

it("does not validate when associated to an incompatible route, or a service with only incompatible routes", function()
Expand Down Expand Up @@ -149,9 +149,9 @@ for _, strategy in helpers.each_strategy() do
assert.falsy(plugin)
assert.match("UNIQUE violation", err)
assert.same("unique constraint violation", err_t.name)
assert.same([[UNIQUE violation detected on '{service=null,]] ..
[[name="key-auth",route={id="]] .. route.id ..
[["},consumer=null}']], err_t.message)
assert.same([[UNIQUE violation detected on '{consumer=null,name="key-auth",]] ..
[[route={id="]] .. route.id ..
[["},service=null}']], err_t.message)
end)
end)

Expand Down
5 changes: 2 additions & 3 deletions spec/02-integration/04-admin_api/03-consumers_routes_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,8 @@ describe("Admin API (#" .. strategy .. "): ", function()
assert.same({
code = Errors.codes.UNIQUE_VIOLATION,
name = "unique constraint violation",
message = [[UNIQUE violation detected on '{service=null,]] ..
[[name="rewriter",route=null,consumer={id="]] ..
consumer.id .. [["}}']],
message = [[UNIQUE violation detected on '{consumer={id="]] .. consumer.id ..
[["},name="rewriter",route=null,service=null}']],
fields = {
name = "rewriter",
consumer = {
Expand Down
6 changes: 3 additions & 3 deletions spec/02-integration/04-admin_api/09-routes_routes_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,9 +1717,9 @@ for _, strategy in helpers.each_strategy() do
},
service = ngx.null,
},
message = [[UNIQUE violation detected on '{]] ..
[[service=null,name="basic-auth",route={id="]] ..
route.id .. [["},consumer=null}']],
message = [[UNIQUE violation detected on '{consumer=null,]] ..
[[name="basic-auth",route={id="]] ..
route.id .. [["},service=null}']],
name = "unique constraint violation",
}, json)
end
Expand Down
6 changes: 3 additions & 3 deletions spec/02-integration/04-admin_api/10-services_routes_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,9 @@ for _, strategy in helpers.each_strategy() do
id = service.id,
}
},
message = [[UNIQUE violation detected on '{]] ..
[[service={id="]] .. service.id ..
[["},name="basic-auth",route=null,consumer=null}']],
message = [[UNIQUE violation detected on '{consumer=null,name="basic-auth",]] ..
[[route=null,service={id="]] .. service.id ..
[["}}']],
}, json)
end
end)
Expand Down