From 1e17f46bde5b2c8b18ff6943f17dfa1fdcd4f1e9 Mon Sep 17 00:00:00 2001 From: Nick Muerdter Date: Fri, 18 May 2018 22:55:51 -0600 Subject: [PATCH] Standardize nginx test file on using *_by_lua_block syntax. Use the newer block syntax instead of the older string approach for better readability and easier escaping. --- .../etc/test-env/nginx/apis.conf.mustache | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/templates/etc/test-env/nginx/apis.conf.mustache b/templates/etc/test-env/nginx/apis.conf.mustache index 1e42b2d12..c7b423966 100644 --- a/templates/etc/test-env/nginx/apis.conf.mustache +++ b/templates/etc/test-env/nginx/apis.conf.mustache @@ -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; @@ -31,7 +33,7 @@ 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) @@ -39,7 +41,7 @@ server { ngx.flush() ngx.sleep(math.random(5, 15) / 1000) end - '; + } } location = /restricted { @@ -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 @@ -79,7 +81,7 @@ server { ngx.print("Unauthorized") ngx.exit(ngx.HTTP_OK) end - '; + } echo -n $remote_user; } @@ -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" @@ -119,7 +123,7 @@ server { basic_auth_password = ngx.var.remote_passwd, request_length = tonumber(ngx.var.request_length), })) - '; + } } location /connection-stats/ { @@ -139,7 +143,7 @@ server { } location = /upload { - content_by_lua ' + content_by_lua_block { local cjson = require "cjson"; local upload = require "resty.upload"; @@ -159,7 +163,7 @@ server { ngx.print(cjson.encode({ upload_size = upload_size, })) - '; + } } location = /chunked { @@ -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"); @@ -213,7 +217,7 @@ server { ngx.sleep(0.5) ngx.print(string.rep("a", size)) - '; + } } location = /compressible-pre-gzip { @@ -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 @@ -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) @@ -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"; @@ -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; @@ -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) + } } }