apache · membphis · Feb 24, 2020 · Feb 25, 2020
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ help: default
 deps: default
 ifeq ($(UNAME),Darwin)
 	luarocks install --lua-dir=$(LUTJIT_DIR) rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
-else ifneq ($(LUAROCKS_VER),'luarocks 3.')
+else ifneq ($(LUAROCKS_VER),luarocks 3.)
 	luarocks install rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
 else
 	luarocks install --lua-dir=/usr/local/openresty/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local

diff --git a/lua/apisix/admin/consumers.lua → apisix/admin/consumers.lua b/lua/apisix/admin/consumers.lua → apisix/admin/consumers.lua
diff --git a/lua/apisix/admin/global_rules.lua → apisix/admin/global_rules.lua b/lua/apisix/admin/global_rules.lua → apisix/admin/global_rules.lua
diff --git a/lua/apisix/admin/init.lua → apisix/admin/init.lua b/lua/apisix/admin/init.lua → apisix/admin/init.lua
diff --git a/lua/apisix/admin/plugins.lua → apisix/admin/plugins.lua b/lua/apisix/admin/plugins.lua → apisix/admin/plugins.lua
diff --git a/lua/apisix/admin/proto.lua → apisix/admin/proto.lua b/lua/apisix/admin/proto.lua → apisix/admin/proto.lua
diff --git a/lua/apisix/admin/routes.lua → apisix/admin/routes.lua b/lua/apisix/admin/routes.lua → apisix/admin/routes.lua
diff --git a/lua/apisix/admin/schema.lua → apisix/admin/schema.lua b/lua/apisix/admin/schema.lua → apisix/admin/schema.lua
diff --git a/lua/apisix/admin/services.lua → apisix/admin/services.lua b/lua/apisix/admin/services.lua → apisix/admin/services.lua
diff --git a/lua/apisix/admin/ssl.lua → apisix/admin/ssl.lua b/lua/apisix/admin/ssl.lua → apisix/admin/ssl.lua
diff --git a/lua/apisix/admin/stream_routes.lua → apisix/admin/stream_routes.lua b/lua/apisix/admin/stream_routes.lua → apisix/admin/stream_routes.lua
diff --git a/lua/apisix/admin/upstreams.lua → apisix/admin/upstreams.lua b/lua/apisix/admin/upstreams.lua → apisix/admin/upstreams.lua
diff --git a/lua/apisix/balancer.lua → apisix/balancer.lua b/lua/apisix/balancer.lua → apisix/balancer.lua
diff --git a/lua/apisix/consumer.lua → apisix/consumer.lua b/lua/apisix/consumer.lua → apisix/consumer.lua
diff --git a/lua/apisix/core.lua → apisix/core.lua b/lua/apisix/core.lua → apisix/core.lua
diff --git a/lua/apisix/core/config_etcd.lua → apisix/core/config_etcd.lua b/lua/apisix/core/config_etcd.lua → apisix/core/config_etcd.lua
diff --git a/lua/apisix/core/config_local.lua → apisix/core/config_local.lua b/lua/apisix/core/config_local.lua → apisix/core/config_local.lua
diff --git a/lua/apisix/core/config_yaml.lua → apisix/core/config_yaml.lua b/lua/apisix/core/config_yaml.lua → apisix/core/config_yaml.lua
diff --git a/lua/apisix/core/ctx.lua → apisix/core/ctx.lua b/lua/apisix/core/ctx.lua → apisix/core/ctx.lua
diff --git a/lua/apisix/core/etcd.lua → apisix/core/etcd.lua b/lua/apisix/core/etcd.lua → apisix/core/etcd.lua
diff --git a/lua/apisix/core/http.lua → apisix/core/http.lua b/lua/apisix/core/http.lua → apisix/core/http.lua
diff --git a/lua/apisix/core/id.lua → apisix/core/id.lua b/lua/apisix/core/id.lua → apisix/core/id.lua
diff --git a/lua/apisix/core/json.lua → apisix/core/json.lua b/lua/apisix/core/json.lua → apisix/core/json.lua
diff --git a/lua/apisix/core/log.lua → apisix/core/log.lua b/lua/apisix/core/log.lua → apisix/core/log.lua
diff --git a/lua/apisix/core/lrucache.lua → apisix/core/lrucache.lua b/lua/apisix/core/lrucache.lua → apisix/core/lrucache.lua
diff --git a/lua/apisix/core/request.lua → apisix/core/request.lua b/lua/apisix/core/request.lua → apisix/core/request.lua
diff --git a/lua/apisix/core/response.lua → apisix/core/response.lua b/lua/apisix/core/response.lua → apisix/core/response.lua
diff --git a/lua/apisix/core/schema.lua → apisix/core/schema.lua b/lua/apisix/core/schema.lua → apisix/core/schema.lua
diff --git a/lua/apisix/core/table.lua → apisix/core/table.lua b/lua/apisix/core/table.lua → apisix/core/table.lua
diff --git a/lua/apisix/core/timer.lua → apisix/core/timer.lua b/lua/apisix/core/timer.lua → apisix/core/timer.lua
diff --git a/lua/apisix/core/utils.lua → apisix/core/utils.lua b/lua/apisix/core/utils.lua → apisix/core/utils.lua
diff --git a/lua/apisix/core/version.lua → apisix/core/version.lua b/lua/apisix/core/version.lua → apisix/core/version.lua
diff --git a/lua/apisix/debug.lua → apisix/debug.lua b/lua/apisix/debug.lua → apisix/debug.lua
diff --git a/...apisix/http/router/radixtree_host_uri.lua → apisix/http/router/radixtree_host_uri.lua b/...apisix/http/router/radixtree_host_uri.lua → apisix/http/router/radixtree_host_uri.lua
diff --git a/lua/apisix/http/router/radixtree_sni.lua → apisix/http/router/radixtree_sni.lua b/lua/apisix/http/router/radixtree_sni.lua → apisix/http/router/radixtree_sni.lua
diff --git a/lua/apisix/http/router/radixtree_uri.lua → apisix/http/router/radixtree_uri.lua b/lua/apisix/http/router/radixtree_uri.lua → apisix/http/router/radixtree_uri.lua
diff --git a/lua/apisix/http/service.lua → apisix/http/service.lua b/lua/apisix/http/service.lua → apisix/http/service.lua
diff --git a/lua/apisix.lua → apisix/init.lua b/lua/apisix.lua → apisix/init.lua
diff --git a/lua/apisix/plugin.lua → apisix/plugin.lua b/lua/apisix/plugin.lua → apisix/plugin.lua
diff --git a/lua/apisix/plugins/basic-auth.lua → apisix/plugins/basic-auth.lua b/lua/apisix/plugins/basic-auth.lua → apisix/plugins/basic-auth.lua
diff --git a/lua/apisix/plugins/batch-processor.lua → apisix/plugins/batch-processor.lua b/lua/apisix/plugins/batch-processor.lua → apisix/plugins/batch-processor.lua
diff --git a/lua/apisix/plugins/example-plugin.lua → apisix/plugins/example-plugin.lua b/lua/apisix/plugins/example-plugin.lua → apisix/plugins/example-plugin.lua
diff --git a/lua/apisix/plugins/fault-injection.lua → apisix/plugins/fault-injection.lua b/lua/apisix/plugins/fault-injection.lua → apisix/plugins/fault-injection.lua
diff --git a/lua/apisix/plugins/grpc-transcode.lua → apisix/plugins/grpc-transcode.lua b/lua/apisix/plugins/grpc-transcode.lua → apisix/plugins/grpc-transcode.lua
diff --git a/lua/apisix/plugins/grpc-transcode/proto.lua → apisix/plugins/grpc-transcode/proto.lua b/lua/apisix/plugins/grpc-transcode/proto.lua → apisix/plugins/grpc-transcode/proto.lua
diff --git a/...apisix/plugins/grpc-transcode/request.lua → apisix/plugins/grpc-transcode/request.lua b/...apisix/plugins/grpc-transcode/request.lua → apisix/plugins/grpc-transcode/request.lua
diff --git a/...pisix/plugins/grpc-transcode/response.lua → apisix/plugins/grpc-transcode/response.lua b/...pisix/plugins/grpc-transcode/response.lua → apisix/plugins/grpc-transcode/response.lua
diff --git a/lua/apisix/plugins/grpc-transcode/util.lua → apisix/plugins/grpc-transcode/util.lua b/lua/apisix/plugins/grpc-transcode/util.lua → apisix/plugins/grpc-transcode/util.lua
diff --git a/lua/apisix/plugins/heartbeat.lua → apisix/plugins/heartbeat.lua b/lua/apisix/plugins/heartbeat.lua → apisix/plugins/heartbeat.lua
diff --git a/lua/apisix/plugins/ip-restriction.lua → apisix/plugins/ip-restriction.lua b/lua/apisix/plugins/ip-restriction.lua → apisix/plugins/ip-restriction.lua
diff --git a/lua/apisix/plugins/jwt-auth.lua → apisix/plugins/jwt-auth.lua b/lua/apisix/plugins/jwt-auth.lua → apisix/plugins/jwt-auth.lua
diff --git a/lua/apisix/plugins/key-auth.lua → apisix/plugins/key-auth.lua b/lua/apisix/plugins/key-auth.lua → apisix/plugins/key-auth.lua
diff --git a/lua/apisix/plugins/limit-conn.lua → apisix/plugins/limit-conn.lua b/lua/apisix/plugins/limit-conn.lua → apisix/plugins/limit-conn.lua
diff --git a/lua/apisix/plugins/limit-count.lua → apisix/plugins/limit-count.lua b/lua/apisix/plugins/limit-count.lua → apisix/plugins/limit-count.lua
diff --git a/...plugins/limit-count/limit-count-redis.lua → ...plugins/limit-count/limit-count-redis.lua b/...plugins/limit-count/limit-count-redis.lua → ...plugins/limit-count/limit-count-redis.lua
diff --git a/lua/apisix/plugins/limit-req.lua → apisix/plugins/limit-req.lua b/lua/apisix/plugins/limit-req.lua → apisix/plugins/limit-req.lua
diff --git a/lua/apisix/plugins/log-util.lua → apisix/plugins/log-util.lua b/lua/apisix/plugins/log-util.lua → apisix/plugins/log-util.lua
diff --git a/lua/apisix/plugins/node-status.lua → apisix/plugins/node-status.lua b/lua/apisix/plugins/node-status.lua → apisix/plugins/node-status.lua
diff --git a/lua/apisix/plugins/openid-connect.lua → apisix/plugins/openid-connect.lua b/lua/apisix/plugins/openid-connect.lua → apisix/plugins/openid-connect.lua
diff --git a/lua/apisix/plugins/prometheus.lua → apisix/plugins/prometheus.lua b/lua/apisix/plugins/prometheus.lua → apisix/plugins/prometheus.lua
diff --git a/lua/apisix/plugins/prometheus/exporter.lua → apisix/plugins/prometheus/exporter.lua b/lua/apisix/plugins/prometheus/exporter.lua → apisix/plugins/prometheus/exporter.lua
diff --git a/lua/apisix/plugins/proxy-rewrite.lua → apisix/plugins/proxy-rewrite.lua b/lua/apisix/plugins/proxy-rewrite.lua → apisix/plugins/proxy-rewrite.lua
diff --git a/lua/apisix/plugins/redirect.lua → apisix/plugins/redirect.lua b/lua/apisix/plugins/redirect.lua → apisix/plugins/redirect.lua
diff --git a/lua/apisix/plugins/response-rewrite.lua → apisix/plugins/response-rewrite.lua b/lua/apisix/plugins/response-rewrite.lua → apisix/plugins/response-rewrite.lua
diff --git a/...isix/plugins/serverless-post-function.lua → apisix/plugins/serverless-post-function.lua b/...isix/plugins/serverless-post-function.lua → apisix/plugins/serverless-post-function.lua
diff --git a/...pisix/plugins/serverless-pre-function.lua → apisix/plugins/serverless-pre-function.lua b/...pisix/plugins/serverless-pre-function.lua → apisix/plugins/serverless-pre-function.lua
diff --git a/lua/apisix/plugins/serverless.lua → apisix/plugins/serverless.lua b/lua/apisix/plugins/serverless.lua → apisix/plugins/serverless.lua
diff --git a/lua/apisix/plugins/udp-logger.lua → apisix/plugins/udp-logger.lua b/lua/apisix/plugins/udp-logger.lua → apisix/plugins/udp-logger.lua
diff --git a/lua/apisix/plugins/wolf-rbac.lua → apisix/plugins/wolf-rbac.lua b/lua/apisix/plugins/wolf-rbac.lua → apisix/plugins/wolf-rbac.lua
diff --git a/lua/apisix/plugins/zipkin.lua → apisix/plugins/zipkin.lua b/lua/apisix/plugins/zipkin.lua → apisix/plugins/zipkin.lua
diff --git a/lua/apisix/plugins/zipkin/codec.lua → apisix/plugins/zipkin/codec.lua b/lua/apisix/plugins/zipkin/codec.lua → apisix/plugins/zipkin/codec.lua
diff --git a/lua/apisix/plugins/zipkin/random_sampler.lua → apisix/plugins/zipkin/random_sampler.lua b/lua/apisix/plugins/zipkin/random_sampler.lua → apisix/plugins/zipkin/random_sampler.lua
diff --git a/lua/apisix/plugins/zipkin/reporter.lua → apisix/plugins/zipkin/reporter.lua b/lua/apisix/plugins/zipkin/reporter.lua → apisix/plugins/zipkin/reporter.lua
diff --git a/lua/apisix/router.lua → apisix/router.lua b/lua/apisix/router.lua → apisix/router.lua
diff --git a/lua/apisix/schema_def.lua → apisix/schema_def.lua b/lua/apisix/schema_def.lua → apisix/schema_def.lua
diff --git a/lua/apisix/stream/plugins/mqtt-proxy.lua → apisix/stream/plugins/mqtt-proxy.lua b/lua/apisix/stream/plugins/mqtt-proxy.lua → apisix/stream/plugins/mqtt-proxy.lua
diff --git a/lua/apisix/stream/router/ip_port.lua → apisix/stream/router/ip_port.lua b/lua/apisix/stream/router/ip_port.lua → apisix/stream/router/ip_port.lua
diff --git a/t/APISIX.pm b/t/APISIX.pm
@@ -57,8 +57,8 @@ _EOC_
 
     my $stream_enable = $block->stream_enable;
     my $stream_config = $block->stream_config // <<_EOC_;
