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

tests(helpers): wait_for_all_config_update support pass custom headers and https_server support disable listen ipv6 #11718

Merged
merged 1 commit into from
Oct 11, 2023
Merged

tests(helpers): wait_for_all_config_update support pass custom headers and https_server support disable listen ipv6 #11718

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
4 changes: 3 additions & 1 deletion spec/fixtures/https_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ function https_server.start(self)
http_port = self.http_port,
protocol = self.protocol,
worker_num = self.worker_num,
disable_ipv6 = self.disable_ipv6,
}

local file, err = create_conf(conf_params)
Expand Down Expand Up @@ -246,7 +247,7 @@ function https_server.shutdown(self)
end

-- **DEPRECATED**: please use `spec.helpers.http_mock` instead.
function https_server.new(port, hostname, protocol, check_hostname, workers, delay)
function https_server.new(port, hostname, protocol, check_hostname, workers, delay, disable_ipv6)
local self = setmetatable({}, https_server)
local host
local hosts
Expand All @@ -270,6 +271,7 @@ function https_server.new(port, hostname, protocol, check_hostname, workers, del
self.logs_dir = "logs"
self.protocol = protocol or "http"
self.worker_num = workers or 2
self.disable_ipv6 = disable_ipv6

return self
end
Expand Down
4 changes: 4 additions & 0 deletions spec/fixtures/mock_webserver_tpl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,14 @@ http {
server {
# if protocol ~= 'https' then
listen 127.0.0.1:${http_port};
# if not disable_ipv6 then
listen [::1]:${http_port};
#end
# else
listen 127.0.0.1:${http_port} ssl http2;
# if not disable_ipv6 then
listen [::1]:${http_port} ssl http2;
#end
ssl_certificate ${cert_path}/kong_spec.crt;
ssl_certificate_key ${cert_path}/kong_spec.key;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
Expand Down
60 changes: 32 additions & 28 deletions spec/helpers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,20 +1908,24 @@ local function wait_for_all_config_update(opts)
local stream_enabled = opts.stream_enabled or false
local override_rl = opts.override_global_rate_limiting_plugin or false
local override_auth = opts.override_global_key_auth_plugin or false
local headers = opts.override_default_headers or { ["Content-Type"] = "application/json" }
local disable_ipv6 = opts.disable_ipv6 or false

local function call_admin_api(method, path, body, expected_status)
local function call_admin_api(method, path, body, expected_status, headers)
local client = admin_client(admin_client_timeout, forced_admin_port)

local res

if string.upper(method) == "POST" then
res = client:post(path, {
headers = {["Content-Type"] = "application/json"},
headers = headers,
body = body,
})

elseif string.upper(method) == "DELETE" then
res = client:delete(path)
res = client:delete(path, {
headers = headers
})
end

local ok, json_or_nil_or_err = pcall(function ()
Expand Down Expand Up @@ -1958,44 +1962,44 @@ local function wait_for_all_config_update(opts)
local host = "localhost"
local port = get_available_port()

local server = https_server.new(port, host, "http", nil, 1)
local server = https_server.new(port, host, "http", nil, 1, nil, disable_ipv6)

server:start()

-- create mocking upstream
local res = assert(call_admin_api("POST",
"/upstreams",
{ name = upstream_name },
201))
201, headers))
upstream_id = res.id

-- create mocking target to mocking upstream
res = assert(call_admin_api("POST",
string.format("/upstreams/%s/targets", upstream_id),
{ target = host .. ":" .. port },
201))
201, headers))
target_id = res.id

-- create mocking service to mocking upstream
res = assert(call_admin_api("POST",
"/services",
{ name = service_name, url = "http://" .. upstream_name .. "/always_200" },
201))
201, headers))
service_id = res.id

-- create mocking route to mocking service
res = assert(call_admin_api("POST",
string.format("/services/%s/routes", service_id),
{ paths = { route_path }, strip_path = true, path_handling = "v0",},
201))
201, headers))
route_id = res.id

if override_rl then
-- create rate-limiting plugin to mocking mocking service
res = assert(call_admin_api("POST",
string.format("/services/%s/plugins", service_id),
{ name = "rate-limiting", config = { minute = 999999, policy = "local" } },
201))
201, headers))
rl_plugin_id = res.id
end

