[GitHub] [apisix] libeio edited a comment on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio edited a comment on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790407892 > > > The error message shows that it failed to mmap enough space for jit stack. > > Does it happen each time? Does it happen in other machines? I try same way in ubuntu 16.04 macheine, report the same error in the CentOS 8.1 I tested. ```sh /usr/local/openresty/luajit/bin/luajit ./apisix/cli/apisix.lua start nginx: [error] init_by_lua error: /home/dev/apisix-2.3/apisix/init.lua:68: pcre jit stack allocation failed stack traceback: [C]: in function 'error' /usr/local/openresty/lualib/ngx/re.lua:311: in function 'opt' /home/dev/apisix-2.3/apisix/init.lua:68: in function 'http_init' init_by_lua:9: in main chunk ``` `pcre jit stack allocation failed`, is this error related with pcre? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander opened a new pull request #3755: feat: let balancer support priority
spacewander opened a new pull request #3755: URL: https://github.com/apache/apisix/pull/3755 Fix #1809 Signed-off-by: spacewander ### What this PR does / why we need it: ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [x] Have you added corresponding test cases? * [x] Have you modified the corresponding document? * [x] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] libeio commented on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio commented on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790407892 > > > The error message shows that it failed to mmap enough space for jit stack. > > Does it happen each time? Does it happen in other machines? I try same way in ubuntu 16.04 macheine, report the same error in the CentOS 8.1 I tested. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
spacewander commented on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790405340 I just try it in the CentOS 8, with the official OpenResty rpm and https://github.com/apache/apisix/releases/download/2.3/apisix-2.3-0.x86_64.rpm, everything works as expected. Maybe you can use gdb to set up a breakpoint at pcre_jit_stack_alloc to see what happened. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] dhawal-kamdar commented on a change in pull request #3754: fix: Missing plugins doc of apisix shown in website (#236)
dhawal-kamdar commented on a change in pull request #3754:
URL: https://github.com/apache/apisix/pull/3754#discussion_r587225859
##
File path: docs/zh/latest/config.json
##
@@ -86,7 +92,17 @@
"plugins/kafka-logger",
"plugins/udp-logger",
"plugins/syslog",
-"plugins/log-rotate"
+"plugins/log-rotate",
+"plugins/error-log-logger",
+"plugins/sls-logger"
+ ]
+},
+{
+ "type": "category",
+ "label": "Other Protocols",
Review comment:
@juzhiyuan should I commit these changes?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-ingress-controller] soulsoul opened a new issue #278: docs: add chinese version of ducument
soulsoul opened a new issue #278: URL: https://github.com/apache/apisix-ingress-controller/issues/278 add chinese version of ducument This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] moonming merged pull request #3747: ci: ensure the fuzzing work under Python3
moonming merged pull request #3747: URL: https://github.com/apache/apisix/pull/3747 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated (8e3fd22 -> 4820ad9)
This is an automated email from the ASF dual-hosted git repository. wenming pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git. from 8e3fd22 docs: fix wrong dir when install from source code. (#3748) add 4820ad9 ci: ensure the fuzzing work under Python3 (#3747) No new revisions were added by this update. Summary of changes: t/fuzzing/public.py | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[GitHub] [apisix] juzhiyuan commented on a change in pull request #3754: fix: Missing plugins doc of apisix shown in website (#236)
juzhiyuan commented on a change in pull request #3754:
URL: https://github.com/apache/apisix/pull/3754#discussion_r587216997
##
File path: docs/zh/latest/config.json
##
@@ -86,7 +92,17 @@
"plugins/kafka-logger",
"plugins/udp-logger",
"plugins/syslog",
-"plugins/log-rotate"
+"plugins/log-rotate",
+"plugins/error-log-logger",
+"plugins/sls-logger"
+ ]
+},
+{
+ "type": "category",
+ "label": "Other Protocols",
Review comment:
```suggestion
"label": "其它",
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on pull request #1538: fix Incomplete i18n coverage
juzhiyuan commented on pull request #1538: URL: https://github.com/apache/apisix-dashboard/pull/1538#issuecomment-790389616 CI failed This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan commented on issue #229: improve the description for users to join Slack
juzhiyuan commented on issue #229: URL: https://github.com/apache/apisix-website/issues/229#issuecomment-790387148 good for me1 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan edited a comment on issue #229: improve the description for users to join Slack
juzhiyuan edited a comment on issue #229: URL: https://github.com/apache/apisix-website/issues/229#issuecomment-790387148 good for me! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on pull request #3742: feat: add control api for discovery module
spacewander commented on pull request #3742: URL: https://github.com/apache/apisix/pull/3742#issuecomment-790386876 The CI fails because of https://github.com/apache/apisix/pull/3747 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #3742: feat: add control api for discovery module
spacewander commented on a change in pull request #3742:
URL: https://github.com/apache/apisix/pull/3742#discussion_r587213009
##
File path: apisix/control/router.lua
##
@@ -66,6 +68,38 @@ function fetch_control_api_router()
end
end
+local discovery_type =
require("apisix.core.config_local").local_conf().discovery
+if discovery_type then
+local discovery = require("apisix.discovery.init").discovery
+local dump_apis = {}
+for key, _ in pairs(discovery_type) do
Review comment:
It seems we can use `for key, dis_mod in pairs(discovery) do` directly?
##
File path: docs/en/latest/discovery.md
##
@@ -66,7 +67,9 @@ It is very easy for APISIX to extend the discovery client,
the basic steps are a
2. Implement the `_M. init_worker()` function for initialization and the `_M.
nodes(service_name)` function for obtaining the list of service instance nodes;
-3. Convert the registry data into data in APISIX;
+3. If you need the discovery module to export the debugging information
online, implement the `_M. dump_data()` function;
Review comment:
Style: extra space before `dump_data`.
##
File path: t/control/discovery.t
##
@@ -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.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+no_shuffle();
+log_level("info");
+
+
+our $yaml_config = <<_EOC_;
+apisix:
+ enable_control: true
+ node_listen: 1984
+ config_center: yaml
+ enable_admin: false
+
+discovery:
+ eureka:
+host:
+ - "http://127.0.0.1:8761";
+prefix: "/eureka/"
+fetch_interval: 10
+weight: 80
+timeout:
+ connect: 1500
+ send: 1500
+ read: 1500
+ consul_kv:
+servers:
+ - "http://127.0.0.1:8500";
+ - "http://127.0.0.1:8600";
+ dns:
+servers:
+ - "127.0.0.1:1053"
+_EOC_
+
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: test consul_kv dump_data api
+--- yaml_config eval: $::yaml_config
+--- request
+GET /v1/discovery/consul_kv/dump
+--- error_code: 200
+--- response_body_unlike
+^{}$
Review comment:
Can we check part of the content in this way:
https://github.com/apache/apisix/blob/8e3fd226714d0a733b87aac33f64fe97e77d3785/t/control/schema.t#L45
##
File path: t/control/discovery.t
##
@@ -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.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+no_shuffle();
+log_level("info");
+
+
+our $yaml_config = <<_EOC_;
+apisix:
+ enable_control: true
+ node_listen: 1984
+ config_center: yaml
+ enable_admin: false
+
+discovery:
+ eureka:
+host:
+ - "http://127.0.0.1:8761";
+prefix: "/eureka/"
+fetch_interval: 10
+weight: 80
+timeout:
+ connect: 1500
+ send: 1500
+ read: 1500
+ consul_kv:
+servers:
+ - "http://127.0.0.1:8500";
+ - "http://127.0.0.1:8600";
+ dns:
+servers:
+ - "127.0.0.1:1053"
+_EOC_
+
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: test consul_kv dump_data api
+--- yaml_config eval: $::yaml_config
+--- request
+GET /v1/discovery/consul_kv/dump
+--- error_code: 200
+--- response_body_unlike
+^{}$
+
+
+
+=== TEST 2: test eureka dump_data api
+--- yaml_config eval: $::yaml_config
+--- request
+GET /v1/discovery/eureka/dump
+--- error_code: 200
+--- response_body_unlike
+^{}$
Review comment:
ditto
-
[GitHub] [apisix] libeio edited a comment on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio edited a comment on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790383194 ### Procdure > > > The error message shows that it failed to mmap enough space for jit stack. > > Does it happen each time? Does it happen in other machines? Apisix run in the machine CentOS 8.1 and this error occured every time。 I did not test this in other machine. I would try it if you need. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] libeio edited a comment on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio edited a comment on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790383194 ### Procdure > > > The error message shows that it failed to mmap enough space for jit stack. > > Does it happen each time? Does it happen in other machines? Apisix run in the machine CentOS 8.1 and this error occured every time。 I did not test this in other machine. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] libeio commented on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio commented on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790383194 ### Procdure > > > The error message shows that it failed to mmap enough space for jit stack. > > Does it happen each time? Does it happen in other machines? Apisix run in the machine CentOS 8.1 and this error occured every time。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790379838 merged, thanks a lot! @Jaycean This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-dashboard] branch master updated: feat: rewrite e2e test(server_info_test) with ginkgo (#1550)
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 1997ad7 feat: rewrite e2e test(server_info_test) with ginkgo (#1550)
1997ad7 is described below
commit 1997ad7851ee258b22a04ba6dd222391b49efaad
Author: JinChen <36916582+jayc...@users.noreply.github.com>
AuthorDate: Thu Mar 4 15:15:03 2021 +0800
feat: rewrite e2e test(server_info_test) with ginkgo (#1550)
---
.../e2enew/server_info/server_info_suite_test.go | 34 +
.../server_info}/server_info_test.go | 141 ++---
2 files changed, 98 insertions(+), 77 deletions(-)
diff --git a/api/test/e2enew/server_info/server_info_suite_test.go
b/api/test/e2enew/server_info/server_info_suite_test.go
new file mode 100644
index 000..b5c1771
--- /dev/null
+++ b/api/test/e2enew/server_info/server_info_suite_test.go
@@ -0,0 +1,34 @@
+/*
+ * 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 server_info
+
+import (
+ "testing"
+ "time"
+
+ "github.com/onsi/ginkgo"
+
+ "e2enew/base"
+)
+
+func TestRoute(t *testing.T) {
+ ginkgo.RunSpecs(t, "server info suite")
+}
+
+var _ = ginkgo.AfterSuite(func() {
+ time.Sleep(base.SleepTime)
+})
diff --git a/api/test/e2e/server_info_test.go
b/api/test/e2enew/server_info/server_info_test.go
similarity index 52%
rename from api/test/e2e/server_info_test.go
rename to api/test/e2enew/server_info/server_info_test.go
index 74693fc..3a0fe0d 100644
--- a/api/test/e2e/server_info_test.go
+++ b/api/test/e2enew/server_info/server_info_test.go
@@ -14,127 +14,114 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package server_info
import (
"net/http"
- "testing"
"time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestServerInfo_Get(t *testing.T) {
- // wait for apisix report
- time.Sleep(2 * time.Second)
- testCases := []HttpTestCase{
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("server info test", func() {
+ table.DescribeTable("get server info",
+ func(tc base.HttpTestCase) {
+ time.Sleep(2 * time.Second)
+ base.RunTestCase(tc)
+ },
+ table.Entry("get server info(apisix-server1)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server1",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server1\"",
- },
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+ }),
+ table.Entry("get server info(apisix-server2)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server2",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server2\"",
- },
- }
+ }),
+ )
- for _, tc := range testCases {
- testCaseCheck(tc, t)
- }
-}
-
-func TestServerInfo_List(t *testing.T) {
- testCases := []HttpTestCase{
- {
- Desc:
[GitHub] [apisix-dashboard] nic-chen merged pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen merged pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] dhawal-kamdar commented on pull request #3754: fix: Missing plugins doc of apisix shown in website (#236)
dhawal-kamdar commented on pull request #3754: URL: https://github.com/apache/apisix/pull/3754#issuecomment-790376190 > Should also update the docs/zh/latest/config.json Okay 👍🏻 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
spacewander commented on issue #3752: URL: https://github.com/apache/apisix/issues/3752#issuecomment-790373824 The error message shows that it failed to mmap enough space for jit stack. Does it happen each time? Does it happen in other machines? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] dhawal-kamdar opened a new pull request #3754: fix: Missing plugins doc of apisix shown in website (#236)
dhawal-kamdar opened a new pull request #3754: URL: https://github.com/apache/apisix/pull/3754 ### What this PR does / why we need it: There are some missing docs plugins of apisix on the website. We could find the missing plugins in the doc folder of the apisix repo, but they are not present on the website, because they are not added in the "config.json" file. So this PR fixes the above issue, as all the missing plugins are added in the "config.json" file. Fix: https://github.com/apache/apisix-website/issues/236 ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [x] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] dhawal-kamdar removed a comment on issue #236: Missing plugins doc of apisix shown in website
dhawal-kamdar removed a comment on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790368279 @juzhiyuan can you help me with this **Is this PR backward compatible?** If it is not backward compatible, please discuss on the mailing list first  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] dhawal-kamdar commented on issue #236: Missing plugins doc of apisix shown in website
dhawal-kamdar commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790368279 @juzhiyuan can you help me with this **Is this PR backward compatible?** If it is not backward compatible, please discuss on the mailing list first  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3751: bug: /usr/local/apisix/apisix/cli/apisix.lua:31: module 'apisix.cli.env' not found
spacewander commented on issue #3751: URL: https://github.com/apache/apisix/issues/3751#issuecomment-790367534 Please read the https://github.com/apache/apisix#configure-and-installation, "Source code compilation" This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander edited a comment on issue #3751: bug: /usr/local/apisix/apisix/cli/apisix.lua:31: module 'apisix.cli.env' not found
spacewander edited a comment on issue #3751: URL: https://github.com/apache/apisix/issues/3751#issuecomment-790361515 If you install APISIX from source, run `./bin/apisix start` instead. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander closed issue #3751: bug: /usr/local/apisix/apisix/cli/apisix.lua:31: module 'apisix.cli.env' not found
spacewander closed issue #3751: URL: https://github.com/apache/apisix/issues/3751 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3751: bug: /usr/local/apisix/apisix/cli/apisix.lua:31: module 'apisix.cli.env' not found
spacewander commented on issue #3751: URL: https://github.com/apache/apisix/issues/3751#issuecomment-790361515 If you install APISIX from source, run `./bin/apisix start` instead. All our docs mention that `./bin/apisix start` instead of `apisix start`. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] chenyuezhou opened a new issue #3753: request help: about proxy-mirror plugin
chenyuezhou opened a new issue #3753:
URL: https://github.com/apache/apisix/issues/3753
### Issue description
Dose proxy-mirror support set mirror rate?
### Environment
* apisix version: `2.3`
* OS: `5.4.80`
* OpenResty / Nginx version:
```
nginx version: openresty/1.19.3.1
built by gcc 8.3.1 20191121 (Red Hat 8.3.1-5) (GCC)
built with OpenSSL 1.1.1g FIPS 21 Apr 2020
TLS SNI support enabled
configure arguments:
--prefix=/home/zcy/openresty/openresty-1.19.3.1/nginx/nginx --with-cc-opt=-O2
--add-module=../ngx_devel_kit-0.3.1 --add-module=../echo-nginx-module-0.62
--add-module=../xss-nginx-module-0.06 --add-module=../ngx_coolkit-0.2
--add-module=../set-misc-nginx-module-0.32
--add-module=../form-input-nginx-module-0.12
--add-module=../encrypted-session-nginx-module-0.08
--add-module=../srcache-nginx-module-0.32 --add-module=../ngx_lua-0.10.19
--add-module=../ngx_lua_upstream-0.07
--add-module=../headers-more-nginx-module-0.33
--add-module=../array-var-nginx-module-0.05
--add-module=../memc-nginx-module-0.19 --add-module=../redis2-nginx-module-0.15
--add-module=../redis-nginx-module-0.3.7
--add-module=../rds-json-nginx-module-0.15
--add-module=../rds-csv-nginx-module-0.09 --add-module=../ngx_stream_lua-0.0.9
--with-ld-opt='-Wl,-rpath,/home/zcy/openresty/openresty-1.19.3.1/nginx/luajit/lib
-Wl,-rpath,/home/zcy/openresty/openresty-1.19.3.1/nginx/luajit/lib'
--with-pcre=/ho
me/zcy/openresty/openresty-1.19.3.1/bundle/pcre-8.40 --with-stream
--with-stream_ssl_module --with-stream_ssl_preread_module
--with-http_ssl_module --with-http_stub_status_module --with-http_realip_module
--with-http_v2_module --with-pcre-jit --with-pcre-opt=-g --with-stream
```
* etcd version:
```
{"hostname":"localhost.localdomain","version":"2.3","id":"8842cd73-9d27-4745-8005-20d8e4383c29","etcd_version":"3.5.0","up_time":7566,"last_report_time":1614841246,"boot_time":1614833686}
```
* apisix-dashboard: nope
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-website] ashwindevx commented on issue #229: improve the description for users to join Slack
ashwindevx commented on issue #229: URL: https://github.com/apache/apisix-website/issues/229#issuecomment-790325582 Kindly search the #apisix channel to get access to all the channels. How about this? You should tell the user what searching the #apisix channel will do. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] libeio closed issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio closed issue #3752: URL: https://github.com/apache/apisix/issues/3752 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] libeio opened a new issue #3752: request help: error occured at start-up time of apisix(installed mode: compiling)
libeio opened a new issue #3752: URL: https://github.com/apache/apisix/issues/3752 ### Issue description error occured at start-up time of apisix(the apisix and its dependency, like openresty, openssl, zlib, installed by compiling) ### Environment * apisix version (v2.3): * OS (kernel: 4.18.0-240.el8.x86_64 release: CentOS Linux release 8.3.2011): * OpenResty / Nginx version (v19.3.1): * etcd version, if have (etcd-v3.4.13-linux-amd64): * lua(5.1.5) * openssl(1.1.0l) * zlib(1.2.11) * pcre(8.44) * apisix-dashboard version, if have: ### Procdure This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] apchee commented on issue #3751: bug:
apchee commented on issue #3751: URL: https://github.com/apache/apisix/issues/3751#issuecomment-790323835 ``` package.path = "/usr/local/apisix/?.lua;" .. package.path ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] apchee opened a new issue #3751: bug:
apchee opened a new issue #3751: URL: https://github.com/apache/apisix/issues/3751 ### Issue description ``` $ apisix start /usr/local/openresty/luajit/bin/luajit /usr/local/apisix/apisix/cli/apisix.lua start /usr/local/openresty/luajit/bin/luajit: /usr/local/apisix/apisix/cli/apisix.lua:31: module 'apisix.cli.env' n no field package.preload['apisix.cli.env'] no file '/usr/local/apisix/deps/share/lua/5.1/apisix/cli/env.lua' no file './apisix/cli/env.lua' no file '/usr/local/openresty/luajit/share/luajit-2.1.0-beta3/apisix/cli/env.lua' no file '/usr/local/share/lua/5.1/apisix/cli/env.lua' no file '/usr/local/share/lua/5.1/apisix/cli/env/init.lua' no file '/usr/local/openresty/luajit/share/lua/5.1/apisix/cli/env.lua' no file '/usr/local/openresty/luajit/share/lua/5.1/apisix/cli/env/init.lua' no file '/usr/local/apisix/deps/lib64/lua/5.1/apisix/cli/env.so' no file '/usr/local/apisix/deps/lib/lua/5.1/apisix/cli/env.so' no file './apisix/cli/env.so' no file '/usr/local/lib/lua/5.1/apisix/cli/env.so' no file '/usr/local/openresty/luajit/lib/lua/5.1/apisix/cli/env.so' no file '/usr/local/lib/lua/5.1/loadall.so' no file '/usr/local/apisix/deps/lib64/lua/5.1/apisix.so' no file '/usr/local/apisix/deps/lib/lua/5.1/apisix.so' no file './apisix.so' no file '/usr/local/lib/lua/5.1/apisix.so' no file '/usr/local/openresty/luajit/lib/lua/5.1/apisix.so' no file '/usr/local/lib/lua/5.1/loadall.so' stack traceback: [C]: in function 'require' /usr/local/apisix/apisix/cli/apisix.lua:31: in main chunk [C]: at 0x00404d60 ``` ### Environment * apisix version (cmd: `apisix version`): * OS: CentOS 7, 3.10.0-1160.15.2.el7.x86_64 #1 SMP Wed Feb 3 15:06:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux * OpenResty / Nginx version: openresty/1.19.3.1 * etcd version: 3.4.13 * apisix-dashboard version, if have: ### Minimal test code / Steps to reproduce the issue 1. Install APISIX from source code 2. $ apisix start ### What's the actual result? (including assertion message & call stack if applicable) Just checked the source, the line below is missing in the file apisix/cli/apisix.lua: ```package.path = "/usr/local/apisix/?.lua;" .. package.path ``` ### What's the expected result? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
Jaycean commented on a change in pull request #1550:
URL: https://github.com/apache/apisix-dashboard/pull/1550#discussion_r587130506
##
File path: api/test/e2enew/server_info/server_info_test.go
##
@@ -14,127 +14,113 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package server_info
import (
"net/http"
- "testing"
- "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestServerInfo_Get(t *testing.T) {
- // wait for apisix report
- time.Sleep(2 * time.Second)
- testCases := []HttpTestCase{
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("server info test", func() {
+ table.DescribeTable("get server info",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("get server info(apisix-server1)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server1",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server1\"",
- },
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+ Sleep:base.SleepTime * 15,
Review comment:
done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[apisix] branch master updated: docs: fix wrong dir when install from source code. (#3748)
This is an automated email from the ASF dual-hosted git repository. spacewander pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git The following commit(s) were added to refs/heads/master by this push: new 8e3fd22 docs: fix wrong dir when install from source code. (#3748) 8e3fd22 is described below commit 8e3fd226714d0a733b87aac33f64fe97e77d3785 Author: Wen Ming AuthorDate: Thu Mar 4 13:09:40 2021 +0800 docs: fix wrong dir when install from source code. (#3748) --- docs/en/latest/how-to-build.md | 2 +- docs/zh/latest/how-to-build.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md index 4049347..4aec089 100644 --- a/docs/en/latest/how-to-build.md +++ b/docs/en/latest/how-to-build.md @@ -44,7 +44,7 @@ $ tar zxvf apache-apisix-2.3-src.tgz -C apisix-2.3 Install the Lua libraries that the runtime depends on: ```shell -cd apache-apisix-2.3 +cd apisix-2.3 make deps ``` diff --git a/docs/zh/latest/how-to-build.md b/docs/zh/latest/how-to-build.md index 550ccdc..5f7a8d4 100644 --- a/docs/zh/latest/how-to-build.md +++ b/docs/zh/latest/how-to-build.md @@ -44,7 +44,7 @@ $ tar zxvf apache-apisix-2.3-src.tgz -C apisix-2.3 安装运行时依赖的 Lua 库： ``` -cd apache-apisix-2.3 +cd apisix-2.3 make deps ```
[GitHub] [apisix] spacewander merged pull request #3748: docs: fix wrong dir when install from source code.
spacewander merged pull request #3748: URL: https://github.com/apache/apisix/pull/3748 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #3750: doc: add more detailed desc of `default_conn_delay`.
spacewander commented on a change in pull request #3750: URL: https://github.com/apache/apisix/pull/3750#discussion_r587122655 ## File path: docs/en/latest/plugins/limit-conn.md ## @@ -23,11 +23,12 @@ title: limit-conn ## Summary -- [**Name**](#name) -- [**Attributes**](#attributes) -- [**How To Enable**](#how-to-enable) -- [**Test Plugin**](#test-plugin) -- [**Disable Plugin**](#disable-plugin) +- [Summary](#summary) Review comment: The summary usually doesn't count itself. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
spacewander commented on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790294829 AFAIK, docker compose will inject those names into containers' /etc/hosts. And you can assign a static IP in docker compose. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] Firstsawyou commented on issue #3749: docs: update the limit-conn.md doc
Firstsawyou commented on issue #3749: URL: https://github.com/apache/apisix/issues/3749#issuecomment-790292027 There is already a `PR` in repair： https://github.com/apache/apisix/pull/3750 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] dhawal-kamdar commented on issue #236: Missing plugins doc of apisix shown in website
dhawal-kamdar commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790290509 Okay, I will fix this issue 👍🏻 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan commented on issue #236: Missing plugins doc of apisix shown in website
juzhiyuan commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790289177 Both are ok, only need to make sure they are under the correct category:) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan commented on issue #229: improve the description for users to join Slack
juzhiyuan commented on issue #229: URL: https://github.com/apache/apisix-website/issues/229#issuecomment-790288799 Kindly search #apisix after you are in. How about this one? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] dhawal-kamdar commented on issue #236: Missing plugins doc of apisix shown in website
dhawal-kamdar commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790288658 Hello, @juzhiyuan and @spacewander thanks for sorting the plugins. I just have one question should I add missing plugins in the starting or in the ending. for example, echo, server-info plugins comes under General. But should I add them before "plugins/batch-requests" or after plugins/redirect  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] ashwindevx commented on issue #229: improve the description for users to join Slack
ashwindevx commented on issue #229: URL: https://github.com/apache/apisix-website/issues/229#issuecomment-790288387 @juzhiyuan I think a mouseover tip/note will be fine. Just tell me the text you want to have there.  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] moonming opened a new pull request #3750: doc: add more detailed desc of `default_conn_delay`.
moonming opened a new pull request #3750: URL: https://github.com/apache/apisix/pull/3750 ### What this PR does / why we need it: ### Pre-submission checklist: * [ ] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-helm-chart] gxthrj merged pull request #36: fix: break change with affinity
gxthrj merged pull request #36: URL: https://github.com/apache/apisix-helm-chart/pull/36 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-helm-chart] gxthrj closed issue #28: break change with affinity?
gxthrj closed issue #28: URL: https://github.com/apache/apisix-helm-chart/issues/28 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-helm-chart] branch master updated: fix: break change with affinity (#36)
This is an automated email from the ASF dual-hosted git repository.
kvn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 8afbea1 fix: break change with affinity (#36)
8afbea1 is described below
commit 8afbea11b7246559bdfe02365e55ab95cd36eb4c
Author: Jun
AuthorDate: Thu Mar 4 12:37:08 2021 +0800
fix: break change with affinity (#36)
---
charts/apisix/templates/deployment.yaml | 7 +--
charts/apisix/values.yaml | 5 -
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/charts/apisix/templates/deployment.yaml
b/charts/apisix/templates/deployment.yaml
index aaba932..e8df5ca 100644
--- a/charts/apisix/templates/deployment.yaml
+++ b/charts/apisix/templates/deployment.yaml
@@ -97,8 +97,11 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- if .Values.affinity.enable }}
affinity:
+ {{- with .Values.affinity }}
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- if .Values.podAntiAffinity.enabled }}
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
@@ -109,7 +112,7 @@ spec:
values:
- {{ include "apisix.name" . }}
topologyKey: kubernetes.io/hostname
-weight: 100'
+weight: 100
{{- end }}
{{- with .Values.tolerations }}
tolerations:
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index e2b94b3..5cb53ed 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -190,5 +190,8 @@ nodeSelector: {}
tolerations: []
-affinity:
+affinity: {}
+
+# If true, it will sets the anti-affinity of the Pod.
+podAntiAffinity:
enabled: false
[GitHub] [apisix-ingress-controller] gxthrj commented on a change in pull request #275: updated technical architecture of apisix-ingress-controller
gxthrj commented on a change in pull request #275: URL: https://github.com/apache/apisix-ingress-controller/pull/275#discussion_r587094436 ## File path: docs/en/latest/deployments/ack.md ## @@ -38,6 +38,7 @@ This document explains how to install Ingress APISIX on [ali-cloud ACK](https:// ```shell cd /path/to/apisix-helm-chart helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add apisix https://charts.apiseven.com helm dependency update ./charts/apisix Review comment: Since we use helm repo, It is recommended to modify like this. ```suggestion helm search repo apisix helm repo update helm install apisix apisix/apisix \ --set ... ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1540: feat: add plugin template config feature
juzhiyuan commented on a change in pull request #1540:
URL: https://github.com/apache/apisix-dashboard/pull/1540#discussion_r587085798
##
File path: web/config/routes.ts
##
@@ -99,6 +99,18 @@ const routes = [
path: '/settings',
component: './Setting',
},
+ {
+path: '/pluginTemplate/list',
Review comment:
```suggestion
path: '/plugin-template/list',
```
##
File path:
web/cypress/integration/pluginTemplate/create-edit-delete-plugin-template.spec.js
##
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+/* eslint-disable no-undef */
+
+context('Create Edit and Delete PluginTemplate', () => {
+ const timeout = 5000;
+ beforeEach(() => {
+cy.login();
+
+cy.fixture('selector.json').as('domSelector');
+cy.fixture('data.json').as('data');
+ });
+
+ it('should create pluginTemplate', function () {
+cy.visit('/');
+cy.contains('Route').click();
+cy.contains('Plugin Template Config').click();
+cy.contains('Create').click();
+
+cy.get('#desc').type('test_plugin_template1');
+cy.contains('Next').click();
+cy.contains('Enable').click({
+ force: true
+});
+cy.focused(this.domSelector.drawer).should('exist');
+cy.get(this.domSelector.drawer, {
+ timeout
+}).within(() => {
+ cy.get("#disable").click({
+force: true,
+ });
+});
+cy.contains('Submit').click();
+cy.contains('Next').click();
+cy.contains('Submit').click();
+cy.get(this.domSelector.notification).should('contain', 'Create Plugin
Template Successfully');
+ });
+
+ it('should edit the pluginTemplate', function () {
+cy.visit('pluginTemplate/list');
+
+cy.get(this.domSelector.refresh).click();
+cy.get('[title=Description]').type('test_plugin_template1');
+cy.contains('button', 'Search').click();
+cy.contains('test_plugin_template1').siblings().contains('Edit').click();
+
+cy.get('#desc').clear().type('test_plugin_template2');
+cy.contains('Next').click();
+cy.contains('Next').click();
+cy.contains('Submit').click();
+
+cy.get(this.domSelector.notification).should('contain', 'Edit Plugin
Template Successfully');
Review comment:
How to make sure data is updated successfully?
##
File path: web/src/components/Plugin/locales/en-US.ts
##
@@ -17,4 +17,8 @@
export default {
'component.plugin.tip1': 'NOTE: After customizing the plugin, you need to
update schema.json.',
'component.plugin.tip2': 'How to update?',
+ 'component.select.pluginTemplate': 'Select PluginTemplate',
+ 'component.step.select.pluginTemplate.select.option': 'Custom',
+ 'component.plugin.pluginTemplate.tips1': '1.When a route already have
plugins field configured, the plugins in the plugin template will be merged
into it.',
Review comment:
```suggestion
'component.plugin.pluginTemplate.tip1': '1. When a route already have
plugins field configured, the plugins in the plugin template will be merged
into it.',
```
##
File path: web/src/components/Plugin/locales/zh-CN.ts
##
@@ -17,4 +17,8 @@
export default {
'component.plugin.tip1': '注意：自定义插件后（修改、新增、删除等），需更新 schema.json。',
'component.plugin.tip2': '如何更新？',
+ "component.select.pluginTemplate": '选择插件模板',
+ 'component.step.select.pluginTemplate.select.option': '手动配置',
+ 'component.plugin.pluginTemplate.tips1':
'1.如果这个路由已经配置了插件，那么插件模板里面的插件配置会合并进去。',
+ 'component.plugin.pluginTemplate.tips2': '2.插件模板相同的插件会覆盖掉原有的插件。'
Review comment:
ditto
##
File path: web/src/components/LabelsfDrawer/LabelsDrawer.tsx
##
@@ -19,22 +19,23 @@ import { AutoComplete, Button, Col, Drawer, Form,
notification, Row } from 'antd
import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
import { useIntl } from 'umi';
-import { transformLableValueToKeyValue } from '../../transform';
-import { fetchLabelList } from '../../service';
+import { transformLableValueToKeyValue } from '../../helpers';
type Props = {
title?: string;
actionName: string;
dataSource: string[];
+ filterList?: string[],
+ fetchLabelList: any,
disabled: boolean;
onClose: () => void;
} &
[GitHub] [apisix] Firstsawyou opened a new issue #3749: docs: update the limit-conn.md doc
Firstsawyou opened a new issue #3749: URL: https://github.com/apache/apisix/issues/3749 # Improve Docs ## Please describe which part of docs should be improved or typo fixed The description of the default_conn_delay field of the limit-conn plugin ["the default processing latency of a typical connection (or request)."] is ambiguous, and we need a clearer explanation. ## Describe the solution you'd like The description of default_conn_delay is changed to the following to make it clearer: The processing of the request is delayed. (Requests that are greater than the set number of `conn`, but less than or equal to the number of `conn + burst`) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] moonming opened a new pull request #3748: doc: fix wrong dir when install from source code.
moonming opened a new pull request #3748: URL: https://github.com/apache/apisix/pull/3748 ### What this PR does / why we need it: ### Pre-submission checklist: * [ ] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander edited a comment on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
spacewander edited a comment on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790276615 So where you put the `etcd-node2`? It is not a domain name. And I can't even understand which host is not found. Sometimes you say it is `etcd-node2` but sometimes you say it is `etcd`. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] iamayushdas commented on a change in pull request #275: updated technical architecture of apisix-ingress-controller
iamayushdas commented on a change in pull request #275: URL: https://github.com/apache/apisix-ingress-controller/pull/275#discussion_r587080932 ## File path: docs/en/latest/deployments/ack.md ## @@ -38,6 +38,7 @@ This document explains how to install Ingress APISIX on [ali-cloud ACK](https:// ```shell cd /path/to/apisix-helm-chart helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add apisix https://charts.apiseven.com helm dependency update ./charts/apisix helm install apisix ./charts/apisix \ Review comment: > should not still use the local apisix, instead, use the online repo. I have done the same as you said, isn't so? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
spacewander commented on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790276615 So where you put the `etcd-node2`? It is not a domain name. And I can even understand which host is not found. Sometimes you say it is `etcd-node2` but sometimes you say it is `etcd`. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] starsz commented on issue #3740: bug: the traffic-split plugin is invalid to bind upstream via upstream_id
starsz commented on issue #3740: URL: https://github.com/apache/apisix/issues/3740#issuecomment-790274664 > > @tzssangglass Would you like to submit a PR to solve this issue? Thanks! > > assigned to me Thank you very much. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan commented on issue #240: Add `` to the blog markdown files
juzhiyuan commented on issue #240: URL: https://github.com/apache/apisix-website/issues/240#issuecomment-790272597 visit here[1] for more infomation. [1] https://v2.docusaurus.io/docs/blog This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander opened a new pull request #3747: ci: ensure the fuzzing work under Python3
spacewander opened a new pull request #3747: URL: https://github.com/apache/apisix/pull/3747 Signed-off-by: spacewander ### What this PR does / why we need it: ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #3741: docs: updated screenshots from v2.x dashboard
spacewander merged pull request #3741: URL: https://github.com/apache/apisix/pull/3741 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: docs: updated screenshots from v2.x dashboard (#3741)
This is an automated email from the ASF dual-hosted git repository. spacewander pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git The following commit(s) were added to refs/heads/master by this push: new a40a4d6 docs: updated screenshots from v2.x dashboard (#3741) a40a4d6 is described below commit a40a4d695ace0287fbb6c93e663a4e8e3dcd6a16 Author: Ayush das AuthorDate: Thu Mar 4 09:30:05 2021 +0530 docs: updated screenshots from v2.x dashboard (#3741) Co-authored-by: 琚致远 --- docs/assets/images/plugin/jwt-auth-1.png | Bin 38204 -> 65449 bytes docs/assets/images/plugin/jwt-auth-2.png | Bin 227769 -> 82630 bytes docs/assets/images/plugin/key-auth-1.png | Bin 37526 -> 65554 bytes docs/assets/images/plugin/key-auth-2.png | Bin 182157 -> 81728 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/assets/images/plugin/jwt-auth-1.png b/docs/assets/images/plugin/jwt-auth-1.png index 608dbd9..16c0c6e 100644 Binary files a/docs/assets/images/plugin/jwt-auth-1.png and b/docs/assets/images/plugin/jwt-auth-1.png differ diff --git a/docs/assets/images/plugin/jwt-auth-2.png b/docs/assets/images/plugin/jwt-auth-2.png index f599191..d44d450 100644 Binary files a/docs/assets/images/plugin/jwt-auth-2.png and b/docs/assets/images/plugin/jwt-auth-2.png differ diff --git a/docs/assets/images/plugin/key-auth-1.png b/docs/assets/images/plugin/key-auth-1.png index f6a9447..2913bff 100644 Binary files a/docs/assets/images/plugin/key-auth-1.png and b/docs/assets/images/plugin/key-auth-1.png differ diff --git a/docs/assets/images/plugin/key-auth-2.png b/docs/assets/images/plugin/key-auth-2.png index 38fa310..f87d205 100644 Binary files a/docs/assets/images/plugin/key-auth-2.png and b/docs/assets/images/plugin/key-auth-2.png differ
[GitHub] [apisix-dashboard] LiteSun commented on pull request #1490: feat: support yaml to config plugin in plugin config page
LiteSun commented on pull request #1490: URL: https://github.com/apache/apisix-dashboard/pull/1490#issuecomment-790270950 Front-end e2e test required. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #3745: docs: fix openid-connect's subtitles
spacewander merged pull request #3745: URL: https://github.com/apache/apisix/pull/3745 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated (66539b3 -> 7a5b35d)
This is an automated email from the ASF dual-hosted git repository. spacewander pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git. from 66539b3 feat: support conditional response rewrite (#3577) add 7a5b35d docs: fix openid-connect's subtitles (#3745) No new revisions were added by this update. Summary of changes: docs/en/latest/plugins/openid-connect.md | 9 ++--- docs/zh/latest/plugins/openid-connect.md | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-)
[GitHub] [apisix] spacewander closed pull request #3746: ci: ensure the fuzzing is run under Python2
spacewander closed pull request #3746: URL: https://github.com/apache/apisix/pull/3746 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] qier222 commented on a change in pull request #239: feat: fixes #220
qier222 commented on a change in pull request #239:
URL: https://github.com/apache/apisix-website/pull/239#discussion_r587062405
##
File path: website/src/css/customTheme.css
##
@@ -87,7 +87,7 @@ header h2 {
}
@media only screen and (min-device-width: 375px) and (max-device-width: 736px)
{
.home-splash .title {
-font-size: 3.52rem;
+font-size: 3.23rem;
Review comment:
Why change this?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on pull request #3741: docs: updated screenshots from v2.x dashboard
iamayushdas commented on pull request #3741: URL: https://github.com/apache/apisix/pull/3741#issuecomment-790268607 > > Hi, could you please refresh the page? for the server is in China > > i have refreshed it many times now it worked via vpn This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on issue #1547: show the running step detail info about this API
nic-chen commented on issue #1547: URL: https://github.com/apache/apisix-dashboard/issues/1547#issuecomment-790267944 > `Online debug` does not support `show the running step detail info about this API` currently @juzhiyuan > > And if we want to support this feature, the display in FE is not very difficult, we need apis to get all the running steps and the current running step of the request which reaches APISIX, the possibility of the apis may need @nic-chen @spacewander @membphis confirm, thanks so we need to expose debug info in APISIX for these detail info This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas edited a comment on pull request #3741: docs: updated screenshots from v2.x dashboard
iamayushdas edited a comment on pull request #3741: URL: https://github.com/apache/apisix/pull/3741#issuecomment-790266785 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] qier222 opened a new issue #240: Add `` to the blog markdown files
qier222 opened a new issue #240: URL: https://github.com/apache/apisix-website/issues/240 The post in the blog does not have `` inside their markdown file. The blog list(https://apisix.apache.org/blog) will show the entire post, not the summary. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on pull request #3741: docs: updated screenshots from v2.x dashboard
iamayushdas commented on pull request #3741: URL: https://github.com/apache/apisix/pull/3741#issuecomment-790267566 >  > > Hi, could you please refresh the page? for the server is in China i have refreshed it many times This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #3741: docs: updated screenshots from v2.x dashboard
juzhiyuan commented on pull request #3741: URL: https://github.com/apache/apisix/pull/3741#issuecomment-790267205  Hi, could you please refresh the page? for the server is in China 🤔 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on pull request #3741: docs: updated screenshots from v2.x dashboard
iamayushdas commented on pull request #3741: URL: https://github.com/apache/apisix/pull/3741#issuecomment-790266785 @juzhiyuan i am not able to take other screenshots because some of the components are not loading at all. link i am using is : http://139.217.190.60/ * [ ] jwt-auth.md * [ ] key-auth.md other plugin screenshots are not uploaded due to this error  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander opened a new pull request #3746: ci: ensure the fuzzing is run under Python2
spacewander opened a new pull request #3746: URL: https://github.com/apache/apisix/pull/3746 Signed-off-by: spacewander ### What this PR does / why we need it: ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen commented on a change in pull request #1550:
URL: https://github.com/apache/apisix-dashboard/pull/1550#discussion_r587047356
##
File path: api/test/e2enew/server_info/server_info_test.go
##
@@ -14,127 +14,113 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package server_info
import (
"net/http"
- "testing"
- "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestServerInfo_Get(t *testing.T) {
- // wait for apisix report
- time.Sleep(2 * time.Second)
- testCases := []HttpTestCase{
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("server info test", func() {
+ table.DescribeTable("get server info",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("get server info(apisix-server1)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server1",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server1\"",
- },
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+ Sleep:base.SleepTime * 15,
Review comment:
@Jaycean
It is recommended to directly use the original time - 2 seconds.
Some places may rely on services that are delayed. For example, here is the
reporting interval of the plugin `server-info`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix] simeon49 commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
simeon49 commented on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790260314 > Got it. APISIX doesn't support resolving etcd's domain from /etc/hosts yet. > Maybe you can use `docker network` and configure an IP for the etcd? "etcd" not in /etc/hosts, I use docker network with name "dev-network" This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1540: wip: Plugn template config
codecov-io edited a comment on pull request #1540: URL: https://github.com/apache/apisix-dashboard/pull/1540#issuecomment-788786709 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=h1) Report > Merging [#1540](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=desc) (131e7c7) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/2de2c72cfa8899e98045c3059d281b90cf544404?el=desc) (2de2c72) will **decrease** coverage by `1.05%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master#1540 +/- ## == - Coverage 70.11% 69.05% -1.06% == Files 130 49 -81 Lines5340 3164-2176 Branches 5490 -549 == - Hits 3744 2185-1559 + Misses 1348 731 -617 Partials 248 248 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `55.62% <ø> (+0.06%)` | :arrow_up: | | backend-e2e-test-ginkgo | `39.66% <ø> (+0.18%)` | :arrow_up: | | backend-unit-test | `51.68% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=) | `86.74% <0.00%> (-1.21%)` | :arrow_down: | | [web/src/components/IconFont/IconFont.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL0ljb25Gb250L0ljb25Gb250LnRzeA==) | | | | [...ages/Route/components/DebugViews/DebugDrawView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL0RlYnVnVmlld3MvRGVidWdEcmF3Vmlldy50c3g=) | | | | [web/src/global.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9nbG9iYWwudHN4) | | | | [web/src/pages/Consumer/components/Step1.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Db25zdW1lci9jb21wb25lbnRzL1N0ZXAxLnRzeA==) | | | | [web/src/pages/Service/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0xpc3QudHN4) | | | | [web/src/components/PluginOrchestration/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbk9yY2hlc3RyYXRpb24vaW5kZXgudHN4) | | | | [web/src/components/ActionBar/ActionBar.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL0FjdGlvbkJhci9BY3Rpb25CYXIudHN4) | | | | [web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4) | | | | [...eb/src/components/PluginOrchestration/transform.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbk9yY2hlc3RyYXRpb24vdHJhbnNmb3JtLnRz) | | | | ... and [62 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=footer). Last update [2de2c72...131e7c7](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1540: wip: Plugn template config
codecov-io edited a comment on pull request #1540: URL: https://github.com/apache/apisix-dashboard/pull/1540#issuecomment-788786709 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=h1) Report > Merging [#1540](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=desc) (131e7c7) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/2de2c72cfa8899e98045c3059d281b90cf544404?el=desc) (2de2c72) will **decrease** coverage by `5.41%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master#1540 +/- ## == - Coverage 70.11% 64.69% -5.42% == Files 130 49 -81 Lines5340 3164-2176 Branches 5490 -549 == - Hits 3744 2047-1697 + Misses 1348 861 -487 - Partials 248 256 +8 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `39.66% <ø> (+0.18%)` | :arrow_up: | | backend-unit-test | `51.68% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `35.08% <0.00%> (-29.84%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `75.00% <0.00%> (-25.00%)` | :arrow_down: | | [api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=) | `66.12% <0.00%> (-17.75%)` | :arrow_down: | | [api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv) | `54.11% <0.00%> (-11.77%)` | :arrow_down: | | [api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv) | `77.14% <0.00%> (-8.58%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `63.55% <0.00%> (-7.48%)` | :arrow_down: | | [api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=) | `71.96% <0.00%> (-6.28%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `49.57% <0.00%> (-5.89%)` | :arrow_down: | | [api/internal/core/store/validate.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGUuZ28=) | `67.03% <0.00%> (-2.24%)` | :arrow_down: | | [api/internal/handler/label/label.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvbGFiZWwvbGFiZWwuZ28=) | `80.18% <0.00%> (-1.89%)` | :arrow_down: | | ... and [72 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=footer). Last update [2de2c72...131e7c7](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL ab
[GitHub] [apisix] spacewander opened a new pull request #3745: docs: fix openid-connect's subtitles
spacewander opened a new pull request #3745: URL: https://github.com/apache/apisix/pull/3745 Signed-off-by: spacewander ### What this PR does / why we need it: ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [x] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1540: wip: Plugn template config
codecov-io edited a comment on pull request #1540: URL: https://github.com/apache/apisix-dashboard/pull/1540#issuecomment-788786709 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=h1) Report > Merging [#1540](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=desc) (131e7c7) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/2de2c72cfa8899e98045c3059d281b90cf544404?el=desc) (2de2c72) will **decrease** coverage by `18.43%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) ```diff @@ Coverage Diff @@ ## master#1540 +/- ## === - Coverage 70.11% 51.68% -18.44% === Files 130 40 -90 Lines5340 2707 -2633 Branches 5490 -549 === - Hits 3744 1399 -2345 + Misses 1348 1127 -221 + Partials 248 181 -67 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `51.68% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `0.00% <0.00%> (-71.03%)` | :arrow_down: | | [api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv) | `0.00% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `0.00% <0.00%> (-55.47%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `0.00% <0.00%> (-50.00%)` | :arrow_down: | | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `27.41% <0.00%> (-37.50%)` | :arrow_down: | | [api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=) | `57.14% <0.00%> (-33.34%)` | :arrow_down: | | [api/internal/utils/closer.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2Nsb3Nlci5nbw==) | `0.00% <0.00%> (-33.34%)` | :arrow_down: | | ... and [100 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=footer). Last update [2de2c72...131e7c7](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to
[GitHub] [apisix] spacewander commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
spacewander commented on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790251988 Got it. APISIX doesn't support resolving etcd's domain from /etc/hosts yet. Maybe you can use `docker network` and configure an IP for the etcd? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
Jaycean commented on a change in pull request #1550:
URL: https://github.com/apache/apisix-dashboard/pull/1550#discussion_r587022622
##
File path: api/test/e2enew/server_info/server_info_test.go
##
@@ -14,127 +14,113 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package server_info
import (
"net/http"
- "testing"
- "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestServerInfo_Get(t *testing.T) {
- // wait for apisix report
- time.Sleep(2 * time.Second)
- testCases := []HttpTestCase{
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("server info test", func() {
+ table.DescribeTable("get server info",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("get server info(apisix-server1)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server1",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server1\"",
- },
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+ Sleep:base.SleepTime * 15,
Review comment:
Old code wait for APISIX report, sleep 2 seconds... So I sleep a little
longer
```
// wait for apisix report
time.Sleep(2 * time.Second)
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan commented on issue #236: Missing plugins doc of apisix shown in website
juzhiyuan commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790250718 Thanks! **Other protocols:** - dubbo-proxy - mqtt-proxy **Security:** - consumer-restriction **General:** - echo - server-info **Loggers:** - error-log-logger - sls-logger **Authentication:** - hmac-auth **Monitoring:** - node-status **Traffic：** - request-id This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen commented on a change in pull request #1550:
URL: https://github.com/apache/apisix-dashboard/pull/1550#discussion_r587020806
##
File path: api/test/e2enew/server_info/server_info_test.go
##
@@ -14,127 +14,113 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package server_info
import (
"net/http"
- "testing"
- "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestServerInfo_Get(t *testing.T) {
- // wait for apisix report
- time.Sleep(2 * time.Second)
- testCases := []HttpTestCase{
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("server info test", func() {
+ table.DescribeTable("get server info",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("get server info(apisix-server1)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Path:
"/apisix/admin/server_info/apisix-server1",
Method: http.MethodGet,
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: "\"hostname\":\"apisix_server1\"",
- },
- {
- Desc: "get server info",
- Object: ManagerApiExpect(t),
+ Sleep:base.SleepTime * 15,
Review comment:
why sleep so long ..
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
Jaycean commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790250774 > > this ci failed, Test building web in multiple node version / build (14.x) (pull_request) > > ok, thanks. I saw in the morning that CI failed without any error message This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790249846 > this ci failed, Test building web in multiple node version / build (14.x) (pull_request) ok, thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
Jaycean commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790248919 > > a strange ci failed, just re-run to see the results > > hi, @liuxiran which ci failed ? I think we should fix it this ci failed, Test building web in multiple node version / build (14.x) (pull_request) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
nic-chen commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790248689 > a strange ci failed, just re-run to see the results hi, @liuxiran which ci failed ? I think we should fix it This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] simeon49 commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
simeon49 commented on issue #3744:
URL: https://github.com/apache/apisix/issues/3744#issuecomment-790246535
> There is not `http_status_code` in APISIX. Make sure the error message is
_really_ come from APISIX.
this error come from an other service witch use apisix, the response of
apisix is {'error_msg': 'etcd could not be resolved (3: Host not found)'} with
500 http error code
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] liuxiran commented on pull request #1550: feat: rewrite e2e test(server_info_test) with ginkgo
liuxiran commented on pull request #1550: URL: https://github.com/apache/apisix-dashboard/pull/1550#issuecomment-790241320 a strange ci failed, just re-run to see the results This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
spacewander commented on issue #3744: URL: https://github.com/apache/apisix/issues/3744#issuecomment-790240868 There is not `http_status_code` in APISIX. Make sure the error message is *really* come from APISIX. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] spacewander commented on issue #236: Missing plugins doc of apisix shown in website
spacewander commented on issue #236: URL: https://github.com/apache/apisix-website/issues/236#issuecomment-790239541 Done This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] starsz commented on issue #1549: feat: support `discovery_type` in Dashboard
starsz commented on issue #1549: URL: https://github.com/apache/apisix-dashboard/issues/1549#issuecomment-790233756 @caukie Good suggestion. Thank you very much. PRs are welcomed : ) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #3725: request help: about dubbo proxy
spacewander commented on issue #3725: URL: https://github.com/apache/apisix/issues/3725#issuecomment-790230985 I submitted a bug report to dubbo-go previously: https://github.com/apache/dubbo-go/issues/993 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] lilien1010 merged pull request #3577: feat: support conditional response rewrite
lilien1010 merged pull request #3577: URL: https://github.com/apache/apisix/pull/3577 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat: support conditional response rewrite (#3577)
This is an automated email from the ASF dual-hosted git repository.
liling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 66539b3 feat: support conditional response rewrite (#3577)
66539b3 is described below
commit 66539b36e7d04197c95dbb9ba894417e71beb720
Author: Lien Li
AuthorDate: Thu Mar 4 10:10:13 2021 +0800
feat: support conditional response rewrite (#3577)
* support conditinal response rewrite
* fix code style
* fix typo
* fix typo
* fix test case
* add test case and fix code style
* drop space
* add fail test cases
* enhance docs
---
apisix/plugins/response-rewrite.lua| 43 ++-
docs/en/latest/plugins/response-rewrite.md | 8 +-
docs/zh/latest/plugins/response-rewrite.md | 8 +-
t/plugin/response-rewrite.t| 120 +
4 files changed, 174 insertions(+), 5 deletions(-)
diff --git a/apisix/plugins/response-rewrite.lua
b/apisix/plugins/response-rewrite.lua
index a601f7a..2614fcb 100644
--- a/apisix/plugins/response-rewrite.lua
+++ b/apisix/plugins/response-rewrite.lua
@@ -15,6 +15,7 @@
-- limitations under the License.
--
local core= require("apisix.core")
+local expr= require("resty.expr.v1")
local plugin_name = "response-rewrite"
local ngx = ngx
local pairs = pairs
@@ -43,7 +44,16 @@ local schema = {
type = "integer",
minimum = 200,
maximum = 598,
-}
+},
+vars = {
+type = "array",
+items = {
+description = "Nginx builtin variable name and value",
+type = "array",
+maxItems = 4,
+minItems = 2,
+},
+},
},
minProperties = 1,
additionalProperties = false,
@@ -57,6 +67,21 @@ local _M = {
schema = schema,
}
+local function vars_matched(conf, ctx)
+if not conf.vars then
+return true
+end
+
+if not conf.response_expr then
+local response_expr, _ = expr.new(conf.vars)
+conf.response_expr = response_expr
+end
+
+local match_result = conf.response_expr:eval(ctx.var)
+
+return match_result
+end
+
function _M.check_schema(conf)
local ok, err = core.schema.check(schema, conf)
@@ -87,6 +112,13 @@ function _M.check_schema(conf)
end
end
+if conf.vars then
+local ok, err = expr.new(conf.vars)
+if not ok then
+return false, "failed to validate the 'vars' expression: " .. err
+end
+end
+
return true
end
@@ -94,6 +126,10 @@ end
do
function _M.body_filter(conf, ctx)
+if not ctx.reponse_rewrite_matched then
+return
+end
+
if conf.body then
if conf.body_base64 then
@@ -107,6 +143,11 @@ function _M.body_filter(conf, ctx)
end
function _M.header_filter(conf, ctx)
+ctx.reponse_rewrite_matched = vars_matched(conf, ctx)
+if not ctx.reponse_rewrite_matched then
+return
+end
+
if conf.status_code then
ngx.status = conf.status_code
end
diff --git a/docs/en/latest/plugins/response-rewrite.md
b/docs/en/latest/plugins/response-rewrite.md
index 95ef63e..f95d6a3 100644
--- a/docs/en/latest/plugins/response-rewrite.md
+++ b/docs/en/latest/plugins/response-rewrite.md
@@ -47,6 +47,7 @@ response rewrite plugin, rewrite the content returned by the
upstream as well as
| body| string | optional| || New `body` to
client, and the content-length will be reset too.
|
| body_base64 | boolean | optional| false || Identify if
`body` in configuration need base64 decoded before rewrite to client.
|
| headers | object | optional| || Set the new
`headers` for client, can set up multiple. If it exists already from upstream,
will rewrite the header, otherwise will add the header. You can set the
corresponding value to an empty string to remove a header. |
+| vars | array[] | optional| || A DSL to evaluate
with the given ngx.var. See `vars`
[lua-resty-expr](https://github.com/api7/lua-resty-expr#operator-list). if the
`vars` is empty, then all rewrite operations will be executed unconditionally |
## How To Enable
@@ -63,7 +64,10 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H
'X-API-KEY: edd1c9f034335f1
"headers": {
"X-Server-id": 3,
"X-Server-status": "on"
-}
+
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1540: wip: Plugn template config
codecov-io edited a comment on pull request #1540: URL: https://github.com/apache/apisix-dashboard/pull/1540#issuecomment-788786709 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=h1) Report > Merging [#1540](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=desc) (07000e2) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/2de2c72cfa8899e98045c3059d281b90cf544404?el=desc) (2de2c72) will **decrease** coverage by `1.11%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master#1540 +/- ## == - Coverage 70.11% 68.99% -1.12% == Files 130 49 -81 Lines5340 3164-2176 Branches 5490 -549 == - Hits 3744 2183-1561 + Misses 1348 733 -615 Partials 248 248 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `55.56% <ø> (ø)` | | | backend-e2e-test-ginkgo | `39.60% <ø> (+0.12%)` | :arrow_up: | | backend-unit-test | `51.68% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [web/src/services/user.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9zZXJ2aWNlcy91c2VyLnRz) | | | | [web/src/pages/Route/components/Step2/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1N0ZXAyL2luZGV4LnRzeA==) | | | | [web/src/services/tool.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9zZXJ2aWNlcy90b29sLnRz) | | | | [web/src/components/HeaderDropdown/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL0hlYWRlckRyb3Bkb3duL2luZGV4LnRzeA==) | | | | [...pages/Route/components/CreateStep4/CreateStep4.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL0NyZWF0ZVN0ZXA0L0NyZWF0ZVN0ZXA0LnRzeA==) | | | | [...ages/Route/components/Step2/RequestRewriteView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1N0ZXAyL1JlcXVlc3RSZXdyaXRlVmlldy50c3g=) | | | | [web/src/components/RawDataEditor/RawDataEditor.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1Jhd0RhdGFFZGl0b3IvUmF3RGF0YUVkaXRvci50c3g=) | | | | [web/src/components/Plugin/data.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9kYXRhLnRzeA==) | | | | [web/src/pages/Upstream/transform.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS90cmFuc2Zvcm0udHM=) | | | | [...Route/components/DebugViews/AuthenticationView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL0RlYnVnVmlld3MvQXV0aGVudGljYXRpb25WaWV3LnRzeA==) | | | | ... and [60 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=footer). Last update [2de2c72...07000e2](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] simeon49 opened a new issue #3744: bug: "could not be resolved (3: Host not found)" error in docker-compose env
simeon49 opened a new issue #3744:
URL: https://github.com/apache/apisix/issues/3744
### Issue description
最近在使用APISIX 的服务比较频繁的报 "{'http_status_code': 500, 'content': {'error_msg':
'etcd-node2 could not be resolved (3: Host not found)'}}" 错误,
我们的环境是通过docker-compose 启动, 注意: 这个在服务运行过程中不是一直包错, 而是比较频繁报这个错误
### Environment
* apisix version (cmd: `apisix version`): apisix 2.0 (docker image)
* OS (cmd: `uname -a`): Ubuntu 18.04
* OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`):
openresty/1.19.3.1
* etcd version, if have (cmd: run `curl
http://127.0.0.1:9090/v1/server_info` to get the info from server-info API):
etcd:3.4.9
* apisix-dashboard version, if have:
### docker-compose 配置:
```yaml
version: '3'
networks:
default:
external:
name: dev-network
services:
# --- API网关 ---
apisix:
container_name: apisix
image: apisix:2.0
restart: always
volumes:
-
./configs/apisix/config/config.yaml:/usr/local/apisix/conf/config.yaml:ro
- /data/apisix_log:/usr/local/apisix/logs
depends_on:
- etcd
ports:
- '8080:9080/tcp'
- '8443:9443/tcp'
# --- etcd ---
etcd:
container_name: etcd
image: bitnami/etcd:3.4.9
user: root
restart: always
volumes:
- /data/etcd_data:/etcd_data
environment:
ETCD_DATA_DIR: /etcd_data
ETCD_ENABLE_V2: "true"
ALLOW_NONE_AUTHENTICATION: "yes"
ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379";
ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379";
ports:
- '2379:2379/tcp'
networks:
default:
aliases:
- etcd
# ...other services
```
### config.yaml
```yaml
apisix:
node_listen: 9080 # APISIX listening port
enable_heartbeat: true
enable_admin: true
enable_admin_cors: true # Admin API support CORS response headers.
enable_debug: false
enable_dev_mode: false # Sets nginx worker_processes to 1 if set
to true
enable_reuseport: true # Enable nginx SO_REUSEPORT switch if set
to true.
enable_ipv6: true
config_center: etcd # etcd: use etcd to store the config value
# yaml: fetch the config value from local
yaml file `/your_path/conf/apisix.yaml`
#proxy_protocol: # Proxy Protocol configuration
# listen_http_port: 9181# The port with proxy protocol for http,
it differs from node_listen and port_admin.
# This port can only receive http request
with proxy protocol, but node_listen & port_admin
# can only receive http request. If you
enable proxy protocol, you must use this port to
# receive http request with proxy protocol
# listen_https_port: 9182 # The port with proxy protocol for https
# enable_tcp_pp: true # Enable the proxy protocol for tcp
proxy, it works for stream_proxy.tcp option
# enable_tcp_pp_to_upstream: true # Enables the proxy protocol to the
upstream server
proxy_cache: # Proxy Caching configuration
cache_ttl: 10s # The default caching time if the
upstream does not specify the cache time
zones: # The parameters of a cache
- name: disk_cache_one # The name of the cache, administrator
can be specify
# which cache to use by name in the admin
api
memory_size: 50m # The size of shared memory, it's used to
store the cache index
disk_size: 1G# The size of disk, it's used to store
the cache data
disk_path: "/tmp/disk_cache_one" # The path to store the cache data
cache_levels: "1:2" # The hierarchy levels of a cache
# - name: disk_cache_two
#memory_size: 50m
#disk_size: 1G
#disk_path: "/tmp/disk_cache_two"
#cache_levels: "1:2"
allow_admin: #
http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
- 127.0.0.0/12 # If we don't set any IP list, then any IP
access is allowed by default.
- 172.17.0.0/12
- 192.168.0.0/12
- 10.0.0.0/8
- "::/64"
# port_admin: 9180 # use a separate port
# Default token when use API to call for Admin API.
# *NOTE*: Highly recommended to modify this value to protect APISIX's
Admin API.
# Disabling this configuration item means that the Adm
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1540: wip: Plugn template config
codecov-io edited a comment on pull request #1540: URL: https://github.com/apache/apisix-dashboard/pull/1540#issuecomment-788786709 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=h1) Report > Merging [#1540](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=desc) (07000e2) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/2de2c72cfa8899e98045c3059d281b90cf544404?el=desc) (2de2c72) will **decrease** coverage by `5.47%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master#1540 +/- ## == - Coverage 70.11% 64.63% -5.48% == Files 130 49 -81 Lines5340 3164-2176 Branches 5490 -549 == - Hits 3744 2045-1699 + Misses 1348 863 -485 - Partials 248 256 +8 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `39.60% <ø> (+0.12%)` | :arrow_up: | | backend-unit-test | `51.68% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `35.08% <0.00%> (-29.84%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `75.00% <0.00%> (-25.00%)` | :arrow_down: | | [api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=) | `66.12% <0.00%> (-17.75%)` | :arrow_down: | | [api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv) | `54.11% <0.00%> (-11.77%)` | :arrow_down: | | [api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv) | `77.14% <0.00%> (-8.58%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `63.55% <0.00%> (-7.48%)` | :arrow_down: | | [api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=) | `71.96% <0.00%> (-6.28%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `49.57% <0.00%> (-5.89%)` | :arrow_down: | | [api/internal/core/store/validate.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGUuZ28=) | `67.03% <0.00%> (-2.24%)` | :arrow_down: | | [api/internal/handler/label/label.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvbGFiZWwvbGFiZWwuZ28=) | `80.18% <0.00%> (-1.89%)` | :arrow_down: | | ... and [70 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1540/diff?src=pr&el=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=footer). Last update [2de2c72...07000e2](https://codecov.io/gh/apache/apisix-dashboard/pull/1540?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL ab
