[fix/request-transformer] concatenating value to header/querystring

.ci/setup_cassandra.sh

@@ -2,6 +2,18 @@
 
 CASSANDRA_BASE=apache-cassandra-$CASSANDRA_VERSION
 
-sudo rm -rf /var/lib/cassandra/*
-curl http://apache.arvixe.com/cassandra/$CASSANDRA_VERSION/$CASSANDRA_BASE-bin.tar.gz | tar xz
+n=0
+until [ $n -ge 5 ]
+do
+    sudo rm -rf /var/lib/cassandra/*
+    curl http://archive.apache.org/dist/cassandra/$CASSANDRA_VERSION/$CASSANDRA_BASE-bin.tar.gz | tar xz && break
+    n=$[$n+1]
+    sleep 5
+done
+
+if [[ ! -f $CASSANDRA_BASE/bin/cassandra ]] ; then
+    echo 'Failed downloading and unpacking cassandra. Aborting.'
+    exit 1
+fi
+
 sudo sh $CASSANDRA_BASE/bin/cassandra

.ci/setup_kong.sh

@@ -5,10 +5,10 @@ KONG_VERSION=0.5.0
 sudo apt-get update
 
 # Installing dependencies required to build development rocks
-sudo apt-get install wget curl tar make gcc unzip git liblua5.1-0-dev
+sudo apt-get install wget curl tar make gcc unzip git
 
 # Installing dependencies required for Kong
-sudo apt-get install sudo netcat lua5.1 openssl libpcre3 dnsmasq
+sudo apt-get install sudo netcat openssl libpcre3 dnsmasq uuid-dev
 
 # Installing Kong and its dependencies
 sudo apt-get install lsb-release
@@ -18,4 +18,4 @@ curl -L -o $KONG_FILE https://github.com/Mashape/kong/releases/download/$KONG_VE
 sudo dpkg -i $KONG_FILE
 
 sudo luarocks remove kong --force
-sudo rm -rf /etc/kong
+sudo rm -rf /etc/kong

.luacheckrc

@@ -1,6 +1,6 @@
 redefined = false
 unused_args = false
-globals = {"ngx", "dao", "app", "configuration"}
+globals = {"ngx", "dao", "app", "configuration", "process_id"}
 
 files["kong/"] = {
   std = "luajit"

.travis.yml

@@ -2,14 +2,10 @@ language: erlang
 
 env:
   global:
-    - CASSANDRA_VERSION=2.1.10
+    - CASSANDRA_VERSION=2.1.11
   matrix:
     - LUA=lua5.1
 
-branches:
-  only:
-    - master
-
 before_install:
   - "bash .ci/setup_kong.sh"
   - "bash .ci/setup_cassandra.sh"

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased][unreleased]
 
+### Breaking changes
+
+- Drop the Lua 5.1 dependency which was only used for Kong's CLI. The CLI now runs against LuaJIT, which is consistent with other Kong components (Luarocks and OpenResty) already relying on LuaJIT. Make sure the LuaJIT interpreter is included in your `$PATH`. [#799](https://github.com/Mashape/kong/pull/799)
+
+### Added
+
+- A new `total` field in API responses, that counts the total number of entities in the response body. [#635](https://github.com/Mashape/kong/pull/635)
+- Dnsmasq is now optional. You can specify a custom DNS resolver address that Kong will use when resolving hostnames. This can be configured in `kong.yml`. [#625](https://github.com/Mashape/kong/pull/635)
+
+### Changed
+
+- Disable access logs for `/status` endpoint.
+- The `/status` endpoint now includes `database` statistics, while the previous stats have been moved to a `server` field. [#635](https://github.com/Mashape/kong/pull/635)
+
+### Fixed
+
+- In the Admin API responses, the `next` link is not being displayed anymore if there are no more entities to be returned. [#635](https://github.com/Mashape/kong/pull/635)
+
 ## [0.5.4] - 2015/12/03
 
 ### Fixed
@@ -14,8 +32,8 @@
 ### Fixed
 
 - Avoids additional URL encoding when proxying to an upstream service. [#691](https://github.com/Mashape/kong/pull/691)
-- Fixing potential timing comparison bug in HMAC plugin. [#704](https://github.com/Mashape/kong/pull/704)
-- Fixed a missing "env" statement in the Nginx configuration. [#706](https://github.com/Mashape/kong/pull/706)
+- Potential timing comparison bug in HMAC plugin. [#704](https://github.com/Mashape/kong/pull/704)
+- A missing "env" statement in the Nginx configuration. [#706](https://github.com/Mashape/kong/pull/706)
 
 ### Added
 
@@ -73,7 +91,6 @@ Several breaking changes are introduced. You will have to slightly change your c
   - `strip_path` -> `strip_request_path`
   - `target_url` -> `upstream_url`
 - `plugins_configurations` have been renamed to `plugins`, and their `value` property has been renamed to `config` to avoid confusions. [#513](https://github.com/Mashape/kong/issues/513)
->>>>>>> dbocs(changelog) 0.5.0 changes
 - The database schema has been updated to handle the separation of plugins outside of the core repository.
 - The Key authentication and Basic authentication plugins routes have changed:
 

bin/kong

@@ -1,4 +1,4 @@
-#!/usr/bin/env lua
+#!/usr/bin/env luajit
 
 -- Kong CLI entry-point (bin/kong).
 --
@@ -49,7 +49,5 @@ elseif not commands[cmd] then
   os.exit(1)
 end
 
-require "kong.tools.ngx_stub"
-
 -- Load and execute desired command
 require(commands[cmd])

circle.yml

@@ -10,6 +10,9 @@ dependencies:
         - sudo make dev
 test:
     override:
-        - busted -o spec/busted-print.lua --coverage spec/
+        - busted -v -o spec/busted-print.lua --coverage :
+            parallel: true
+            files:
+              - spec/**/*_spec.lua
     post:
         - make lint

