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/01/26 07:23:13 UTC
[apisix] branch release/2.10 updated: fix(batch-requests): should be disabled by default (#6204) (#6208)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/2.10
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/release/2.10 by this push:
new ea47eeb fix(batch-requests): should be disabled by default (#6204) (#6208)
ea47eeb is described below
commit ea47eeb0573a732e7cfcb5fb82588aaf02c7dd9f
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Wed Jan 26 15:20:25 2022 +0800
fix(batch-requests): should be disabled by default (#6204) (#6208)
Co-authored-by: Zeping Bai <bz...@apache.org>
---
.github/workflows/chaos.yml | 2 +-
conf/config-default.yaml | 2 +-
t/admin/plugins.t | 2 +-
t/debug/debug-mode.t | 1 -
t/toolkit | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
index 8a428dc..c837870 100644
--- a/.github/workflows/chaos.yml
+++ b/.github/workflows/chaos.yml
@@ -52,7 +52,7 @@ jobs:
run: |
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
helm repo add bitnami https://charts.bitnami.com/bitnami
- helm install etcd bitnami/etcd --set replicaCount=3 --set auth.rbac.enabled=false
+ helm install etcd bitnami/etcd --set replicaCount=3 --set auth.rbac.create=false
kubectl wait pods -l app.kubernetes.io/instance=etcd --for=condition=Ready --timeout=300s --all
diff --git a/conf/config-default.yaml b/conf/config-default.yaml
index bf20942..ed10137 100644
--- a/conf/config-default.yaml
+++ b/conf/config-default.yaml
@@ -303,7 +303,7 @@ plugins: # plugin list (sorted by priority)
- request-id # priority: 11010
- fault-injection # priority: 11000
- serverless-pre-function # priority: 10000
- - batch-requests # priority: 4010
+ #- batch-requests # priority: 4010
- cors # priority: 4000
- ip-restriction # priority: 3000
- ua-restriction # priority: 2999
diff --git a/t/admin/plugins.t b/t/admin/plugins.t
index 57a33bc..777fb6f 100644
--- a/t/admin/plugins.t
+++ b/t/admin/plugins.t
@@ -40,7 +40,7 @@ __DATA__
--- request
GET /apisix/admin/plugins/list
--- response_body_like eval
-qr/\["real-ip","client-control","ext-plugin-pre-req","zipkin","request-id","fault-injection","serverless-pre-function","batch-requests","cors","ip-restriction","ua-restriction","referer-restriction","uri-blocker","request-validation","openid-connect","authz-casbin","wolf-rbac","hmac-auth","basic-auth","jwt-auth","key-auth","consumer-restriction","authz-keycloak","proxy-mirror","proxy-cache","proxy-rewrite","api-breaker","limit-conn","limit-count","limit-req","gzip","server-info","traffic [...]
+qr/\["real-ip","client-control","ext-plugin-pre-req","zipkin","request-id","fault-injection","serverless-pre-function","cors","ip-restriction","ua-restriction","referer-restriction","uri-blocker","request-validation","openid-connect","authz-casbin","wolf-rbac","hmac-auth","basic-auth","jwt-auth","key-auth","consumer-restriction","authz-keycloak","proxy-mirror","proxy-cache","proxy-rewrite","api-breaker","limit-conn","limit-count","limit-req","gzip","server-info","traffic-split","redirect [...]
--- no_error_log
[error]
diff --git a/t/debug/debug-mode.t b/t/debug/debug-mode.t
index 2f38dcb..281e870 100644
--- a/t/debug/debug-mode.t
+++ b/t/debug/debug-mode.t
@@ -48,7 +48,6 @@ loaded plugin and sort by priority: 11011 name: zipkin
loaded plugin and sort by priority: 11010 name: request-id
loaded plugin and sort by priority: 11000 name: fault-injection
loaded plugin and sort by priority: 10000 name: serverless-pre-function
-loaded plugin and sort by priority: 4010 name: batch-requests
loaded plugin and sort by priority: 4000 name: cors
loaded plugin and sort by priority: 3000 name: ip-restriction
loaded plugin and sort by priority: 2990 name: referer-restriction
diff --git a/t/toolkit b/t/toolkit
index ab2471c..94f471d 160000
--- a/t/toolkit
+++ b/t/toolkit
@@ -1 +1 @@
-Subproject commit ab2471cc9cbeec6fe605120160eeb9dd17ddda2c
+Subproject commit 94f471d3a9045667bc1f1784a21f89315cd64f7e