Merge branch 'master' into next

flysnow911 · Dec 12, 2019 · afa71c2 · afa71c2
2 parents 314af03 + f4661ec
commit afa71c2
Show file tree

Hide file tree

Showing 49 changed files with 2,835 additions and 370 deletions.
diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
+function cyan() {
+    echo -e "\033[1;36m$*\033[0m"
+}
+function red() {
+    echo -e "\033[1;31m$*\033[0m"
+}
+
 export BUSTED_ARGS="-o gtest -v --exclude-tags=flaky,ipv6"
 
 if [ "$KONG_TEST_DATABASE" == "postgres" ]; then
@@ -23,7 +30,51 @@ if [ "$TEST_SUITE" == "dbless" ]; then
                      spec/02-integration/04-admin_api/15-off_spec.lua
 fi
 if [ "$TEST_SUITE" == "plugins" ]; then
-    eval "$TEST_CMD" spec/03-plugins/
+    set +e
+    rm -f .failed
+
+    for p in spec/03-plugins/*; do
+        echo
+        cyan "--------------------------------------"
+        cyan $(basename $p)
+        cyan "--------------------------------------"
+        echo
+
+        $TEST_CMD $p || echo "* $p" >> .failed
+    done
+
+    cat kong-*.rockspec | grep kong- | grep -v zipkin | grep -v sidecar | grep "~" | while read line ; do
+        REPOSITORY=`echo $line | sed "s/\"/ /g" | awk -F" " '{print $1}'`
+        VERSION=`luarocks show $REPOSITORY | grep $REPOSITORY | head -1 | awk -F" " '{print $2}' | cut -f1 -d"-"`
+        REPOSITORY=`echo $REPOSITORY | sed -e 's/kong-prometheus-plugin/kong-plugin-prometheus/g'`
+        REPOSITORY=`echo $REPOSITORY | sed -e 's/kong-proxy-cache-plugin/kong-plugin-proxy-cache/g'`
+
+        echo
+        cyan "--------------------------------------"
+        cyan $REPOSITORY $VERSION
+        cyan "--------------------------------------"
+        echo
+
+        git clone https://github.com/Kong/$REPOSITORY.git --branch $VERSION --single-branch /tmp/test-$REPOSITORY
+        cp -R /tmp/test-$REPOSITORY/spec/fixtures/* spec/fixtures/ || true
+        pushd /tmp/test-$REPOSITORY
+        luarocks make
+        popd
+
+        $TEST_CMD /tmp/test-$REPOSITORY/spec/ || echo "* $REPOSITORY" >> .failed
+
+    done
+
+    if [ -f .failed ]; then
+        echo
+        red "--------------------------------------"
+        red "Plugin tests failed:"
+        red "--------------------------------------"
+        cat .failed
+        exit 1
+    else
+        exit 0
+    fi
 fi
 if [ "$TEST_SUITE" == "pdk" ]; then
     TEST_NGINX_RANDOMIZE=1 prove -I. -j$JOBS -r t/01-pdk

diff --git a/.requirements b/.requirements
@@ -1,5 +1,10 @@
+KONG_PACKAGE_NAME=kong
+KONG_CONFLICTS=kong-enterprise-edition
+KONG_LICENSE="ASL 2.0"
+
 KONG_GMP_VERSION=6.1.2
 RESTY_VERSION=1.15.8.2
 RESTY_LUAROCKS_VERSION=3.2.1
 RESTY_OPENSSL_VERSION=1.1.1d
 RESTY_PCRE_VERSION=8.43
+LIBYAML_VERSION=0.2.2
diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,6 @@ cache:
 stages:
   - lint and unit
   - test
-  - Deploy daily build
   - Release
 
 jobs:
@@ -77,12 +76,6 @@ jobs:
       - make release
       env: PACKAGE_TYPE=src RESTY_IMAGE_BASE=src KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=${TRAVIS_TAG}
       if: tag IS present AND tag ~= 1.
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=ubuntu RESTY_IMAGE_TAG=trusty KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=${TRAVIS_TAG}
-      if: tag IS present AND tag ~= 1.
     - script:
       - make setup-kong-build-tools
       - pushd ../kong-build-tools && make setup-ci && popd
@@ -149,79 +142,5 @@ jobs:
       - make release
       env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=1 KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=${TRAVIS_TAG}
       if: tag IS present AND tag ~= 1.
-    - stage: deploy daily build
-      install: skip
-      script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=ubuntu RESTY_IMAGE_TAG=trusty KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=ubuntu RESTY_IMAGE_TAG=xenial KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=ubuntu RESTY_IMAGE_TAG=bionic KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=debian RESTY_IMAGE_TAG=stretch KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=debian RESTY_IMAGE_TAG=jessie KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=deb RESTY_IMAGE_BASE=debian RESTY_IMAGE_TAG=buster KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=centos RESTY_IMAGE_TAG=6 KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=centos RESTY_IMAGE_TAG=7 KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=apk RESTY_IMAGE_BASE=alpine RESTY_IMAGE_TAG=latest KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=6 KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=rhel RESTY_IMAGE_TAG=7 KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
-    - script:
-      - make setup-kong-build-tools
-      - pushd ../kong-build-tools && make setup-ci && popd
-      - make nightly-release
-      env: PACKAGE_TYPE=rpm RESTY_IMAGE_BASE=amazonlinux RESTY_IMAGE_TAG=latest KONG_PACKAGE_NAME=${PWD##*/} KONG_VERSION=`date +%Y-%m-%d` REPOSITORY_NAME=${PWD##*/}-nightly REPOSITORY_OS_NAME=$TRAVIS_BRANCH
-      if: type=cron
 script:
   - .ci/run_tests.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 
 - [2.0.0](#200)
+- [1.4.2](#142)
+- [1.4.1](#141)
 - [1.4.0](#140)
 - [1.3.0](#130)
 - [1.2.2](#122)
@@ -33,6 +35,7 @@
 - [0.10.0](#0100---20170307)
 - [0.9.9 and prior](#099---20170202)
 
+
 ## [2.0.0]
 
 > Released on
@@ -46,6 +49,75 @@
     [#5199](https://github.com/Kong/kong/pull/5199)
 
 
+## [1.4.2]
+
+> Released 2019/12/10
+
+This is another patch release in the 1.4 series, and as such, strictly
+contains bugfixes. There are no new features nor breaking changes.
+
+### Fixes
+
+##### Core
+
+  - Fixes some corner cases in the balancer behavior
+    [#5318](https://github.com/Kong/kong/pull/5318)
+
+##### Plugins
+
+  - http-log: disable queueing when using the default
+    settings, to avoid memory consumption issues
+    [#5323](https://github.com/Kong/kong/pull/5323)
+  - prometheus: restore compatibility with version 0.6.0
+    [#5303](https://github.com/Kong/kong/pull/5303)
+
+
+[Back to TOC](#table-of-contents)
+
+
+## [1.4.1]
+
+> Released 2019/12/03
+
+This is a patch release in the 1.4 series, and as such, strictly contains
+bugfixes. There are no new features nor breaking changes.
+
+### Fixes
+
+##### Core
+
+  - Fixed a memory leak in the balancer
+    [#5229](https://github.com/Kong/kong/pull/5229) --
+    Thanks [zeeshen](https://github.com/zeeshen) for the patch!
+  - Removed arbitrary limit on worker connections.
+    [#5148](https://github.com/Kong/kong/pull/5148)
+  - Fixed `preserve_host` behavior for gRPC routes
+    [#5225](https://github.com/Kong/kong/pull/5225)
+  - Fix migrations for ttl for OAuth2 tokens
+    [#5253](https://github.com/Kong/kong/pull/5253)
+  - Improve handling of errors when creating balancers
+    [#5284](https://github.com/Kong/kong/pull/5284)
+
+##### CLI
+
+  - Fixed an issue with `kong config db_export` when reading
+    entities that are ttl-enabled and whose ttl value is `null`.
+    [#5185](https://github.com/Kong/kong/pull/5185)
+
+##### Admin API
+
+  - Various fixes for Admin API behavior
+    [#5174](https://github.com/Kong/kong/pull/5174),
+    [#5178](https://github.com/Kong/kong/pull/5178),
+    [#5191](https://github.com/Kong/kong/pull/5191),
+    [#5186](https://github.com/Kong/kong/pull/5186)
+
+##### Plugins
+
+  - http-log: do not impose a retry delay on successful sends
+    [#5282](https://github.com/Kong/kong/pull/5282)
+
+
 [Back to TOC](#table-of-contents)
 
 ## [1.4.0]
@@ -4234,6 +4306,9 @@ First version running with Cassandra.
 
 [Back to TOC](#table-of-contents)
 
+[2.0.0]: https://github.com/Kong/kong/compare/1.4.2...2.0.0
+[1.4.2]: https://github.com/Kong/kong/compare/1.4.1...1.4.2
+[1.4.1]: https://github.com/Kong/kong/compare/1.4.0...1.4.1
 [1.4.0]: https://github.com/Kong/kong/compare/1.3.0...1.4.0
 [1.3.0]: https://github.com/Kong/kong/compare/1.2.2...1.3.0
 [1.2.2]: https://github.com/Kong/kong/compare/1.2.1...1.2.2