Expand All @@ -2004,21 +2008,21 @@ local function wait_for_all_config_update(opts)
res = assert(call_admin_api("POST",
string.format("/services/%s/plugins", service_id),
{ name = "key-auth", config = { key_names = { key_header_name } } },
201))
201, headers))
key_auth_plugin_id = res.id

-- create consumer
res = assert(call_admin_api("POST",
"/consumers",
{ username = consumer_name },
201))
201, headers))
consumer_id = res.id

-- create credential to key-auth plugin
res = assert(call_admin_api("POST",
string.format("/consumers/%s/key-auth", consumer_id),
{ key = test_credentials },
201))
201, headers))
credential_id = res.id
end

Expand All @@ -2027,28 +2031,28 @@ local function wait_for_all_config_update(opts)
local res = assert(call_admin_api("POST",
"/upstreams",
{ name = stream_upstream_name },
201))
201, headers))
stream_upstream_id = res.id

-- create mocking target to mocking upstream
res = assert(call_admin_api("POST",
string.format("/upstreams/%s/targets", stream_upstream_id),
{ target = host .. ":" .. port },
201))
201, headers))
stream_target_id = res.id

-- create mocking service to mocking upstream
res = assert(call_admin_api("POST",
"/services",
{ name = stream_service_name, url = "tcp://" .. stream_upstream_name },
201))
201, headers))
stream_service_id = res.id

-- create mocking route to mocking service
res = assert(call_admin_api("POST",
string.format("/services/%s/routes", stream_service_id),
{ destinations = { { port = stream_port }, }, protocols = { "tcp" },},
201))
201, headers))
stream_route_id = res.id
end

Expand Down Expand Up @@ -2087,25 +2091,25 @@ local function wait_for_all_config_update(opts)

-- delete mocking configurations
if override_auth then
call_admin_api("DELETE", string.format("/consumers/%s/key-auth/%s", consumer_id, credential_id), nil, 204)
call_admin_api("DELETE", string.format("/consumers/%s", consumer_id), nil, 204)
call_admin_api("DELETE", "/plugins/" .. key_auth_plugin_id, nil, 204)
call_admin_api("DELETE", string.format("/consumers/%s/key-auth/%s", consumer_id, credential_id), nil, 204, headers)
call_admin_api("DELETE", string.format("/consumers/%s", consumer_id), nil, 204, headers)
call_admin_api("DELETE", "/plugins/" .. key_auth_plugin_id, nil, 204, headers)
end

if override_rl then
call_admin_api("DELETE", "/plugins/" .. rl_plugin_id, nil, 204)
call_admin_api("DELETE", "/plugins/" .. rl_plugin_id, nil, 204, headers)
end

call_admin_api("DELETE", "/routes/" .. route_id, nil, 204)
call_admin_api("DELETE", "/services/" .. service_id, nil, 204)
call_admin_api("DELETE", string.format("/upstreams/%s/targets/%s", upstream_id, target_id), nil, 204)
call_admin_api("DELETE", "/upstreams/" .. upstream_id, nil, 204)
call_admin_api("DELETE", "/routes/" .. route_id, nil, 204, headers)
call_admin_api("DELETE", "/services/" .. service_id, nil, 204, headers)
call_admin_api("DELETE", string.format("/upstreams/%s/targets/%s", upstream_id, target_id), nil, 204, headers)
call_admin_api("DELETE", "/upstreams/" .. upstream_id, nil, 204, headers)

if stream_enabled then
call_admin_api("DELETE", "/routes/" .. stream_route_id, nil, 204)
call_admin_api("DELETE", "/services/" .. stream_service_id, nil, 204)
call_admin_api("DELETE", string.format("/upstreams/%s/targets/%s", stream_upstream_id, stream_target_id), nil, 204)
call_admin_api("DELETE", "/upstreams/" .. stream_upstream_id, nil, 204)
call_admin_api("DELETE", "/routes/" .. stream_route_id, nil, 204, headers)
call_admin_api("DELETE", "/services/" .. stream_service_id, nil, 204, headers)
call_admin_api("DELETE", string.format("/upstreams/%s/targets/%s", stream_upstream_id, stream_target_id), nil, 204, headers)
call_admin_api("DELETE", "/upstreams/" .. stream_upstream_id, nil, 204, headers)
end

ok, err = pcall(function ()
Expand Down
Loading