You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/05/23 13:24:10 UTC
[apisix] branch release/2.14 updated: feat: release 2.14.1 (#7107)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/2.14
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/release/2.14 by this push:
new 42a6f57d7 feat: release 2.14.1 (#7107)
42a6f57d7 is described below
commit 42a6f57d7659a90407fb3562866e241479526af4
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Mon May 23 21:24:02 2022 +0800
feat: release 2.14.1 (#7107)
* fix(batch-requests): ignore "unix:" in the configuration
Signed-off-by: spacewander <sp...@gmail.com>
* chore(ci): apt update before install (#7080)
Signed-off-by: spacewander <sp...@gmail.com>
* feat: release 2.14.1
Signed-off-by: spacewander <sp...@gmail.com>
Co-authored-by: tzssangglass <tz...@gmail.com>
---
.github/workflows/build.yml | 9 ++-
.github/workflows/cli-master.yml | 3 -
.github/workflows/cli.yml | 3 -
.github/workflows/kubernetes-ci.yml | 3 +-
.github/workflows/tars-ci.yml | 3 +-
CHANGELOG.md | 7 ++
apisix/cli/ops.lua | 2 +-
apisix/core/version.lua | 2 +-
ci/common.sh | 5 ++
ci/linux_apisix_current_luarocks_runner.sh | 2 +
ci/linux_apisix_master_luarocks_runner.sh | 2 +
ci/linux_openresty_common_runner.sh | 6 +-
docs/en/latest/config.json | 2 +-
docs/zh/latest/CHANGELOG.md | 7 ++
docs/zh/latest/config.json | 2 +-
rockspec/apisix-2.14.1-0.rockspec | 102 +++++++++++++++++++++++++++++
t/cli/test_validate_config.sh | 1 +
17 files changed, 140 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea6eda1e3..716a3d0f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,9 +82,6 @@ jobs:
rm -rf $(ls -1 --ignore=*.tgz --ignore=ci --ignore=t --ignore=utils --ignore=.github)
tar zxvf ${{ steps.branch_env.outputs.fullname }}
- - name: Linux Get dependencies
- run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
-
- name: Build wasm code
if: matrix.os_name == 'linux_openresty'
run: |
@@ -101,6 +98,12 @@ jobs:
- name: Linux Before install
run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
+ - name: Start CI env
+ run: |
+ # launch deps env
+ make ci-env-up
+ sudo ./ci/linux-ci-init-service.sh
+
- name: Start Dubbo Backend
if: matrix.os_name == 'linux_openresty'
run: |
diff --git a/.github/workflows/cli-master.yml b/.github/workflows/cli-master.yml
index 32c30b273..58a34d8b1 100644
--- a/.github/workflows/cli-master.yml
+++ b/.github/workflows/cli-master.yml
@@ -49,9 +49,6 @@ jobs:
run: |
project_compose_ci=ci/pod/docker-compose.common.yml make ci-env-up
- - name: Linux Get dependencies
- run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
-
- name: Linux Install
run: |
sudo --preserve-env=OPENRESTY_VERSION \
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 1dc9e6a9d..342da39b2 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -54,9 +54,6 @@ jobs:
run: |
project_compose_ci=ci/pod/docker-compose.common.yml make ci-env-up
- - name: Linux Get dependencies
- run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
-
- name: Linux Before install
run: sudo ./ci/${{ matrix.job_name }}_runner.sh before_install
diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml
index 5534cc4f4..66615cf80 100644
--- a/.github/workflows/kubernetes-ci.yml
+++ b/.github/workflows/kubernetes-ci.yml
@@ -77,8 +77,7 @@ jobs:
- name: Linux Install
run: |
- sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
- sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
+ sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
sudo --preserve-env=OPENRESTY_VERSION ./ci/${{ matrix.os_name }}_runner.sh do_install
- name: Run test cases
diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml
index c939fd240..e85044671 100644
--- a/.github/workflows/tars-ci.yml
+++ b/.github/workflows/tars-ci.yml
@@ -48,8 +48,7 @@ jobs:
- name: Linux Install
run: |
- sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
- sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
+ sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
sudo --preserve-env=OPENRESTY_VERSION ./ci/${{ matrix.os_name }}_runner.sh do_install
- name: Run test cases
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59169e695..33cd1263e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
## Table of Contents
+- [2.14.1](#2141)
- [2.14.0](#2140)
- [2.13.1](#2131)
- [2.13.0](#2130)
@@ -57,6 +58,12 @@ title: Changelog
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.14.1
+
+### Bugfix
+
+- The "unix:" in the `real_ip_from` configuration should not break the batch-requests plugin: [#7106](https://github.com/apache/apisix/pull/7106)
+
## 2.14.0
### Change
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
index ae38a9dd5..85d0d4521 100644
--- a/apisix/cli/ops.lua
+++ b/apisix/cli/ops.lua
@@ -279,7 +279,7 @@ Please modify "admin_key" in conf/config.yaml .
if real_ip_from then
for _, ip in ipairs(real_ip_from) do
local _ip = cli_ip:new(ip)
- if _ip:is_loopback() or _ip:is_unspecified() then
+ if _ip and _ip:is_loopback() or _ip:is_unspecified() then
pass_real_client_ip = true
end
end
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 675282615..3b0e34726 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -20,5 +20,5 @@
-- @module core.version
return {
- VERSION = "2.14.0"
+ VERSION = "2.14.1"
}
diff --git a/ci/common.sh b/ci/common.sh
index 6353957ec..fd5575c0f 100644
--- a/ci/common.sh
+++ b/ci/common.sh
@@ -80,3 +80,8 @@ install_nodejs () {
}
GRPC_SERVER_EXAMPLE_VER=20210819
+
+linux_get_dependencies () {
+ apt update
+ apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
+}
diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh
index b630c1db9..3989d0df0 100755
--- a/ci/linux_apisix_current_luarocks_runner.sh
+++ b/ci/linux_apisix_current_luarocks_runner.sh
@@ -19,6 +19,8 @@
. ./ci/common.sh
do_install() {
+ linux_get_dependencies
+
export_or_prefix
./utils/linux-install-openresty.sh
diff --git a/ci/linux_apisix_master_luarocks_runner.sh b/ci/linux_apisix_master_luarocks_runner.sh
index 75ca91eb2..2ffa94cde 100755
--- a/ci/linux_apisix_master_luarocks_runner.sh
+++ b/ci/linux_apisix_master_luarocks_runner.sh
@@ -19,6 +19,8 @@
. ./ci/common.sh
do_install() {
+ linux_get_dependencies
+
export_or_prefix
./utils/linux-install-openresty.sh
diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh
index 3fae0797f..16579d527 100755
--- a/ci/linux_openresty_common_runner.sh
+++ b/ci/linux_openresty_common_runner.sh
@@ -19,11 +19,9 @@
. ./ci/common.sh
before_install() {
- sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
+ linux_get_dependencies
- # launch deps env
- make ci-env-up
- ./ci/linux-ci-init-service.sh
+ sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
}
do_install() {
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index cceda22a2..8d73ae26c 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.14.0",
+ "version": "2.14.1",
"sidebar": [
{
"type": "category",
diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md
index 16b4b2516..a10464b70 100644
--- a/docs/zh/latest/CHANGELOG.md
+++ b/docs/zh/latest/CHANGELOG.md
@@ -23,6 +23,7 @@ title: CHANGELOG
## Table of Contents
+- [2.14.1](#2141)
- [2.14.0](#2140)
- [2.13.1](#2131)
- [2.13.0](#2130)
@@ -57,6 +58,12 @@ title: CHANGELOG
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.14.1
+
+### Bugfix
+
+- `real_ip_from` 中配置 "unix: " 不应该导致 batch-requests 插件无法使用 [#7106](https://github.com/apache/apisix/pull/7106)
+
## 2.14.0
### Change
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index b0f5abbe5..4fe9dbc7e 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.14.0",
+ "version": "2.14.1",
"sidebar": [
{
"type": "category",
diff --git a/rockspec/apisix-2.14.1-0.rockspec b/rockspec/apisix-2.14.1-0.rockspec
new file mode 100644
index 000000000..3465f93c9
--- /dev/null
+++ b/rockspec/apisix-2.14.1-0.rockspec
@@ -0,0 +1,102 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+package = "apisix"
+version = "2.14.1-0"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+ url = "git://github.com/apache/apisix",
+ branch = "2.14.1",
+}
+
+description = {
+ summary = "Apache APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ homepage = "https://github.com/apache/apisix",
+ license = "Apache License 2.0",
+}
+
+dependencies = {
+ "lua-resty-ctxdump = 0.1-0",
+ "lua-resty-dns-client = 6.0.2",
+ "lua-resty-template = 2.0",
+ "lua-resty-etcd = 1.6.2",
+ "api7-lua-resty-http = 0.2.0",
+ "lua-resty-balancer = 0.04",
+ "lua-resty-ngxvar = 0.5.2",
+ "lua-resty-jit-uuid = 0.0.7",
+ "lua-resty-healthcheck-api7 = 2.2.0",
+ "api7-lua-resty-jwt = 0.2.4",
+ "lua-resty-hmac-ffi = 0.05",
+ "lua-resty-cookie = 0.1.0",
+ "lua-resty-session = 3.10",
+ "opentracing-openresty = 0.1",
+ "lua-resty-radixtree = 2.8.2",
+ "lua-protobuf = 0.3.4",
+ "lua-resty-openidc = 1.7.2-1",
+ "luafilesystem = 1.7.0-2",
+ "api7-lua-tinyyaml = 0.4.2",
+ "nginx-lua-prometheus = 0.20220127",
+ "jsonschema = 0.9.8",
+ "lua-resty-ipmatcher = 0.6.1",
+ "lua-resty-kafka = 0.20-0",
+ "lua-resty-logger-socket = 2.0.1-0",
+ "skywalking-nginx-lua = 0.6.0",
+ "base64 = 1.5-2",
+ "binaryheap = 0.4",
+ "api7-dkjson = 0.1.1",
+ "resty-redis-cluster = 1.02-4",
+ "lua-resty-expr = 1.3.1",
+ "graphql = 0.0.2",
+ "argparse = 0.7.1-1",
+ "luasocket = 3.0rc1-2",
+ "luasec = 0.9-1",
+ "lua-resty-consul = 0.3-2",
+ "penlight = 1.9.2-1",
+ "ext-plugin-proto = 0.5.0",
+ "casbin = 1.26.0",
+ "api7-snowflake = 2.0-1",
+ "inspect == 3.1.1",
+ "lualdap = 1.2.6-1",
+ "lua-resty-rocketmq = 0.3.0-0",
+ "opentelemetry-lua = 0.1-3",
+ "net-url = 0.9-1",
+ "xml2lua = 1.5-2",
+ "nanoid = 0.1-1",
+ "lua-resty-mediador = 0.1.2-1"
+}
+
+build = {
+ type = "make",
+ build_variables = {
+ CFLAGS="$(CFLAGS)",
+ LIBFLAG="$(LIBFLAG)",
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUA_BINDIR="$(LUA_BINDIR)",
+ LUA_INCDIR="$(LUA_INCDIR)",
+ LUA="$(LUA)",
+ OPENSSL_INCDIR="$(OPENSSL_INCDIR)",
+ OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)",
+ },
+ install_variables = {
+ ENV_INST_PREFIX="$(PREFIX)",
+ ENV_INST_BINDIR="$(BINDIR)",
+ ENV_INST_LIBDIR="$(LIBDIR)",
+ ENV_INST_LUADIR="$(LUADIR)",
+ ENV_INST_CONFDIR="$(CONFDIR)",
+ },
+}
diff --git a/t/cli/test_validate_config.sh b/t/cli/test_validate_config.sh
index 43bfd5293..2d7ba1555 100755
--- a/t/cli/test_validate_config.sh
+++ b/t/cli/test_validate_config.sh
@@ -192,6 +192,7 @@ nginx_config:
- "0.0.0.0/0"
- "::"
- "::/0"
+ - "unix:"
' > conf/config.yaml
out=$(make init 2>&1 || true)