-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
bugfix: should not save the runtime data of plugin into etcd
.
#1910
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
70bd966
bugfix: should not save the runtime data of plugin into `etcd`.
membphis cd9b071
change: generate array table before we start to use it.
membphis 2ca8d36
change: added `additionalProperties` for plugin `proxy-rewrite` and `…
membphis 2fb1340
change: code style.
membphis 0f10c35
test case style.
membphis 57906a8
change: move `json_sort` to `t/lib`, it only works for testing.
membphis 6394a5f
change: revert useless changing.
membphis File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ | |
-- See the License for the specific language governing permissions and | ||
-- limitations under the License. | ||
-- | ||
|
||
local json_encode = require("cjson.safe").encode | ||
local clear_tab = require("table.clear") | ||
local ngx = ngx | ||
|
@@ -26,6 +27,7 @@ local cached_tab = {} | |
local _M = { | ||
version = 0.1, | ||
decode = require("cjson.safe").decode, | ||
sort_encode = require("apisix.core.json_sort").encode, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this function only for test cases? |
||
} | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
-- | ||
-- Licensed to the Apache Software Foundation (ASF) under one or more | ||
-- contributor license agreements. See the NOTICE file distributed with | ||
-- this work for additional information regarding copyright ownership. | ||
-- The ASF licenses this file to You under the Apache License, Version 2.0 | ||
-- (the "License"); you may not use this file except in compliance with | ||
-- the License. You may obtain a copy of the License at | ||
-- | ||
-- http://www.apache.org/licenses/LICENSE-2.0 | ||
-- | ||
-- Unless required by applicable law or agreed to in writing, software | ||
-- distributed under the License is distributed on an "AS IS" BASIS, | ||
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
-- See the License for the specific language governing permissions and | ||
-- limitations under the License. | ||
-- | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should not put this file to |
||
local type = type | ||
local concat = table.concat | ||
local tostring = tostring | ||
local ngx_null = ngx.null | ||
local gsub = string.gsub | ||
local sort = table.sort | ||
local pairs = pairs | ||
local ipairs = ipairs | ||
|
||
|
||
local _M = {} | ||
|
||
|
||
local meta_chars = { | ||
["\t"] = "\\t", | ||
["\\"] = "\\\\", | ||
['"'] = '\\"', | ||
["\r"] = "\\r", | ||
["\n"] = "\\n", | ||
} | ||
|
||
|
||
local function encode_str(s) | ||
return gsub(s, '["\\\r\n\t]', meta_chars) | ||
end | ||
|
||
|
||
local function is_arr(t) | ||
local exp = 1 | ||
for k, _ in pairs(t) do | ||
if k ~= exp then | ||
return nil | ||
end | ||
exp = exp + 1 | ||
end | ||
return exp - 1 | ||
end | ||
|
||
|
||
local encode | ||
function encode (v) | ||
if v == nil or v == ngx_null then | ||
return "null" | ||
end | ||
|
||
local typ = type(v) | ||
if typ == 'string' then | ||
return '"' .. encode_str(v) .. '"' | ||
end | ||
|
||
if typ == 'number' or typ == 'boolean' then | ||
return tostring(v) | ||
end | ||
|
||
if typ == 'table' then | ||
local n = is_arr(v) | ||
if n then | ||
local bits = {} | ||
for i, elem in ipairs(v) do | ||
bits[i] = encode(elem) | ||
end | ||
return "[" .. concat(bits, ",") .. "]" | ||
end | ||
|
||
local keys = {} | ||
local i = 0 | ||
for key, _ in pairs(v) do | ||
i = i + 1 | ||
keys[i] = key | ||
end | ||
sort(keys) | ||
|
||
local bits = {} | ||
i = 0 | ||
for _, key in ipairs(keys) do | ||
i = i + 1 | ||
bits[i] = encode(key) .. ":" .. encode(v[key]) | ||
end | ||
return "{" .. concat(bits, ",") .. "}" | ||
end | ||
|
||
return '"<' .. typ .. '>"' | ||
end | ||
_M.encode = encode | ||
|
||
|
||
return _M |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better to use name
encode_with_keys_sorted
.