kong-0.5.4-1.rockspec

@@ -14,23 +14,25 @@ dependencies = {
   "lua ~> 5.1",
   "luasec ~> 0.5-2",
 
-  "uuid ~> 0.2-1",
+  "lua_uuid ~> 0.1-8",
+  "lua_system_constants ~> 0.1-3",
   "luatz ~> 0.3-1",
-  "yaml ~> 1.1.1-1",
-  "lapis ~> 1.1.0-1",
+  "yaml ~> 1.1.2-1",
+  "lapis ~> 1.3.1-1",
   "stringy ~> 0.4-1",
-  "lua-cassandra ~> 0.3.6-0",
+  "lua-cassandra ~> 0.4.1-0",
   "multipart ~> 0.2-1",
   "lua-path ~> 0.2.3-1",
   "lua-cjson ~> 2.1.0-1",
   "ansicolors ~> 1.0.2-3",
   "lbase64 ~> 20120820-1",
   "lua-resty-iputils ~> 0.2.0-1",
 
-  "luasocket ~> 2.0.2-5",
+  "luasocket ~> 2.0.2-6",
   "lrexlib-pcre ~> 2.7.2-1",
   "lua-llthreads2 ~> 0.1.3-1",
-  "luacrypto >= 0.3.2-1"
+  "luacrypto >= 0.3.2-1",
+  "luasyslog >= 1.0.0-2"
 }
 build = {
   type = "builtin",
@@ -44,7 +46,7 @@ build = {
 
     ["kong.constants"] = "kong/constants.lua",
 
-    ["kong.cli.utils"] = "kong/cli/utils/utils.lua",
+    ["kong.cli.utils"] = "kong/cli/utils.lua",
     ["kong.cli.utils.dnsmasq"] = "kong/cli/utils/dnsmasq.lua",
     ["kong.cli.utils.ssl"] = "kong/cli/utils/ssl.lua",
     ["kong.cli.utils.signal"] = "kong/cli/utils/signal.lua",
@@ -70,15 +72,15 @@ build = {
     ["kong.tools.migrations"] = "kong/tools/migrations.lua",
     ["kong.tools.http_client"] = "kong/tools/http_client.lua",
     ["kong.tools.database_cache"] = "kong/tools/database_cache.lua",
+    ["kong.tools.config_defaults"] = "kong/tools/config_defaults.lua",
+    ["kong.tools.config_loader"] = "kong/tools/config_loader.lua",
+    ["kong.tools.dao_loader"] = "kong/tools/dao_loader.lua",
 
-    ["kong.resolver.handler"] = "kong/resolver/handler.lua",
-    ["kong.resolver.access"] = "kong/resolver/access.lua",
-    ["kong.resolver.header_filter"] = "kong/resolver/header_filter.lua",
-    ["kong.resolver.certificate"] = "kong/resolver/certificate.lua",
-
-    ["kong.reports.handler"] = "kong/reports/handler.lua",
-    ["kong.reports.init_worker"] = "kong/reports/init_worker.lua",
-    ["kong.reports.log"] = "kong/reports/log.lua",
+    ["kong.core.handler"] = "kong/core/handler.lua",
+    ["kong.core.certificate"] = "kong/core/certificate.lua",
+    ["kong.core.resolver"] = "kong/core/resolver.lua",
+    ["kong.core.plugins_iterator"] = "kong/core/plugins_iterator.lua",
+    ["kong.core.reports"] = "kong/core/reports.lua",
 
     ["kong.dao.cassandra.schema.migrations"] = "kong/dao/cassandra/schema/migrations.lua",
     ["kong.dao.error"] = "kong/dao/error.lua",
@@ -220,7 +222,15 @@ build = {
     ["kong.plugins.hmac-auth.access"] = "kong/plugins/hmac-auth/access.lua",
     ["kong.plugins.hmac-auth.schema"] = "kong/plugins/hmac-auth/schema.lua",
     ["kong.plugins.hmac-auth.api"] = "kong/plugins/hmac-auth/api.lua",
-    ["kong.plugins.hmac-auth.daos"] = "kong/plugins/hmac-auth/daos.lua"
+    ["kong.plugins.hmac-auth.daos"] = "kong/plugins/hmac-auth/daos.lua",
+
+    ["kong.plugins.syslog.handler"] = "kong/plugins/syslog/handler.lua",
+    ["kong.plugins.syslog.log"] = "kong/plugins/syslog/log.lua",
+    ["kong.plugins.syslog.schema"] = "kong/plugins/syslog/schema.lua",
+
+    ["kong.plugins.loggly.handler"] = "kong/plugins/loggly/handler.lua",
+    ["kong.plugins.loggly.log"] = "kong/plugins/loggly/log.lua",
+    ["kong.plugins.loggly.schema"] = "kong/plugins/loggly/schema.lua"
   },
   install = {
     conf = { "kong.yml" },