Skip to content

Commit

Permalink
Standardize nginx test file on using *_by_lua_block syntax.
Browse files Browse the repository at this point in the history 
Use the newer block syntax instead of the older string approach for
better readability and easier escaping.
  • Loading branch information
@GUI
GUI committed May 19, 2018
1 parent 919312e commit 1e17f46
Showing 1 changed file with 43 additions and 33 deletions.
76 changes: 43 additions & 33 deletions templates/etc/test-env/nginx/apis.conf.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ server {
gzip off;
access_by_lua 'ngx.shared.test_data:set("backend_called", true)';
access_by_lua_block {
ngx.shared.test_data:set("backend_called", true)
}

rewrite ^/backend-prefix/(.+)$ /$1 last;

Expand All @@ -31,15 +33,15 @@ server {
}

location = /echo_delayed_chunked {
content_by_lua '
content_by_lua_block {
local input = ngx.unescape_uri(ngx.var.arg_input)
for index = 1, #input do
local char = input:sub(index, index)
ngx.print(char)
ngx.flush()
ngx.sleep(math.random(5, 15) / 1000)
end
';
}
}

location = /restricted {
Expand All @@ -66,7 +68,7 @@ server {
}

location /auth/ {
access_by_lua '
access_by_lua_block {
local username = ngx.var.remote_user
local password = ngx.var.remote_passwd
if username == "somebody" and password == "secret" then
Expand All @@ -79,7 +81,7 @@ server {
ngx.print("Unauthorized")
ngx.exit(ngx.HTTP_OK)
end
';
}
echo -n $remote_user;
}

Expand All @@ -91,12 +93,14 @@ server {
}

location = /redirect {
rewrite_by_lua 'ngx.redirect(ngx.unescape_uri(ngx.var.arg_to or "/hello"))';
rewrite_by_lua_block {
ngx.redirect(ngx.unescape_uri(ngx.var.arg_to or "/hello"))
}
}

location /info/ {
more_set_headers "X-Received-Method: $request_method";
content_by_lua '
content_by_lua_block {
local cjson = require "cjson";
local raw_url = ngx.var.scheme .. "://" .. ngx.var.host .. ngx.var.request_uri
ngx.header["Content-Type"] = "application/json"
Expand All @@ -119,7 +123,7 @@ server {
basic_auth_password = ngx.var.remote_passwd,
request_length = tonumber(ngx.var.request_length),
}))
';
}
}

location /connection-stats/ {
Expand All @@ -139,7 +143,7 @@ server {
}

location = /upload {
content_by_lua '
content_by_lua_block {
local cjson = require "cjson";
local upload = require "resty.upload";
Expand All @@ -159,7 +163,7 @@ server {
ngx.print(cjson.encode({
upload_size = upload_size,
}))
';
}
}

location = /chunked {
Expand All @@ -178,29 +182,29 @@ server {

location ~ ^/compressible/([0-9]+)$ {
set $size $1;
content_by_lua '
content_by_lua_block {
ngx.header["Content-Type"] = ngx.unescape_uri(ngx.var.arg_content_type or "text/plain");
ngx.header["Content-Length"] = ngx.var.size
ngx.print(string.rep("a", tonumber(ngx.var.size)))
';
}
}

location ~ ^/compressible-chunked/([0-9]+)/([0-9]+)$ {
set $chunks $1;
set $size $2;
content_by_lua '
content_by_lua_block {
local size = tonumber(ngx.var.size)
ngx.header["Content-Type"] = ngx.unescape_uri(ngx.var.arg_content_type or "text/plain");
ngx.sleep(0.05)
for index = 1, tonumber(ngx.var.chunks) do
ngx.print(string.rep("a", size))
end
';
}
}

location ~ ^/compressible-delayed-chunked/([0-9]+)$ {
set $size $1;
content_by_lua '
content_by_lua_block {
local size = tonumber(ngx.var.size)
ngx.header["Content-Type"] = ngx.unescape_uri(ngx.var.arg_content_type or "text/plain");
Expand All @@ -213,7 +217,7 @@ server {
ngx.sleep(0.5)
ngx.print(string.rep("a", size))
';
}
}

location = /compressible-pre-gzip {
Expand All @@ -223,24 +227,24 @@ server {

location ~ ^/delay/([0-9]+)$ {
set $delay $1;
content_by_lua '
content_by_lua_block {
ngx.sleep(tonumber(ngx.var.delay) / 1000)
ngx.print("done")
';
}
}

location ~ ^/delay-sec/([0-9.]+)$ {
set $delay $1;
content_by_lua '
content_by_lua_block {
ngx.sleep(tonumber(ngx.var.delay))
ngx.print("done")
';
}
}

location ~ ^/delays/([0-9]+)/([0-9]+)$ {
set $delay1 $1;
set $delay2 $2;
content_by_lua '
content_by_lua_block {
local delay1 = tonumber(ngx.var.delay1) / 1000
local delay2 = tonumber(ngx.var.delay2) / 1000
Expand All @@ -251,13 +255,13 @@ server {
ngx.sleep(delay2 - delay1)
ngx.print("done")
ngx.flush()
';
}
}

location ~ ^/delays-sec/([0-9]+)/([0-9]+)$ {
set $delay1 $1;
set $delay2 $2;
content_by_lua '
content_by_lua_block {
local delay1 = tonumber(ngx.var.delay1)
local delay2 = tonumber(ngx.var.delay2)
Expand All @@ -268,24 +272,24 @@ server {
ngx.sleep(delay2 - delay1)
ngx.print("done")
ngx.flush()
';
}
}

location = /timeout {
access_by_lua '
access_by_lua_block {
local key = "backend_call_count:" .. string.lower(ngx.var.request_method) .. "-timeout"
return ngx.shared.test_data:incr(key, 1) or ngx.shared.test_data:set(key, 1)
';
}

echo_sleep 20;
echo -n "done";
}

location = /between-varnish-timeout {
access_by_lua '
access_by_lua_block {
local key = "backend_call_count:post-between-varnish-timeout"
return ngx.shared.test_data:incr(key, 1) or ngx.shared.test_data:set(key, 1)
';
}

echo_sleep 12.5;
echo -n "done";
Expand All @@ -299,10 +303,10 @@ server {

location ~ ^/cacheable-thundering-herd-public/(.+)$ {
set $unique_id $1;
access_by_lua '
access_by_lua_block {
local key = "backend_call_count:" .. ngx.var.unique_id
return ngx.shared.test_data:incr(key, 1) or ngx.shared.test_data:set(key, 1)
';
}

echo_sleep 1;
set_secure_random_alphanum $random 50;
Expand Down Expand Up @@ -630,15 +634,21 @@ server {
set $x_api_umbrella_request_id $http_x_api_umbrella_request_id;
location = /reset_backend_called {
content_by_lua 'ngx.shared.test_data:set("backend_called", false)';
content_by_lua_block {
ngx.shared.test_data:set("backend_called", false)
}
}

location = /backend_called {
content_by_lua 'ngx.print(ngx.shared.test_data:get("backend_called"))';
content_by_lua_block {
ngx.print(ngx.shared.test_data:get("backend_called"))
}
}

location = /backend_call_count {
content_by_lua 'ngx.print(ngx.shared.test_data:get("backend_call_count:" .. ngx.var.arg_id) or 0)';
content_by_lua_block {
ngx.print(ngx.shared.test_data:get("backend_call_count:" .. ngx.var.arg_id) or 0)
}
}
}

Expand Down

0 comments on commit 1e17f46

Please sign in to comment.