-    lua_package_path "$pwd/deps/share/lua/5.1/?.lua;$pwd/lua/?.lua;$pwd/t/?.lua;/usr/share/lua/5.1/?.lua;;";
-    lua_package_cpath "$pwd/deps/lib/lua/5.1/?.so;$pwd/deps/lib64/lua/5.1/?.so;/usr/lib64/lua/5.1/?.so;;";
+    lua_package_path "$pwd/deps/share/lua/5.1/?.lua;$pwd/?/init.lua;$pwd/t/?.lua;;";
+    lua_package_cpath "$pwd/deps/lib/lua/5.1/?.so;$pwd/deps/lib64/lua/5.1/?.so;;";
 
     lua_socket_log_errors off;
 
@@ -133,8 +133,8 @@ _EOC_
 
     my $http_config = $block->http_config // '';
     $http_config .= <<_EOC_;
-    lua_package_path "$pwd/deps/share/lua/5.1/?.lua;$pwd/lua/?.lua;$pwd/t/?.lua;/usr/share/lua/5.1/?.lua;;";
-    lua_package_cpath "$pwd/deps/lib/lua/5.1/?.so;$pwd/deps/lib64/lua/5.1/?.so;/usr/lib64/lua/5.1/?.so;;";
+    lua_package_path "$pwd/deps/share/lua/5.1/?.lua;$pwd/?/init.lua;$pwd/t/?.lua;;";
+    lua_package_cpath "$pwd/deps/lib/lua/5.1/?.so;$pwd/deps/lib64/lua/5.1/?.so;;";
 
     lua_shared_dict plugin-limit-req     10m;
     lua_shared_dict plugin-limit-count   10m;

diff --git a/utils/check-lua-code-style.sh b/utils/check-lua-code-style.sh
@@ -19,17 +19,17 @@
 
 set -ex
 
-luacheck -q lua
+luacheck -q apisix
 
-./utils/lj-releng lua/*.lua \
-    lua/apisix/*.lua \
-    lua/apisix/admin/*.lua \
-    lua/apisix/core/*.lua \
-    lua/apisix/http/*.lua \
-    lua/apisix/http/router/*.lua \
-    lua/apisix/plugins/*.lua \
-    lua/apisix/plugins/grpc-transcode/*.lua \
-    lua/apisix/plugins/limit-count/*.lua > \
+./utils/lj-releng \
+    apisix/*.lua \
+    apisix/admin/*.lua \
+    apisix/core/*.lua \
+    apisix/http/*.lua \
+    apisix/http/router/*.lua \
+    apisix/plugins/*.lua \
+    apisix/plugins/grpc-transcode/*.lua \
+    apisix/plugins/limit-count/*.lua > \
     /tmp/check.log 2>&1 || (cat /tmp/check.log && exit 1)
 
 count=`grep -E ".lua:[0-9]+:" /tmp/check.log -c || true`