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

feat: use luasocket instead of curl in etcd.lua #2965

Merged
merged 7 commits into from
Jan 7, 2021
Merged

feat: use luasocket instead of curl in etcd.lua #2965

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83df02b
feat: use luasocket instead of curl in etcd.lua (#2818)
starsz Dec 22, 2020
edd1a31
update: fix ci
starsz Dec 23, 2020
d731433
update: fix test
starsz Dec 23, 2020
7429657
update: fix test
starsz Dec 23, 2020
02cc565
update: fix test
starsz Dec 23, 2020
2ffba56
update: enrich request comment
starsz Dec 24, 2020
2f9106b
update: fix etcd error handle
starsz Dec 25, 2020
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
10 changes: 5 additions & 5 deletions apisix/cli/etcd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function _M.init(env, show_output)
-- In case of failure, request returns nil followed by an error message.
-- Else the first return value is the response body
-- and followed by the response status code.
if err and type(err) == "string" then
if not res then
errmsg = str_format("request etcd endpoint \'%s\' error, %s\n", version_url, err)
util.die(errmsg)
end
Expand Down Expand Up @@ -179,14 +179,14 @@ function _M.init(env, show_output)

local post_json_auth = dkjson.encode(json_auth)
local response_body = {}
local _, err = http.request{url = auth_url, method = "POST",
local res, err = http.request{url = auth_url, method = "POST",
source = ltn12.source.string(post_json_auth),
sink = ltn12.sink.table(response_body),
headers = {["Content-Length"] = #post_json_auth}}
-- In case of failure, request returns nil followed by an error message.
-- Else the first return value is just the number 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first return value isn't the response body?

Copy link
Contributor Author

@starsz starsz Dec 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. It has two forms.
You can see more details about it.

In case of failure, the function returns nil followed by an error message. If successful, the simple form returns the response body as a string, followed by the response status code, the response headers and the response status line. The generic function returns the same information, except the first return value is just the number 1 (the body goes to the sink).

http://w3.impa.br/~diego/software/luasocket/http.html

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it

-- and followed by the response status code.
if err and type(err) == "string" then
if not res then
errmsg = str_format("request etcd endpoint \"%s\" error, %s\n", auth_url, err)
util.die(errmsg)
end
Expand Down Expand Up @@ -219,11 +219,11 @@ function _M.init(env, show_output)
headers["Authorization"] = auth_token
end

local _, err = http.request{url = put_url, method = "POST",
local res, err = http.request{url = put_url, method = "POST",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: I prefer http.request({...}), it is easy to read

source = ltn12.source.string(post_json),
sink = ltn12.sink.table(response_body),
headers = headers}
if err and type(err) == "string" then
if not res then
errmsg = str_format("request etcd endpoint \"%s\" error, %s\n", put_url, err)
util.die(errmsg)
end
Expand Down