From c9835c461546a72d38578a208da7fdf7f4ddc146 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Fri, 11 Dec 2015 16:53:35 +0100 Subject: [PATCH 1/3] move CLI from Puc Lua to LuaJit dropped Lua dependency from Kong install script --- .ci/setup_kong.sh | 4 ++-- bin/kong | 2 +- kong/cli/config.lua | 2 +- kong/cli/db.lua | 2 +- kong/cli/migrations.lua | 2 +- kong/cli/quit.lua | 2 +- kong/cli/reload.lua | 2 +- kong/cli/restart.lua | 2 +- kong/cli/start.lua | 2 +- kong/cli/stop.lua | 2 +- kong/cli/version.lua | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/setup_kong.sh b/.ci/setup_kong.sh index 87544aa8bd8..87785ca6b6f 100644 --- a/.ci/setup_kong.sh +++ b/.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 uuid-dev +sudo apt-get install sudo netcat openssl libpcre3 dnsmasq uuid-dev # Installing Kong and its dependencies sudo apt-get install lsb-release diff --git a/bin/kong b/bin/kong index d34526c1fba..9da5c18eb55 100755 --- a/bin/kong +++ b/bin/kong @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit -- Kong CLI entry-point (bin/kong). -- diff --git a/kong/cli/config.lua b/kong/cli/config.lua index 6acf77a7ade..6d749284f62 100644 --- a/kong/cli/config.lua +++ b/kong/cli/config.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/db.lua b/kong/cli/db.lua index d24a195a603..8862d4baf62 100644 --- a/kong/cli/db.lua +++ b/kong/cli/db.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local Faker = require "kong.tools.faker" local constants = require "kong.constants" diff --git a/kong/cli/migrations.lua b/kong/cli/migrations.lua index b4848b3d2ca..c9bfeaaa8f9 100644 --- a/kong/cli/migrations.lua +++ b/kong/cli/migrations.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local Migrations = require "kong.tools.migrations" local constants = require "kong.constants" diff --git a/kong/cli/quit.lua b/kong/cli/quit.lua index 9393e80d58b..957487d5c5f 100644 --- a/kong/cli/quit.lua +++ b/kong/cli/quit.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/reload.lua b/kong/cli/reload.lua index 21c10d8159e..100133dee11 100644 --- a/kong/cli/reload.lua +++ b/kong/cli/reload.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/restart.lua b/kong/cli/restart.lua index c347cb3c638..cb316dff0cd 100644 --- a/kong/cli/restart.lua +++ b/kong/cli/restart.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/start.lua b/kong/cli/start.lua index eabbb601fa6..1f6755d317b 100755 --- a/kong/cli/start.lua +++ b/kong/cli/start.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/stop.lua b/kong/cli/stop.lua index 2efe38b712b..e7f7183a15b 100755 --- a/kong/cli/stop.lua +++ b/kong/cli/stop.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local constants = require "kong.constants" local cutils = require "kong.cli.utils" diff --git a/kong/cli/version.lua b/kong/cli/version.lua index 2d39a0afd6f..10b5450c562 100644 --- a/kong/cli/version.lua +++ b/kong/cli/version.lua @@ -1,4 +1,4 @@ -#!/usr/bin/env lua +#!/usr/bin/env luajit local cutils = require "kong.cli.utils" local constants = require "kong.constants" From cd7d9e3cffa0f495fbc508f275e4870db1180748 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Sun, 13 Dec 2015 23:08:03 +0100 Subject: [PATCH 2/3] updated changelog; remove Lua dependency --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b90070639..8c14e15d407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Removed the `dnsmasq_port` property, and introduced `dns_resolver` that also allows to specify a custom DNS server. [#625](https://github.com/Mashape/kong/pull/635) - 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) - Disabled access logs for `/status` endpoint +- Removed the Lua 5.1 dependency, cli scripts updated to run against the LuaJit engine included with OpenResty/Nginx [#799](https://github.com/Mashape/kong/pull/799) ### Fixed From 1c25a1c0abdb4e23484c0d47de1bc2e3fe4322ba Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Wed, 16 Dec 2015 16:45:44 -0800 Subject: [PATCH 3/3] docs(changelog) present tense, s/LuaJit/LuaJIT, breakign changes section --- CHANGELOG.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c14e15d407..ac8b479406a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,22 @@ ## [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 -- Added a `total` field in API responses, that counts the total number of entities in the table. [#635](https://github.com/Mashape/kong/pull/635) -- You can now specify a custom DNS resolver address that Kong will use when resolving hostnames. [#625](https://github.com/Mashape/kong/pull/635) +- 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 -- Removed the `dnsmasq_port` property, and introduced `dns_resolver` that also allows to specify a custom DNS server. [#625](https://github.com/Mashape/kong/pull/635) +- 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) -- Disabled access logs for `/status` endpoint -- Removed the Lua 5.1 dependency, cli scripts updated to run against the LuaJit engine included with OpenResty/Nginx [#799](https://github.com/Mashape/kong/pull/799) ### Fixed -- In the API, the `next` link is not being displayed anymore if there are no more entities to return. [#635](https://github.com/Mashape/kong/pull/635) +- 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 @@ -30,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 @@ -89,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: