[GitHub] [apisix] totemofwolf commented on issue #3690: Support for AzureAD/OIDC integration with APISIX

2021-04-02 Thread GitBox


totemofwolf commented on issue #3690:
URL: https://github.com/apache/apisix/issues/3690#issuecomment-812816931


   > Hello @spacewander,
   > 
   > There is no difference between AzureAD and OIDC, also azuread uses oidc 
authentication mechanism. Let me try the oidc provided by apisix. Thanks
   
   Is this compatible with OpenLDAP?
   


-- 
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] totemofwolf edited a comment on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf edited a comment on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812816389


   > I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it.
   > 
   > He will post more information later.
   
   @spacewander 
   for APISIX 1.* `nginx.conf` should be this (to transparent proxy requests, 
include ws , wss..) (it is from the `nginx ingress' default nginx.conf`)
   
   ```
   http {
   ...
   
   + # See https://www.nginx.com/blog/websocket-nginx
   + map $http_upgrade $connection_upgrade {
   + default  upgrade;
   
   + # See 
http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive
   + ''   '';
   + }
   
   ...
   }
   
   server {
   + # Allow websocket connections
   + proxy_set_header Upgrade   $http_upgrade;
   + proxy_set_header Connection$connection_upgrade;
   
   set $upstream_host   $host;
   + # set $upstream_upgrade'';
   + # set $upstream_connection '';
   set $upstream_uri'';
   
   # proxy_http_version 1.1;
   proxy_set_header   Host  $upstream_host;
   + # proxy_set_header   Upgrade   $upstream_upgrade;
   + # proxy_set_header   Connection$upstream_connection;
   }
   ```


-- 
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] totemofwolf edited a comment on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf edited a comment on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812816389


   > I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it.
   > 
   > He will post more information later.
   
   @spacewander 
   for APISIX 1.* nginx.conf should be this (to transparent proxy requests, 
include ws , wss..) (it is from the nginx ingress' default nginx.conf)
   
   ```
   http {
   ...
   
   + # See https://www.nginx.com/blog/websocket-nginx
   + map $http_upgrade $connection_upgrade {
   + default  upgrade;
   
   + # See 
http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive
   + ''   '';
   + }
   
   ...
   }
   
   server {
   + # Allow websocket connections
   + proxy_set_header Upgrade   $http_upgrade;
   + proxy_set_header Connection$connection_upgrade;
   
   set $upstream_host   $host;
   + # set $upstream_upgrade'';
   + # set $upstream_connection '';
   set $upstream_uri'';
   
   # proxy_http_version 1.1;
   proxy_set_header   Host  $upstream_host;
   + # proxy_set_header   Upgrade   $upstream_upgrade;
   + # proxy_set_header   Connection$upstream_connection;
   }
   ```


-- 
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] totemofwolf edited a comment on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf edited a comment on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812816389


   > I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it.
   > 
   > He will post more information later.
   
   @spacewander 
   for APISIX 1.* nginx.conf should be this (to transparent proxy requests, 
include ws , wss..) (it is from the ingress' default nginx.conf)
   
   ```
   http {
   ...
   
   + # See https://www.nginx.com/blog/websocket-nginx
   + map $http_upgrade $connection_upgrade {
   + default  upgrade;
   
   + # See 
http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive
   + ''   '';
   + }
   
   ...
   }
   
   server {
   + # Allow websocket connections
   + proxy_set_header Upgrade   $http_upgrade;
   + proxy_set_header Connection$connection_upgrade;
   
   set $upstream_host   $host;
   + # set $upstream_upgrade'';
   + # set $upstream_connection '';
   set $upstream_uri'';
   
   # proxy_http_version 1.1;
   proxy_set_header   Host  $upstream_host;
   + # proxy_set_header   Upgrade   $upstream_upgrade;
   + # proxy_set_header   Connection$upstream_connection;
   }
   ```


-- 
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] totemofwolf edited a comment on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf edited a comment on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812816389


   > I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it.
   > 
   > He will post more information later.
   
   @spacewander 
   for APISIX 1.* nginx.conf should be this (to transparent proxy requests, 
include ws , wss..) (it is the ingress' default nginx.conf)
   
   ```
   http {
   ...
   
   + # See https://www.nginx.com/blog/websocket-nginx
   + map $http_upgrade $connection_upgrade {
   + default  upgrade;
   
   + # See 
http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive
   + ''   '';
   + }
   
   ...
   }
   
   server {
   + # Allow websocket connections
   + proxy_set_header Upgrade   $http_upgrade;
   + proxy_set_header Connection$connection_upgrade;
   
   set $upstream_host   $host;
   + # set $upstream_upgrade'';
   + # set $upstream_connection '';
   set $upstream_uri'';
   
   # proxy_http_version 1.1;
   proxy_set_header   Host  $upstream_host;
   + # proxy_set_header   Upgrade   $upstream_upgrade;
   + # proxy_set_header   Connection$upstream_connection;
   }
   ```


-- 
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] totemofwolf commented on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf commented on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812816389


   > I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it.
   > 
   > He will post more information later.
   
   @spacewander 
   for APISIX 1.* nginx.conf should be this (to transparent proxy requests, 
include ws , wss..)
   
   ```
   http {
   ...
   
   + # See https://www.nginx.com/blog/websocket-nginx
   + map $http_upgrade $connection_upgrade {
   + default  upgrade;
   
   + # See 
http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive
   + ''   '';
   + }
   
   ...
   }
   
   server {
   + # Allow websocket connections
   + proxy_set_header Upgrade   $http_upgrade;
   + proxy_set_header Connection$connection_upgrade;
   
   set $upstream_host   $host;
   + # set $upstream_upgrade'';
   + # set $upstream_connection '';
   set $upstream_uri'';
   
   # proxy_http_version 1.1;
   proxy_set_header   Host  $upstream_host;
   + # proxy_set_header   Upgrade   $upstream_upgrade;
   + # proxy_set_header   Connection$upstream_connection;
   }
   ```


-- 
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] membphis commented on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


membphis commented on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812814850


   I just chatted with @totemofwolf through IM, we need to add some 
configuration items to `APISIX 1.* `to support it. 
   
   He will post more information later.


-- 
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 spelling error (#3981)

2021-04-02 Thread shuyangw
This is an automated email from the ASF dual-hosted git repository.

shuyangw 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 dda6991  docs: fix spelling error (#3981)
dda6991 is described below

commit dda6991acaac9e33f76ad1803cda8cba2bb04029
Author: XianLei Gao <279483...@qq.com>
AuthorDate: Sat Apr 3 12:35:05 2021 +0800

docs: fix spelling error (#3981)
---
 docs/zh/latest/install-dependencies.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/latest/install-dependencies.md 
b/docs/zh/latest/install-dependencies.md
index 48ccad1..0a2449b 100644
--- a/docs/zh/latest/install-dependencies.md
+++ b/docs/zh/latest/install-dependencies.md
@@ -30,7 +30,7 @@ title: 安装依赖
 
 ## 注意
 
-- Apache APISIX 从 v2.0 开始不再支持 `v2` 版本的 etcd,并且 etcd 最低支持版本为 v3.4.0,因此请使用 etcd 
3.4.0+。更重要的是,因为 etcd v3 使用 gPRC 作为消息传递协议,而 Apache APISIX 使用 HTTP(S) 与 etcd 
集群通信,因此请确保启用 [etcd gRPC 
gateway](https://etcd.io/docs/v3.4.0/dev-guide/api_grpc_gateway/) 功能。
+- Apache APISIX 从 v2.0 开始不再支持 `v2` 版本的 etcd,并且 etcd 最低支持版本为 v3.4.0,因此请使用 etcd 
3.4.0+。更重要的是,因为 etcd v3 使用 gRPC 作为消息传递协议,而 Apache APISIX 使用 HTTP(S) 与 etcd 
集群通信,因此请确保启用 [etcd gRPC 
gateway](https://etcd.io/docs/v3.4.0/dev-guide/api_grpc_gateway/) 功能。
 
 - 目前 Apache APISIX 默认使用 HTTP 协议与 etcd 集群通信,这并不安全,如果希望保障数据的安全性和完整性。 请为您的 etcd 
集群配置证书及对应私钥,并在您的 Apache APISIX etcd endpoints 配置列表中明确使用 `https` 协议前缀。请查阅 
`conf/config-default.yaml` 中 etcd 一节相关的配置来了解更多细节。
 


[GitHub] [apisix] Yiyiyimu merged pull request #3981: doc: fix spelling error

2021-04-02 Thread GitBox


Yiyiyimu merged pull request #3981:
URL: https://github.com/apache/apisix/pull/3981


   


-- 
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-docker] totemofwolf merged pull request #155: feat: timezone support via startup environment `TZ`

2021-04-02 Thread GitBox


totemofwolf merged pull request #155:
URL: https://github.com/apache/apisix-docker/pull/155


   


-- 
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-docker] branch master updated: feat: timezone support via startup environment, for instance: "TZ=Asia/Shanghai" (#155)

2021-04-02 Thread totemofwolf
This is an automated email from the ASF dual-hosted git repository.

totemofwolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
 new dedf472  feat: timezone support via startup environment, for instance: 
"TZ=Asia/Shanghai" (#155)
dedf472 is described below

commit dedf47292ce87bcad3e330223b2bb74407a918f9
Author: wonglend 
AuthorDate: Sat Apr 3 11:40:20 2021 +0800

feat: timezone support via startup environment, for instance: 
"TZ=Asia/Shanghai" (#155)
---
 alpine-dev/Dockerfile   | 2 +-
 alpine-local/Dockerfile | 2 +-
 alpine/Dockerfile   | 2 +-
 centos/Dockerfile   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index 1fadf7f..a2c29c3 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -26,7 +26,7 @@ ARG ENABLE_PROXY
 # add runtime for Apache APISIX
 RUN set -x \
 && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' 
/etc/apk/repositories) \
-&& apk add --no-cache bash libstdc++ curl
+&& apk add --no-cache bash libstdc++ curl tzdata
 
 WORKDIR /usr/local/apisix
 
diff --git a/alpine-local/Dockerfile b/alpine-local/Dockerfile
index 1ce5f9b..75a88fa 100644
--- a/alpine-local/Dockerfile
+++ b/alpine-local/Dockerfile
@@ -26,7 +26,7 @@ ARG ENABLE_PROXY
 # add runtime for Apache APISIX
 RUN set -x \
 && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' 
/etc/apk/repositories) \
-&& apk add --no-cache bash libstdc++ curl
+&& apk add --no-cache bash libstdc++ curl tzdata
 
 WORKDIR /usr/local/apisix
 
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 7e5496f..0a839ee 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -30,7 +30,7 @@ ARG ENABLE_PROXY
 # add runtime for Apache APISIX
 RUN set -x \
 && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' 
/etc/apk/repositories) \
-&& apk add --no-cache bash libstdc++ curl
+&& apk add --no-cache bash libstdc++ curl tzdata
 
 WORKDIR /usr/local/apisix
 
diff --git a/centos/Dockerfile b/centos/Dockerfile
index ddb06dd..4ca341a 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -5,7 +5,7 @@ LABEL apisix_version="${APISIX_VERSION}"
 
 RUN yum -y install yum-utils\
&& yum-config-manager --add-repo 
https://openresty.org/package/centos/openresty.repo \
-   && yum install -y openresty which \
+   && yum install -y openresty which tzdata \
&& yum install -y 
https://github.com/apache/apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.x86_64.rpm
 \
&& yum clean all \
&& sed -i 's/PASS_MAX_DAYS\t9/PASS_MAX_DAYS\t60/g' /etc/login.defs


[GitHub] [apisix] tokers commented on a change in pull request #3967: feat: release 2.5

2021-04-02 Thread GitBox


tokers commented on a change in pull request #3967:
URL: https://github.com/apache/apisix/pull/3967#discussion_r606608887



##
File path: docs/zh/latest/CHANGELOG.md
##
@@ -40,6 +41,36 @@ title: CHANGELOG
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 2.5.0
+
+### Change
+
+- 更改 zipkin 插件的 span 类型 [#3877](https://github.com/apache/apisix/pull/3877)
+
+### Core
+
+- :sunrise: 支持 etcd 客户端证书校验 [#3905](https://github.com/apache/apisix/pull/3905)
+- :sunrise: 支持表达式使用“或”和“非”的逻辑 
[#3809](https://github.com/apache/apisix/pull/3809)
+- :sunrise: 默认启动时会同步etcd配置 [#3799](https://github.com/apache/apisix/pull/3799)
+- :sunrise: 负载均衡支持节点优先级 [#3755](https://github.com/apache/apisix/pull/3755)
+- :sunrise: 服务发现提供了一系列 control API 
[#3742](https://github.com/apache/apisix/pull/3742)
+
+### Plugin
+
+- :sunrise: 允许热更新 skywalking 插件配置,并允许配置上报间隔 
[#3925](https://github.com/apache/apisix/pull/3925)
+- :sunrise: consumer-restriction 支持 HTTP method 级别的白名单配置 
[#3691](https://github.com/apache/apisix/pull/3691)
+- :sunrise: cors 插件支持通过正则表达式匹配 Origin 
[#3839](https://github.com/apache/apisix/pull/3839)
+- :sunrise: response-rewrite 插件支持条件改写 
[#3577](https://github.com/apache/apisix/pull/3577)
+
+### Bugfix

Review comment:
   Got 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] tokers commented on issue #3963: request help: Distinguish the source (upstream or apisix) of the status code, whether it can be extended to all the status code

2021-04-02 Thread GitBox


tokers commented on issue #3963:
URL: https://github.com/apache/apisix/issues/3963#issuecomment-812802101


   We can send a proposal to the mail list, who wants to do 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-dashboard] tokers edited a comment on issue #1684: program panic when failed to initialize etcd store is unreasonable

2021-04-02 Thread GitBox


tokers edited a comment on issue #1684:
URL: 
https://github.com/apache/apisix-dashboard/issues/1684#issuecomment-812801901


   @bisakhmondal We don't have to panic the program, instead, we may report the 
error reason and exit with a non-zero 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] tokers commented on issue #1684: program panic when failed to initialize etcd store is unreasonable

2021-04-02 Thread GitBox


tokers commented on issue #1684:
URL: 
https://github.com/apache/apisix-dashboard/issues/1684#issuecomment-812801901


   @bisakhmondal We don't have to panic the program, instead, we may report the 
error reason, and exit with a non-zero 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-helm-chart] tokers commented on issue #49: apisix error:failed to fetch data from etcd: xxxx could not be resolved

2021-04-02 Thread GitBox


tokers commented on issue #49:
URL: 
https://github.com/apache/apisix-helm-chart/issues/49#issuecomment-812801749


   @wgy-home Does this problem exist continuously? In theory, APISIX should 
parse the etcd ClusterIP normally since it uses the correct nameserver.


-- 
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] tokers commented on issue #52: The rancher useage

2021-04-02 Thread GitBox


tokers commented on issue #52:
URL: 
https://github.com/apache/apisix-helm-chart/issues/52#issuecomment-812801204


   http://apisix.apache.org/docs/ingress-controller/deployments/k3s-rke
   We have tested the deployment on k3s and RKE, steps are similar to other 
platforms.


-- 
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] tokers commented on a change in pull request #3910: change(limit-count): ensure redis cluster name is set correctly

2021-04-02 Thread GitBox


tokers commented on a change in pull request #3910:
URL: https://github.com/apache/apisix/pull/3910#discussion_r606607892



##
File path: docs/en/latest/plugins/limit-count.md
##
@@ -35,20 +35,20 @@ Limit request rate by a fixed number of requests in a given 
time window.
 
 ## Attributes
 
-| Name| Type| Requirement  | Default   | Valid 

  | Description 


   |
-| --- | --- |  | - | 
---
 | 
--
 |
-| count   | integer | required |   | count 
> 0 
  | the specified number of requests threshold. 


   |
-| time_window | integer | required |   | 
time_window > 0 
| the time window in seconds before the request count 
is reset.   


   |
-| key | string  | optional | "remote_addr" | 
["remote_addr", "server_addr", "http_x_real_ip", "http_x_forwarded_for", 
"consumer_name", "service_id"] | The user specified key to limit the count.  Now accept those as key: "remote_addr"(client's IP), "server_addr"(server's 
IP), "X-Forwarded-For/X-Real-IP" in request header, "consumer_name"(consumer's 
username) and "service_id". 
  |
-| rejected_code   | integer | optional | 503   | 
[200,...,599]   
| The HTTP status code returned when the request 
exceeds the threshold is rejected, default 503. 


|
-| policy  | string  | optional | "local"   | 
["local", "redis", "redis-cluster"] 
| The rate-limiting policies to use for retrieving and 
incrementing the limits. Available values are `local`(the counters will be 
stored locally in-memory on the node) and `redis`(counters are stored on a 
Redis server and will be shared across the nodes, usually use it to do the 
global speed limit). |
-| redis_host  | string  | required for `redis` |   |   

  | When using the `redis` policy, this property specifies the 
address of the Redis server.


|
-| redis_port  | integer | optional | 6379  | 
[1,...] 
| When using the `redis` policy, this property 
specifies the port of the Redis server. 


  |
-| redis_password  | string  | optional |   |   

  | When using the `redis` policy, this property specifies the 
password of the Redis server. 

[GitHub] [apisix-ingress-controller] tokers commented on a change in pull request #337: fix: ssl need to be update when secret has been changed

2021-04-02 Thread GitBox


tokers commented on a change in pull request #337:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/337#discussion_r606607639



##
File path: test/e2e/ingress/secret.go
##
@@ -144,6 +144,6 @@ 
RU+QPRECgYB6XW24EI5+w3STbpnc6VoTS+sy9I9abTJPYo9LpCJwfMYc9Tg9Cx2K
tlsUpdate, err := s.ListApisixTls()
assert.Nil(ginkgo.GinkgoT(), err, "list tlsUpdate error")
assert.Len(ginkgo.GinkgoT(), tlsUpdate, 1, "tls number not 
expect")
-   assert.NotEqual(ginkgo.GinkgoT(), KeyInApisix, 
tlsUpdate[0].Key, "tls key not expect")
+   assert.Equal(ginkgo.GinkgoT(), certUpdate, tlsUpdate[0].Cert, 
"tls cert not expect")

Review comment:
   Both the cert and key should be checked.

##
File path: test/e2e/ingress/secret.go
##
@@ -144,6 +144,6 @@ 
RU+QPRECgYB6XW24EI5+w3STbpnc6VoTS+sy9I9abTJPYo9LpCJwfMYc9Tg9Cx2K
tlsUpdate, err := s.ListApisixTls()
assert.Nil(ginkgo.GinkgoT(), err, "list tlsUpdate error")
assert.Len(ginkgo.GinkgoT(), tlsUpdate, 1, "tls number not 
expect")
-   assert.NotEqual(ginkgo.GinkgoT(), KeyInApisix, 
tlsUpdate[0].Key, "tls key not expect")
+   assert.Equal(ginkgo.GinkgoT(), certUpdate, tlsUpdate[0].Cert, 
"tls cert not expect")

Review comment:
   We may also add some test cases to cover the ApisixTls delete.




-- 
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] Tanc009 opened a new pull request #3982: add the action 'init_config'

2021-04-02 Thread GitBox


Tanc009 opened a new pull request #3982:
URL: https://github.com/apache/apisix/pull/3982


   ### 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**
   
   I want to initialize ETCD when I execute 'apisix init'


-- 
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 #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-803254054


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=h1) 
Report
   > Merging 
[#1610](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=desc) 
(11a14fb) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9cf91b756f33cbddeac1adb912177f5b7762def6?el=desc)
 (9cf91b7) will **decrease** coverage by `1.13%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1610  +/-   ##
   ==
   - Coverage   72.63%   71.49%   -1.14% 
   ==
 Files 133   47  -86 
 Lines5740 3126-2614 
 Branches  6660 -666 
   ==
   - Hits 4169 2235-1934 
   + Misses   1327  647 -680 
 Partials  244  244  
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `62.28% <ø> (ø)` | |
   | backend-e2e-test-ginkgo | `48.43% <ø> (-0.13%)` | :arrow_down: |
   | backend-unit-test | `52.25% <ø> (ø)` | |
   | 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/1610?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[web/src/pages/Consumer/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Db25zdW1lci9MaXN0LnRzeA==)
 | | |
   | 
[web/src/pages/Dashboard/Dashboard.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9EYXNoYm9hcmQvRGFzaGJvYXJkLnRzeA==)
 | | |
   | 
[web/src/pages/Service/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0xpc3QudHN4)
 | | |
   | 
[web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4)
 | | |
   | 
[web/src/access.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9hY2Nlc3MudHM=)
 | | |
   | 
[web/src/pages/Upstream/components/Step1.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS9jb21wb25lbnRzL1N0ZXAxLnRzeA==)
 | | |
   | 
[web/src/components/IconFont/IconFont.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9jb21wb25lbnRzL0ljb25Gb250L0ljb25Gb250LnRzeA==)
 | | |
   | 
[web/src/pages/SSL/List.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TU0wvTGlzdC50c3g=)
 | | |
   | 
[web/src/global.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9nbG9iYWwudHN4)
 | | |
   | 
[web/src/pages/Setting/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9TZXR0aW5nL3NlcnZpY2UudHM=)
 | | |
   | ... and [75 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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/1610?src=pr=footer).
 Last update 
[9cf91b7...11a14fb](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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 #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-803254054


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=h1) 
Report
   > Merging 
[#1610](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=desc) 
(11a14fb) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9cf91b756f33cbddeac1adb912177f5b7762def6?el=desc)
 (9cf91b7) will **decrease** coverage by `5.38%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1610  +/-   ##
   ==
   - Coverage   72.63%   67.24%   -5.39% 
   ==
 Files 133   47  -86 
 Lines5740 3126-2614 
 Branches  6660 -666 
   ==
   - Hits 4169 2102-2067 
   + Misses   1327  774 -553 
   - Partials  244  250   +6 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `47.66% <ø> (-14.62%)` | :arrow_down: |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `52.25% <ø> (ø)` | |
   | 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/1610?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==)
 | `5.55% <0.00%> (-70.38%)` | :arrow_down: |
   | 
[api/internal/handler/healthz/healthz.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGVhbHRoei9oZWFsdGh6Lmdv)
 | `66.66% <0.00%> (-33.34%)` | :arrow_down: |
   | 
[api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==)
 | `81.25% <0.00%> (-18.75%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `39.49% <0.00%> (-15.97%)` | :arrow_down: |
   | 
[api/internal/handler/schema/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2NoZW1hL3NjaGVtYS5nbw==)
 | `90.47% <0.00%> (-9.53%)` | :arrow_down: |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | `68.51% <0.00%> (-9.26%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=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/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=)
 | `71.42% <0.00%> (-7.35%)` | :arrow_down: |
   | 
[api/internal/handler/ssl/ssl.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc3NsL3NzbC5nbw==)
 | `67.53% <0.00%> (-5.76%)` | :arrow_down: |
   | 
[api/internal/filter/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9hdXRoZW50aWNhdGlvbi5nbw==)
 | `72.22% <0.00%> (-5.56%)` | :arrow_down: |
   | ... and [94 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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/1610?src=pr=footer).
 Last update 
[9cf91b7...11a14fb](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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 

[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-803254054


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=h1) 
Report
   > Merging 
[#1610](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=desc) 
(11a14fb) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9cf91b756f33cbddeac1adb912177f5b7762def6?el=desc)
 (9cf91b7) will **decrease** coverage by `20.37%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1610   +/-   ##
   ===
   - Coverage   72.63%   52.25%   -20.38% 
   ===
 Files 133   38   -95 
 Lines5740 2660 -3080 
 Branches  6660  -666 
   ===
   - Hits 4169 1390 -2779 
   + Misses   1327 1082  -245 
   + Partials  244  188   -56 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `52.25% <ø> (ø)` | |
   | 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/1610?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=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/1610/diff?src=pr=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/1610/diff?src=pr=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/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `0.00% <0.00%> (-71.03%)` | :arrow_down: |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | `0.00% <0.00%> (-66.67%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=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/1610/diff?src=pr=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/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `27.41% <0.00%> (-37.50%)` | :arrow_down: |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | `42.59% <0.00%> (-35.19%)` | :arrow_down: |
   | 
[api/internal/handler/schema/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2NoZW1hL3NjaGVtYS5nbw==)
 | `66.66% <0.00%> (-33.34%)` | :arrow_down: |
   | ... and [118 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1610/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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/1610?src=pr=footer).
 Last update 
[9cf91b7...11a14fb](https://codecov.io/gh/apache/apisix-dashboard/pull/1610?src=pr=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] stu01509 commented on a change in pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


stu01509 commented on a change in pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#discussion_r606597313



##
File path: web/src/components/Plugin/PluginPage.tsx
##
@@ -180,16 +180,17 @@ const PluginPage: React.FC = ({
   key={item.name}
   actions={[
 

[GitHub] [apisix-ingress-controller] gxthrj merged pull request #334: test: add e2e test cases for cors plugin

2021-04-02 Thread GitBox


gxthrj merged pull request #334:
URL: https://github.com/apache/apisix-ingress-controller/pull/334


   


-- 
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-ingress-controller] branch master updated: test: add e2e test cases for cors plugin (#334)

2021-04-02 Thread kvn
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-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 456efa6  test: add e2e test cases for cors plugin (#334)
456efa6 is described below

commit 456efa6836e3195cc0fcb6603fb9243c1033860a
Author: Alex Zhang 
AuthorDate: Sat Apr 3 08:12:47 2021 +0800

test: add e2e test cases for cors plugin (#334)
---
 test/e2e/plugins/cors.go | 254 +++
 1 file changed, 254 insertions(+)

diff --git a/test/e2e/plugins/cors.go b/test/e2e/plugins/cors.go
new file mode 100644
index 000..aa5ada8
--- /dev/null
+++ b/test/e2e/plugins/cors.go
@@ -0,0 +1,254 @@
+// 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 plugins
+
+import (
+   "fmt"
+   "net/http"
+
+   "github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
+   "github.com/onsi/ginkgo"
+   "github.com/stretchr/testify/assert"
+)
+
+var _ = ginkgo.Describe("fault-injection plugin", func() {
+   opts := {
+   Name:"default",
+   Kubeconfig:  scaffold.GetKubeconfig(),
+   APISIXConfigPath:"testdata/apisix-gw-config.yaml",
+   APISIXDefaultConfigPath: 
"testdata/apisix-gw-config-default.yaml",
+   IngressAPISIXReplicas:   1,
+   HTTPBinServicePort:  80,
+   APISIXRouteVersion:  "apisix.apache.org/v2alpha1",
+   }
+   s := scaffold.NewScaffold(opts)
+   ginkgo.It("empty config", func() {
+   backendSvc, backendPorts := s.DefaultHTTPBackend()
+   ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+ hosts:
+ - httpbin.org
+ paths:
+   - /ip
+   backends:
+   - serviceName: %s
+ servicePort: %d
+ weight: 10
+   plugins:
+   - name: cors
+ enable: true
+`, backendSvc, backendPorts[0])
+
+   assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+   err := s.EnsureNumApisixUpstreamsCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of 
upstreams")
+   err = s.EnsureNumApisixRoutesCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+
+   resp := s.NewAPISIXClient().GET("/ip").WithHeader("Host", 
"httpbin.org").Expect()
+   resp.Status(http.StatusOK)
+   resp.Header("Access-Control-Allow-Origin").Equal("*")
+   resp.Header("Access-Control-Allow-Methods").Equal("*")
+   resp.Header("Access-Control-Allow-Headers").Equal("*")
+   resp.Header("Access-Control-Expose-Headers").Equal("*")
+   resp.Header("Access-Control-Max-Age").Equal("5")
+   resp.Body().Contains("origin")
+   })
+   ginkgo.It("finer granularity config", func() {
+   backendSvc, backendPorts := s.DefaultHTTPBackend()
+   ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+ hosts:
+ - httpbin.org
+ paths:
+   - /ip
+   backends:
+   - serviceName: %s
+ servicePort: %d
+ weight: 10
+   plugins:
+   - name: cors
+ enable: true
+ config:
+   allow_origins: http://foo.bar.org
+   allow_methods: "GET,POST"
+   max_age: 3600
+   expose_headers: x-foo,x-baz
+   allow_headers: x-from-ingress
+   allow_credential: true
+`, backendSvc, backendPorts[0])
+
+   assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+   err := s.EnsureNumApisixUpstreamsCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of 
upstreams")
+   err = s.EnsureNumApisixRoutesCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+
+   resp := s.NewAPISIXClient().GET("/ip").
+   WithHeader("Host", 

[GitHub] [apisix-ingress-controller] gxthrj merged pull request #336: test: add test cases for echo plugin

2021-04-02 Thread GitBox


gxthrj merged pull request #336:
URL: https://github.com/apache/apisix-ingress-controller/pull/336


   


-- 
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-ingress-controller] branch master updated: test: add test cases for echo plugin (#336)

2021-04-02 Thread kvn
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-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 5471b45  test: add test cases for echo plugin (#336)
5471b45 is described below

commit 5471b45f6f3a021e07c4dcb5e895f6a0739696c0
Author: Alex Zhang 
AuthorDate: Sat Apr 3 08:12:03 2021 +0800

test: add test cases for echo plugin (#336)
---
 test/e2e/plugins/echo.go | 167 +++
 1 file changed, 167 insertions(+)

diff --git a/test/e2e/plugins/echo.go b/test/e2e/plugins/echo.go
new file mode 100644
index 000..a352284
--- /dev/null
+++ b/test/e2e/plugins/echo.go
@@ -0,0 +1,167 @@
+// 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 plugins
+
+import (
+   "fmt"
+   "net/http"
+
+   "github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
+   "github.com/onsi/ginkgo"
+   "github.com/stretchr/testify/assert"
+)
+
+var _ = ginkgo.Describe("echo plugin", func() {
+   opts := {
+   Name:"default",
+   Kubeconfig:  scaffold.GetKubeconfig(),
+   APISIXConfigPath:"testdata/apisix-gw-config.yaml",
+   APISIXDefaultConfigPath: 
"testdata/apisix-gw-config-default.yaml",
+   IngressAPISIXReplicas:   1,
+   HTTPBinServicePort:  80,
+   APISIXRouteVersion:  "apisix.apache.org/v2alpha1",
+   }
+   s := scaffold.NewScaffold(opts)
+   ginkgo.It("insert preface and epilogue", func() {
+   backendSvc, backendPorts := s.DefaultHTTPBackend()
+   ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+ hosts:
+ - httpbin.org
+ paths:
+   - /ip
+   backends:
+   - serviceName: %s
+ servicePort: %d
+ weight: 10
+   plugins:
+   - name: echo
+ enable: true
+ config:
+   before_body: "This is the preface"
+   after_body: "This is the epilogue"
+   headers:
+ X-Foo: v1
+ X-Foo2: v2
+   
+`, backendSvc, backendPorts[0])
+
+   assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+
+   err := s.EnsureNumApisixUpstreamsCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of 
upstreams")
+   err = s.EnsureNumApisixRoutesCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+
+   resp := s.NewAPISIXClient().GET("/ip").WithHeader("Host", 
"httpbin.org").Expect()
+   resp.Status(http.StatusOK)
+   resp.Header("X-Foo").Equal("v1")
+   resp.Header("X-Foo2").Equal("v2")
+   resp.Body().Contains("This is the preface")
+   resp.Body().Contains("origin")
+   resp.Body().Contains("This is the epilogue")
+   })
+
+   ginkgo.It("replace body", func() {
+   backendSvc, backendPorts := s.DefaultHTTPBackend()
+   ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+ hosts:
+ - httpbin.org
+ paths:
+   - /ip
+   backends:
+   - serviceName: %s
+ servicePort: %d
+ weight: 10
+   plugins:
+   - name: echo
+ enable: true
+ config:
+   body: "my custom body"
+   
+`, backendSvc, backendPorts[0])
+
+   assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+
+   err := s.EnsureNumApisixUpstreamsCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of 
upstreams")
+   err = s.EnsureNumApisixRoutesCreated(1)
+   assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+
+   resp := s.NewAPISIXClient().GET("/ip").WithHeader("Host", 
"httpbin.org").Expect()
+   resp.Status(http.StatusOK)
+   resp.Body().Equal("my custom body")
+   })
+
+   ginkgo.It("auth", func() {

[GitHub] [apisix-ingress-controller] gxthrj opened a new pull request #337: fix: ssl need to be update when secret has been changed

2021-04-02 Thread GitBox


gxthrj opened a new pull request #337:
URL: https://github.com/apache/apisix-ingress-controller/pull/337


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [x] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   #324 
   
   
   


-- 
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 #1705: fix/perf: detailed error for store init failure and deferred execution of closers

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #1705:
URL: https://github.com/apache/apisix-dashboard/pull/1705#issuecomment-812696206


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=h1) 
Report
   > Merging 
[#1705](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=desc) 
(d9bb08f) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9cf91b756f33cbddeac1adb912177f5b7762def6?el=desc)
 (9cf91b7) will **decrease** coverage by `4.93%`.
   > The diff coverage is `50.00%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1705  +/-   ##
   ==
   - Coverage   72.63%   67.69%   -4.94% 
   ==
 Files 133   47  -86 
 Lines5740 3130-2610 
 Branches  6660 -666 
   ==
   - Hits 4169 2119-2050 
   + Misses   1327  765 -562 
   - Partials  244  246   +2 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `48.43% <20.00%> (-0.13%)` | :arrow_down: |
   | backend-unit-test | `52.31% <100.00%> (+0.05%)` | :arrow_up: |
   | 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/1705?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/cmd/managerapi.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2NtZC9tYW5hZ2VyYXBpLmdv)
 | `51.94% <28.57%> (-7.52%)` | :arrow_down: |
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `89.22% <100.00%> (+1.87%)` | :arrow_up: |
   | 
[api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=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/1705/diff?src=pr=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/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=)
 | `66.12% <0.00%> (-17.75%)` | :arrow_down: |
   | 
[api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv)
 | `54.11% <0.00%> (-11.77%)` | :arrow_down: |
   | 
[api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv)
 | `76.47% <0.00%> (-8.83%)` | :arrow_down: |
   | 
[api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `67.28% <0.00%> (-3.74%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=)
 | `52.10% <0.00%> (-3.37%)` | :arrow_down: |
   | 
[api/internal/core/store/validate.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGUuZ28=)
 | `67.03% <0.00%> (-2.24%)` | :arrow_down: |
   | ... and [89 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=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/1705?src=pr=footer).
 Last update 
[9cf91b7...d9bb08f](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=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 commented on pull request #1705: fix/perf: detailed error for store init failure and deferred execution of closers

2021-04-02 Thread GitBox


codecov-io commented on pull request #1705:
URL: https://github.com/apache/apisix-dashboard/pull/1705#issuecomment-812696206


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=h1) 
Report
   > Merging 
[#1705](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=desc) 
(d9bb08f) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9cf91b756f33cbddeac1adb912177f5b7762def6?el=desc)
 (9cf91b7) will **decrease** coverage by `20.31%`.
   > The diff coverage is `100.00%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1705   +/-   ##
   ===
   - Coverage   72.63%   52.31%   -20.32% 
   ===
 Files 133   38   -95 
 Lines5740 2661 -3079 
 Branches  6660  -666 
   ===
   - Hits 4169 1392 -2777 
   + Misses   1327 1081  -246 
   + Partials  244  188   -56 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `52.31% <100.00%> (+0.05%)` | :arrow_up: |
   | 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/1705?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `82.03% <100.00%> (-5.32%)` | :arrow_down: |
   | 
[api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=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/1705/diff?src=pr=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/1705/diff?src=pr=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/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=)
 | `0.00% <0.00%> (-71.03%)` | :arrow_down: |
   | 
[api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv)
 | `0.00% <0.00%> (-66.67%)` | :arrow_down: |
   | 
[api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=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/1705/diff?src=pr=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/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv)
 | `27.41% <0.00%> (-37.50%)` | :arrow_down: |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | `42.59% <0.00%> (-35.19%)` | :arrow_down: |
   | ... and [119 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1705/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=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/1705?src=pr=footer).
 Last update 
[9cf91b7...d9bb08f](https://codecov.io/gh/apache/apisix-dashboard/pull/1705?src=pr=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] bisakhmondal opened a new pull request #1705: fix/perf: detailed error for store init failure and deferred execution of closers

2021-04-02 Thread GitBox


bisakhmondal opened a new pull request #1705:
URL: https://github.com/apache/apisix-dashboard/pull/1705


   Please answer these questions before submitting a pull request, **or your PR 
will get closed**.
   
   **Why submit this pull request?**
   
   - [x] Bugfix
   - [ ] New feature provided
   - [x] Improve performance
   - [ ] Backport patches
   
   **What changes will this PR take into?**
   
   1. Closing of all opened resource has been put into deferred execution. So 
incase any panic occurs during runtime, the respective closers of the resource 
gets executed safely. Till now, for panics, the main goroutine was getting 
closed ungracefully.
   
   2. Detailed error description if etcd contains corrupted data
   
![image](https://user-images.githubusercontent.com/41498427/113449280-1c043e00-941b-11eb-9819-a76b08076702.png)
   
   **Related issues**
   
   resolves #1684 
   
   **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 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] iamayushdas commented on pull request #1689: docs: update the image in the USER_GUIDE.md #1683

2021-04-02 Thread GitBox


iamayushdas commented on pull request #1689:
URL: https://github.com/apache/apisix-dashboard/pull/1689#issuecomment-812586896


   > > Could you please retrigger CI @juzhiyuan
   > 
   > 
   > 
   > Since PR #1696 is merged. I think you should merge the master branch and 
fix the conflicts.
   > 
   > Then the CI can be passed.
   
   Have a review to 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-dashboard] guoqqqi commented on a change in pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


guoqqqi commented on a change in pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#discussion_r606286581



##
File path: web/src/components/Plugin/PluginPage.tsx
##
@@ -180,16 +180,17 @@ const PluginPage: React.FC = ({
   key={item.name}
   actions={[
 https://user-images.githubusercontent.com/72343596/113429218-bc059b80-940a-11eb-81ec-cd0396c2109d.png)
   




-- 
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] guoqqqi commented on a change in pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


guoqqqi commented on a change in pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#discussion_r606283989



##
File path: web/src/components/Plugin/PluginPage.tsx
##
@@ -180,16 +180,17 @@ const PluginPage: React.FC = ({
   key={item.name}
   actions={[
  = ({
   key={item.name}
   actions={[
 

[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


juzhiyuan commented on a change in pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#discussion_r606240789



##
File path: web/src/components/Plugin/PluginPage.tsx
##
@@ -181,11 +181,7 @@ const PluginPage: React.FC = ({
   actions={[
 

[GitHub] [apisix] gxlct008 opened a new pull request #3981: Fixed spelling error

2021-04-02 Thread GitBox


gxlct008 opened a new pull request #3981:
URL: https://github.com/apache/apisix/pull/3981


   ### What this PR does / why we need it:
   Fixed spelling errors:gPRC > gRPC
   
   ### 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] stu01509 commented on pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


stu01509 commented on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-812529287


   Hi @juzhiyuan and @guoqqqi 
   
   Update the commit, and passed the CI,
   please review it again :)


-- 
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] gxlct008 closed pull request #3228: docs: fix spelling errors

2021-04-02 Thread GitBox


gxlct008 closed pull request #3228:
URL: https://github.com/apache/apisix/pull/3228


   


-- 
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 #3228: docs: fix spelling errors

2021-04-02 Thread GitBox


juzhiyuan commented on pull request #3228:
URL: https://github.com/apache/apisix/pull/3228#issuecomment-812524575


   Hi, I see you have deleted the repo 樂 then this PR cannot get updated IMO. 
We may close it & resubmit a new 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] juzhiyuan commented on pull request #3980: doc: update the Getting Started guide in Chinese

2021-04-02 Thread GitBox


juzhiyuan commented on pull request #3980:
URL: https://github.com/apache/apisix/pull/3980#issuecomment-812519984


   BTW, I see there have some lint errors:
   
   
![image](https://user-images.githubusercontent.com/2106987/113417764-be5dfa80-93f6-11eb-8fa4-2bb1e2c40d3b.png)
   
   Would you like to fix them 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] juzhiyuan commented on pull request #3980: doc: update the Getting Started guide in Chinese

2021-04-02 Thread GitBox


juzhiyuan commented on pull request #3980:
URL: https://github.com/apache/apisix/pull/3980#issuecomment-812519591


   Thanks for your contribution!


-- 
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] gxlct008 opened a new pull request #3980: doc: update the Getting Started guide in Chinese

2021-04-02 Thread GitBox


gxlct008 opened a new pull request #3980:
URL: https://github.com/apache/apisix/pull/3980


   ### What this PR does / why we need it:
   improve Getting Started in Chinese
   
   ### 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] Firstsawyou commented on pull request #3871: docs: admin-api.md document adds configuration https example

2021-04-02 Thread GitBox


Firstsawyou commented on pull request #3871:
URL: https://github.com/apache/apisix/pull/3871#issuecomment-812481811


   @moonming Please take a look when you have 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] Firstsawyou edited a comment on issue #3979: In Stand-alone mode, Is the apisix.yaml configuration Descriptive Capability as strong as using admin-api(etcd)?

2021-04-02 Thread GitBox


Firstsawyou edited a comment on issue #3979:
URL: https://github.com/apache/apisix/issues/3979#issuecomment-812473231


   The yaml mode is as powerful as the etcd mode. For how to configure the 
health check, you can refer to here `TEST 4`:
   
https://github.com/apache/apisix/blob/master/t/config-center-yaml/route-upstream.t


-- 
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 #3979: In Stand-alone mode, Is the apisix.yaml configuration Descriptive Capability as strong as using admin-api(etcd)?

2021-04-02 Thread GitBox


Firstsawyou commented on issue #3979:
URL: https://github.com/apache/apisix/issues/3979#issuecomment-812473231


   The yaml mode is as powerful as the etcd mode. For how to configure the 
health check, you can refer to here:
   
https://github.com/apache/apisix/blob/master/t/config-center-yaml/route-upstream.t


-- 
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] riskgod closed issue #50: Can't visit other pod in one Node

2021-04-02 Thread GitBox


riskgod closed issue #50:
URL: https://github.com/apache/apisix-helm-chart/issues/50


   


-- 
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] riskgod commented on issue #50: Can't visit other pod in one Node

2021-04-02 Thread GitBox


riskgod commented on issue #50:
URL: 
https://github.com/apache/apisix-helm-chart/issues/50#issuecomment-812468055


   > @riskgod The above problem is not related to DNS. The problem `404 Route 
Not Found` means you don't configure a Route correctly, or you have configured 
one but you don't use correct URI, Host when you send a request to APISIX.
   > 
   > Also, please paste your Route configuration.
   
   hey the 404 err from pod not in apisix, will close this issue, this is a net 
err.
   


-- 
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] riskgod opened a new issue #52: The rancher useage

2021-04-02 Thread GitBox


riskgod opened a new issue #52:
URL: https://github.com/apache/apisix-helm-chart/issues/52


   Do we have a guide about how to deploy apisix in rancher?


-- 
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 #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


juzhiyuan commented on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-812466613


   @stu01509 Hi, please run `yarn build`, and you will get error messages.


-- 
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] xiewenhui opened a new issue #3979: In Stand-alone mode, Is the apisix.yaml configuration Descriptive Capability as strong as using admin-api(etcd)?

2021-04-02 Thread GitBox


xiewenhui opened a new issue #3979:
URL: https://github.com/apache/apisix/issues/3979


   
   Stand-alone.md is so concise.
   
   In Stand-alone mode,  Is the apisix.yaml  configuration Descriptive 
Capability as strong as using  admin-api(etcd)?
   https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md
   
   for example ,How to cfg   the parameters of the health check for Upstream in 
Stand-alone mode? 


-- 
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] bisakhmondal opened a new pull request #1704: feat: rewrite e2e test(test-e2e-route-with-management-fields) using ginkgo

2021-04-02 Thread GitBox


bisakhmondal opened a new pull request #1704:
URL: https://github.com/apache/apisix-dashboard/pull/1704


   Please answer these questions before submitting a pull request, **or your PR 
will get closed**.
   
   **Why submit this pull request?**
   
   - [ ] Bugfix
   - [x] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   **Related issues**
   
   #1500 
   
   **Checklist:**
   
   - [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   - [x] 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 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] Firstsawyou commented on a change in pull request #3556: feat: support rewrite HTTP method

2021-04-02 Thread GitBox


Firstsawyou commented on a change in pull request #3556:
URL: https://github.com/apache/apisix/pull/3556#discussion_r606161255



##
File path: t/plugin/proxy-rewrite.t
##
@@ -1370,3 +1370,100 @@ host: test.com:6443
 x-real-ip: 127.0.0.1
 --- no_error_log
 [error]
+
+
+
+=== TEST 47: set route(rewrite HTTP method)
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+"methods": ["GET"],
+"plugins": {
+"proxy-rewrite": {
+"method": "POST"
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/hello"

Review comment:
   Hi,  @54corbin
   You can modify the corresponding test file according to the content of 
`diff` here.
   
   ```shell
   diff --git a/t/lib/server.lua b/t/lib/server.lua
   index 4e96223..700a439 100644
   --- a/t/lib/server.lua
   +++ b/t/lib/server.lua
   @@ -80,6 +80,7 @@ function _M.plugin_proxy_rewrite()
ngx.say("uri: ", ngx.var.uri)
ngx.say("host: ", ngx.var.host)
ngx.say("scheme: ", ngx.var.scheme)
   +ngx.say("method: ", ngx.var.request_method)
end


   diff --git a/t/plugin/proxy-rewrite.t b/t/plugin/proxy-rewrite.t
   index ca760a0..0aaeffa 100644
   --- a/t/plugin/proxy-rewrite.t
   +++ b/t/plugin/proxy-rewrite.t
   @@ -250,6 +250,7 @@ GET /hello HTTP/1.1
uri: /plugin_proxy_rewrite
host: apisix.iresty.com
scheme: http
   +method: GET
--- no_error_log
[error]

   @@ -303,6 +304,7 @@ GET /hello HTTP/1.1
uri: /plugin_proxy_rewrite
host: test.com
scheme: https
   +method: GET
--- no_error_log
[error]

   @@ -675,6 +677,7 @@ GET /test/plugin/proxy/rewrite HTTP/1.1
uri: /plugin_proxy_rewrite
host: localhost
scheme: http
   +method: GET
--- no_error_log
[error]

   @@ -1384,6 +1387,7 @@ x-real-ip: 127.0.0.1
"methods": ["GET"],
"plugins": {
"proxy-rewrite": {
   +"uri": "/plugin_proxy_rewrite",
"method": "POST"
}
},
   @@ -1416,7 +1420,10 @@ passed
--- request
GET /hello
--- response_body
   -hello world
   +uri: /plugin_proxy_rewrite
   +host: localhost
   +scheme: http
   +method: POST
--- error_log eval
qr/changed HTTP method from GET to POST/

   @@ -1432,6 +1439,7 @@ qr/changed HTTP method from GET to POST/
 [[{
"plugins": {
"proxy-rewrite": {
   +"uri": "/plugin_proxy_rewrite",
"method": "PUT"
}
},
   @@ -1460,10 +1468,13 @@ passed



   -=== TEST 50: rewrite HTTP method (GET to PUT)  
    request  
   +=== TEST 50: rewrite HTTP method (GET to PUT)
   +--- request
GET /hello
--- response_body
   -hello world
   +uri: /plugin_proxy_rewrite
   +host: localhost
   +scheme: http
   +method: PUT
--- error_log eval
qr/changed HTTP method from GET to PUT/
   diff --git a/t/plugin/proxy-rewrite2.t b/t/plugin/proxy-rewrite2.t
   index 5045792..57e6ee0 100644
   --- a/t/plugin/proxy-rewrite2.t
   +++ b/t/plugin/proxy-rewrite2.t
   @@ -104,3 +104,4 @@ serverless []
uri: /plugin_proxy_rewrite
host: localhost
scheme: http
   +method: GET
   ```




-- 
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 edited a comment on issue #3978: bug:

2021-04-02 Thread GitBox


Firstsawyou edited a comment on issue #3978:
URL: https://github.com/apache/apisix/issues/3978#issuecomment-812452296


   >定义新的route使用新插件提示未知的插件
   
   Is your new plugin name configured in the plugin list of the `config.yaml` 
configuration file?
   By the way, it is better to use English in the community.


-- 
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 #3978: bug:

2021-04-02 Thread GitBox


Firstsawyou commented on issue #3978:
URL: https://github.com/apache/apisix/issues/3978#issuecomment-812452296


   >定义新的route使用新插件提示未知的插件
   
   Is your new plugin name configured in the plug-in list of the `config.yaml` 
configuration file?
   By the way, it is better to use English in the community.


-- 
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] stu01509 commented on pull request #1610: feat: improve the config plugin button enable disable status

2021-04-02 Thread GitBox


stu01509 commented on pull request #1610:
URL: https://github.com/apache/apisix-dashboard/pull/1610#issuecomment-812447780


   Hi @juzhiyuan 
   
   Update the commit :)


-- 
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 #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


spacewander commented on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812444636


   > why does APISIX 2.* not transparent proxy requests like 1.* (as it worked 
before)
   
   @membphis 
   Wait for your answer...


-- 
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] YeZiZhen opened a new issue #3978: bug:

2021-04-02 Thread GitBox


YeZiZhen opened a new issue #3978:
URL: https://github.com/apache/apisix/issues/3978


   ### Issue description
   
   ### Environment
   
   * apisix version (cmd: `apisix version`):2.3
   * OS (cmd: `uname -a`):Linux ubuntu 5.4.0-70-generic #78-Ubuntu SMP Fri Mar 
19 13:29:52 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
   * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`):nginx 
version: openresty/1.19.3.1
   built by gcc 9.3.0 (Ubuntu 9.3.0-17ubuntu1~20.04) 
   built with OpenSSL 1.1.1g  21 Apr 2020
   TLS SNI support enabled
   configure arguments: --prefix=/usr/local/openresty/nginx --with-cc-opt='-O2 
-I/usr/local/openresty/openssl/include' --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,/usr/local/openresty/luajit/lib 
-L/usr/local/openresty/openssl/lib -Wl,-rpath=/usr/local/openresty/openssl/lib' 
--with-htt
 p_v2_module --with-http_stub_status_module --with-http_realip_module 
--with-stream --with-stream_ssl_module --with-stream_ssl_preread_module 
--with-http_ssl_module
   * 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 Version: 3.4.13
   * apisix-dashboard version, if have:
   
   ### Minimal test code / Steps to reproduce the issue
   
   1.在apisix-2.3\apisix\plugins下添加新插件,保存,命名正确
   2.执行curl http://127.0.0.1:9000/apisix/admin/plugins/reload -H 'X-API-KEY: 
westone' -X PUT返回done
   3.执行curl http://127.0.0.1:9000/apisix/admin/plugins/list -H 'X-API-KEY: 
westone' -X GET后并没有新添加的插件,对已有的插件更改也没有产生变化
   4.定义新的route使用新插件提示未知的插件
   
   ### What's the actual result? (including assertion message & call stack if 
applicable)
   
   ### 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] stu01509 closed issue #1700: Translation error in plugin page

2021-04-02 Thread GitBox


stu01509 closed issue #1700:
URL: https://github.com/apache/apisix-dashboard/issues/1700


   


-- 
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] stu01509 commented on issue #1700: Translation error in plugin page

2021-04-02 Thread GitBox


stu01509 commented on issue #1700:
URL: 
https://github.com/apache/apisix-dashboard/issues/1700#issuecomment-812440733


   Hi @juzhiyuan  and @iamayushdas 
   
   Yeah, this issue has been solved in #1685, so close 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] totemofwolf commented on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf commented on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812413726


   > You need to set `enable_websocket` in the route:
   > 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#route
   
   Problem solved by adding an individual `host` like this >
   
   ```
   {
 "uris": [
   "/synchrony-proxy/v1/*"
 ],
 "name": "wss_wiki",
 "desc": "wss://wiki.xxx.cn",
 "priority": 10,
 "hosts": [
   "wiki.xxx.cn"
 ],
 "vars": [
   [
 "scheme",
 "==",
 "https"
   ]
 ],
 "upstream_id": "2",
 "enable_websocket": true,
 "status": 1
   }
   ```
   
   why does APISIX 2.*  not `transparent proxy requests` like 1.* (as it worked 
before)
   
   


-- 
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] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606132147



##
File path: apisix/plugins/ldap-auth.lua
##
@@ -0,0 +1,171 @@
+--
+-- 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.
+--
+local core = require("apisix.core")
+local ngx = ngx
+local ngx_re = require("ngx.re")
+local ipairs = ipairs
+local consumer_mod = require("apisix.consumer")
+local lualdap = require "lualdap"
+
+local lrucache = core.lrucache.new({
+ttl = 300, count = 512
+})
+local consumers_lrucache = core.lrucache.new({
+type = "plugin",
+})
+
+local schema = {
+type = "object",
+title = "work with route or service object",
+properties = {
+basedn = { type = "string" },
+ldapuri = { type = "string" },
+usetls = { type = "boolean" },

Review comment:
   Ok changed




-- 
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] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606132333



##
File path: docs/en/latest/plugins/ldap-auth.md
##
@@ -0,0 +1,152 @@
+---
+title: ldap-auth
+---
+
+
+
+## Summary
+
+- [**Name**](#name)
+- [**Attributes**](#attributes)
+- [**How To Enable**](#how-to-enable)
+- [**Test Plugin**](#test-plugin)
+- [**Disable Plugin**](#disable-plugin)
+
+## Name
+
+`ldap-auth` is an authentication plugin that can works with `consumer`. Add 
Ldap Authentication to a `service` or `route`.
+
+The `consumer` then authenticate against the Ldap server using Basic 
authentication.
+
+For more information on Basic authentication, refer to 
[Wiki](https://en.wikipedia.org/wiki/Basic_access_authentication) for more 
information.
+
+This authentication plugin use [lualdap](https://lualdap.github.io/lualdap/) 
plugin to connect against the ldap server
+
+## Attributes
+
+| Name | Type   | Requirement | Default | Valid | Description  

|
+|  | -- | --- | --- | - | 

 |
+| basedn | string | required| |   | the base dn of the `ldap` 
server (example : `ou=users,dc=example,dc=org`)   |
+| ldapuri | string | required| |   | the uri of the ldap 
server  |
+| usetls | boolean | optional|`true` |   | Boolean flag 
indicating if Transport Layer Security (TLS) should be used. |
+| uid | string | optional| `cn`  | | the user's password |

Review comment:
   No indeed it's the `uid` attribute that changes depending of the ldap 
server solution




-- 
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] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606132147



##
File path: apisix/plugins/ldap-auth.lua
##
@@ -0,0 +1,171 @@
+--
+-- 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.
+--
+local core = require("apisix.core")
+local ngx = ngx
+local ngx_re = require("ngx.re")
+local ipairs = ipairs
+local consumer_mod = require("apisix.consumer")
+local lualdap = require "lualdap"
+
+local lrucache = core.lrucache.new({
+ttl = 300, count = 512
+})
+local consumers_lrucache = core.lrucache.new({
+type = "plugin",
+})
+
+local schema = {
+type = "object",
+title = "work with route or service object",
+properties = {
+basedn = { type = "string" },
+ldapuri = { type = "string" },
+usetls = { type = "boolean" },

Review comment:
   Ok change




-- 
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] totemofwolf commented on issue #3954: bug: error occured when upstream application exists websocket

2021-04-02 Thread GitBox


totemofwolf commented on issue #3954:
URL: https://github.com/apache/apisix/issues/3954#issuecomment-812405564


   > > > You need to set `enable_websocket` in the route:
   > > > 
https://github.com/apache/apisix/blob/master/docs/en/latest/admin-api.md#route
   > > 
   > > 
   > > Does the `enable_websocket ` suitable for all requests ? My case is 
that, the major requests (for this route) are https and wss was used only when 
`Collaborative editing page` in confluence.
   > 
   > Does the `Collaborative editing page` stuff can be decoupled into a single 
route?
   
   They have the same host, but differ in `uri`
   


-- 
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 #3977: docs: add a placeholder for Eureka SD

2021-04-02 Thread GitBox


spacewander merged pull request #3977:
URL: https://github.com/apache/apisix/pull/3977


   


-- 
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 (dbd86f2 -> 807498e)

2021-04-02 Thread spacewander
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 dbd86f2  ci: bypass test if the change is doc only (#3950)
 add 807498e  docs: add a placeholder for Eureka SD (#3977)

No new revisions were added by this update.

Summary of changes:
 docs/en/latest/config.json | 3 ++-
 .../en/latest/discovery/eureka.md  | 7 +++
 2 files changed, 9 insertions(+), 1 deletion(-)
 copy ci/ASFLicenseHeaderMarkdown.txt => docs/en/latest/discovery/eureka.md 
(79%)


[GitHub] [apisix] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606125698



##
File path: apisix/plugins/ldap-auth.lua
##
@@ -0,0 +1,171 @@
+--
+-- 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.
+--
+local core = require("apisix.core")
+local ngx = ngx
+local ngx_re = require("ngx.re")
+local ipairs = ipairs
+local consumer_mod = require("apisix.consumer")
+local lualdap = require "lualdap"
+
+local lrucache = core.lrucache.new({
+ttl = 300, count = 512
+})
+local consumers_lrucache = core.lrucache.new({
+type = "plugin",
+})
+
+local schema = {
+type = "object",
+title = "work with route or service object",
+properties = {
+basedn = { type = "string" },
+ldapuri = { type = "string" },
+usetls = { type = "boolean" },
+uid = { type = "string" },
+auto_create_consumer = {type ="boolean"}
+},
+required = {"basedn","ldapuri"},
+additionalProperties = true,
+}
+
+local consumer_schema = {
+type = "object",
+title = "work with consumer object",
+properties = {
+userdn = { type = "string" },
+},
+required = {"userdn"},
+additionalProperties = false,
+}
+
+local plugin_name = "ldap-auth"
+
+local _M = {
+version = 0.1,
+priority = 2520,
+type = 'auth',
+name = plugin_name,
+schema = schema,
+consumer_schema = consumer_schema
+}
+
+function _M.check_schema(conf, schema_type)
+local ok, err
+if schema_type == core.schema.TYPE_CONSUMER then
+ok, err = core.schema.check(consumer_schema, conf)
+else
+ok, err = core.schema.check(schema, conf)
+end
+
+if not ok then
+return false, err
+end
+
+return true
+end
+
+local create_consume_cache
+do
+local consumer_names = {}
+
+function create_consume_cache(consumers)
+core.table.clear(consumer_names)
+
+for _, consumer in ipairs(consumers.nodes) do
+core.log.info("consumer node: ", core.json.delay_encode(consumer))
+consumer_names[consumer.auth_conf.userdn] = consumer
+end
+
+return consumer_names
+end
+
+end -- do
+
+local function extract_auth_header(authorization)
+local obj = { username = "", password = "" }
+
+local m, err = ngx.re.match(authorization, "Basic\\s(.+)", "jo")
+if err then
+-- error authorization
+return nil, err
+end
+
+local decoded = ngx.decode_base64(m[1])
+
+local res
+res, err = ngx_re.split(decoded, ":")
+if err then
+return nil, "split authorization err:" .. err
+end
+
+obj.username = ngx.re.gsub(res[1], "\\s+", "", "jo")
+obj.password = ngx.re.gsub(res[2], "\\s+", "", "jo")
+
+return obj, nil
+end
+
+function _M.rewrite(conf, ctx)
+core.log.info("plugin access phase, conf: ", core.json.delay_encode(conf))
+
+-- 1. extract authorization from header
+local auth_header = core.request.header(ctx, "Authorization")
+if not auth_header then
+core.response.set_header("WWW-Authenticate", "Basic realm='.'")
+return 401, { message = "Missing authorization in request" }
+end
+
+local user, err = extract_auth_header(auth_header)
+if err then
+return 401, { message = err }
+end
+
+-- 2. try authenticate the user against the ldap server
+local uid = "cn"
+if conf.uid then 
+uid = conf.uid
+end
+local userdn =  uid .. "=" .. user.username .. "," .. conf.basedn
+local ld = lualdap.open_simple (conf.ldapuri, userdn, user.password, 
conf.usetls)
+if not ld then
+return 401, { message = "Invalid user authorization" }
+end
+
+-- 3. Retreive consumer for authorization plugin
+if conf.auto_create_consumer then 

Review comment:
   Ok remove this feature .
   It was more to act like the oidc plugin , that does not require a consumer 
to be created , but i see your point




-- 
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] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606125393



##
File path: apisix/plugins/ldap-auth.lua
##
@@ -0,0 +1,171 @@
+--
+-- 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.
+--
+local core = require("apisix.core")
+local ngx = ngx
+local ngx_re = require("ngx.re")
+local ipairs = ipairs
+local consumer_mod = require("apisix.consumer")
+local lualdap = require "lualdap"
+
+local lrucache = core.lrucache.new({
+ttl = 300, count = 512
+})
+local consumers_lrucache = core.lrucache.new({
+type = "plugin",
+})
+
+local schema = {
+type = "object",
+title = "work with route or service object",
+properties = {
+basedn = { type = "string" },
+ldapuri = { type = "string" },
+usetls = { type = "boolean" },
+uid = { type = "string" },
+auto_create_consumer = {type ="boolean"}
+},
+required = {"basedn","ldapuri"},
+additionalProperties = true,
+}
+
+local consumer_schema = {
+type = "object",
+title = "work with consumer object",
+properties = {
+userdn = { type = "string" },
+},
+required = {"userdn"},
+additionalProperties = false,
+}
+
+local plugin_name = "ldap-auth"
+
+local _M = {
+version = 0.1,
+priority = 2520,
+type = 'auth',
+name = plugin_name,
+schema = schema,
+consumer_schema = consumer_schema
+}
+
+function _M.check_schema(conf, schema_type)
+local ok, err
+if schema_type == core.schema.TYPE_CONSUMER then
+ok, err = core.schema.check(consumer_schema, conf)
+else
+ok, err = core.schema.check(schema, conf)
+end
+
+if not ok then

Review comment:
   Ok added




-- 
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] jp-gouin commented on a change in pull request #3894: feat: Add ldap-auth plugin

2021-04-02 Thread GitBox


jp-gouin commented on a change in pull request #3894:
URL: https://github.com/apache/apisix/pull/3894#discussion_r606125130



##
File path: docs/en/latest/plugins/ldap-auth.md
##
@@ -0,0 +1,152 @@
+---
+title: ldap-auth
+---
+
+
+
+## Summary
+
+- [**Name**](#name)
+- [**Attributes**](#attributes)
+- [**How To Enable**](#how-to-enable)
+- [**Test Plugin**](#test-plugin)
+- [**Disable Plugin**](#disable-plugin)
+
+## Name
+
+`ldap-auth` is an authentication plugin that can works with `consumer`. Add 
Ldap Authentication to a `service` or `route`.
+
+The `consumer` then authenticate against the Ldap server using Basic 
authentication.

Review comment:
   Yes corrected 




-- 
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-docker] juzhiyuan merged pull request #157: chore: dashboard release 2.5

2021-04-02 Thread GitBox


juzhiyuan merged pull request #157:
URL: https://github.com/apache/apisix-docker/pull/157


   


-- 
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-docker] branch master updated: chore: dashboard release 2.5 (#157)

2021-04-02 Thread juzhiyuan
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
 new 159f585  chore: dashboard release 2.5 (#157)
159f585 is described below

commit 159f585e59fdb7ff664ee26ac60e802fc8373bc6
Author: kv 
AuthorDate: Fri Apr 2 15:56:56 2021 +0800

chore: dashboard release 2.5 (#157)
---
 .github/workflows/dashboard-docker-test.yaml | 2 +-
 Makefile | 2 +-
 dashboard/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dashboard-docker-test.yaml 
b/.github/workflows/dashboard-docker-test.yaml
index 96f93d0..8425b8f 100644
--- a/.github/workflows/dashboard-docker-test.yaml
+++ b/.github/workflows/dashboard-docker-test.yaml
@@ -13,7 +13,7 @@ jobs:
 name: build dashboard & test
 runs-on: ubuntu-latest
 env:
-  APISIX_DASHBOARD_TAG: 2.4
+  APISIX_DASHBOARD_TAG: 2.5
 steps:
   - name: Checkout
 uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 1488a5a..a31467e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ APISIX_VERSION ?= 2.4
 IMAGE_NAME = apache/apisix
 IMAGE_TAR_NAME = apache_apisix
 
-APISIX_DASHBOARD_VERSION ?= 2.4
+APISIX_DASHBOARD_VERSION ?= 2.5
 APISIX_DASHBOARD_IMAGE_NAME = apache/apisix-dashboard
 APISIX_DASHBOARD_IMAGE_TAR_NAME = apache_apisix_dashboard
 
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index 296678e..d6f8c76 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -16,7 +16,7 @@
 #
 FROM alpine:latest as pre-build
 
-ARG APISIX_DASHBOARD_VERSION=v2.4
+ARG APISIX_DASHBOARD_VERSION=release/2.5
 
 RUN set -x \
 && apk add --no-cache --virtual .builddeps git \


[GitHub] [apisix] juzhiyuan commented on a change in pull request #3977: docs: add a placeholder for Eureka SD

2021-04-02 Thread GitBox


juzhiyuan commented on a change in pull request #3977:
URL: https://github.com/apache/apisix/pull/3977#discussion_r606117834



##
File path: docs/en/latest/discovery/eureka.md
##
@@ -0,0 +1,25 @@
+---
+title: eureka
+---
+
+
+
+APISIX supports service discovery via Eureka. For the details, please start 
your

Review comment:
   ```suggestion
   Apache APISIX supports service discovery via Eureka. For the details, please 
start your
   ```




-- 
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 #3977: docs: add a placeholder for Eureka SD

2021-04-02 Thread GitBox


spacewander opened a new pull request #3977:
URL: https://github.com/apache/apisix/pull/3977


   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] zwjzxh520 edited a comment on issue #3903: request help: Accessing ctx.var.upstream_uri in global rule causes failure of proxy-rewrite

2021-04-02 Thread GitBox


zwjzxh520 edited a comment on issue #3903:
URL: https://github.com/apache/apisix/issues/3903#issuecomment-812387306


   懂了,难怪我一直在 #3914 里找不到修复的源码,只看到增加的测试用例。谢谢


-- 
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] zwjzxh520 commented on issue #3903: request help: Accessing ctx.var.upstream_uri in global rule causes failure of proxy-rewrite

2021-04-02 Thread GitBox


zwjzxh520 commented on issue #3903:
URL: https://github.com/apache/apisix/issues/3903#issuecomment-812387306


   懂了,难道我一直在 #3914 里找不到修复的源码,只看到增加的测试用例。谢谢


-- 
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-ingress-controller] branch master updated: fix: add name field when create route and upstream (#333)

2021-04-02 Thread tokers
This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 2cc9c76  fix: add name field when create route and upstream (#333)
2cc9c76 is described below

commit 2cc9c7618cac6094c00bf152649f2c5f98bfa9e7
Author: okaybase <75366457+okayb...@users.noreply.github.com>
AuthorDate: Fri Apr 2 15:28:56 2021 +0800

fix: add name field when create route and upstream (#333)

Co-authored-by: lixingwang 
Co-authored-by: Alex Zhang 
---
 pkg/apisix/resource.go  |  2 ++
 pkg/apisix/route.go |  6 ++
 pkg/apisix/upstream.go  |  3 +++
 test/e2e/ingress/resourcepushing.go | 42 +
 test/e2e/scaffold/k8s.go|  5 +
 5 files changed, 58 insertions(+)

diff --git a/pkg/apisix/resource.go b/pkg/apisix/resource.go
index 7dadb3e..8808788 100644
--- a/pkg/apisix/resource.go
+++ b/pkg/apisix/resource.go
@@ -76,6 +76,7 @@ type routeItem struct {
UpstreamId string `json:"upstream_id"`
ServiceId  string `json:"service_id"`
Host   string `json:"host"`
+   Hosts  []string   `json:"hosts"`
URIstring `json:"uri"`
Vars   [][]v1.StringOrSlice   `json:"vars"`
Uris   []string   `json:"uris"`
@@ -115,6 +116,7 @@ func (i *item) route(clusterName string) (*v1.Route, error) 
{
UpstreamId: route.UpstreamId,
ServiceId:  route.ServiceId,
Plugins:route.Plugins,
+   Hosts:  route.Hosts,
Priority:   route.Priority,
}, nil
 }
diff --git a/pkg/apisix/route.go b/pkg/apisix/route.go
index 5d3ab20..551e1b7 100644
--- a/pkg/apisix/route.go
+++ b/pkg/apisix/route.go
@@ -30,11 +30,13 @@ import (
 
 type routeReqBody struct {
Desc   string   `json:"desc,omitempty"`
+   Name   string   `json:"name,omitempty"`
URIstring   `json:"uri,omitempty"`
Priority   int  `json:"priority,omitempty"`
Uris   []string `json:"uris,omitempty"`
Vars   [][]v1.StringOrSlice `json:"vars,omitempty"`
Host   string   `json:"host,omitempty"`
+   Hosts  []string `json:"hosts,omitempty"`
ServiceId  string   `json:"service_id,omitempty"`
UpstreamId string   `json:"upstream_id,omitempty"`
Pluginsv1.Plugins   `json:"plugins,omitempty"`
@@ -162,8 +164,10 @@ func (r *routeClient) Create(ctx context.Context, obj 
*v1.Route) (*v1.Route, err
data, err := json.Marshal(routeReqBody{
Priority:   obj.Priority,
Desc:   obj.Name,
+   Name:   obj.Name,
URI:obj.Path,
Host:   obj.Host,
+   Hosts:  obj.Hosts,
ServiceId:  obj.ServiceId,
UpstreamId: obj.UpstreamId,
Uris:   obj.Uris,
@@ -231,7 +235,9 @@ func (r *routeClient) Update(ctx context.Context, obj 
*v1.Route) (*v1.Route, err
body, err := json.Marshal(routeReqBody{
Priority:  obj.Priority,
Desc:  obj.Name,
+   Name:  obj.Name,
Host:  obj.Host,
+   Hosts: obj.Hosts,
URI:   obj.Path,
ServiceId: obj.ServiceId,
Plugins:   obj.Plugins,
diff --git a/pkg/apisix/upstream.go b/pkg/apisix/upstream.go
index bb1077a..826f725 100644
--- a/pkg/apisix/upstream.go
+++ b/pkg/apisix/upstream.go
@@ -67,6 +67,7 @@ type upstreamReqBody struct {
Key string  `json:"key,omitempty"`
Nodes   upstreamNodes   `json:"nodes"`
Descstring  `json:"desc"`
+   Namestring  `json:"name"`
Scheme  string  `json:"scheme,omitempty"`
Retries int `json:"retries,omitempty"`
Timeout *v1.UpstreamTimeout `json:"timeout,omitempty"`
@@ -199,6 +200,7 @@ func (u *upstreamClient) Create(ctx context.Context, obj 
*v1.Upstream) (*v1.Upst
Key: obj.Key,
Nodes:   nodes,
Desc:obj.Name,
+   Name:obj.Name,
Scheme:  obj.Scheme,
Checks:  obj.Checks,
Retries: obj.Retries,
@@ -278,6 +280,7 @@ func (u *upstreamClient) Update(ctx context.Context, obj 
*v1.Upstream) (*v1.Upst
Key:obj.Key,
Nodes:  nodes,
Desc:   obj.Name,
+   Name:   obj.Name,
})
if err != 

[GitHub] [apisix-ingress-controller] tokers merged pull request #333: fix: add name field when create route and upstream

2021-04-02 Thread GitBox


tokers merged pull request #333:
URL: https://github.com/apache/apisix-ingress-controller/pull/333


   


-- 
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 #3950: ci: bypass test if the change is doc only

2021-04-02 Thread GitBox


spacewander merged pull request #3950:
URL: https://github.com/apache/apisix/pull/3950


   


-- 
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: ci: bypass test if the change is doc only (#3950)

2021-04-02 Thread spacewander
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 dbd86f2  ci: bypass test if the change is doc only (#3950)
dbd86f2 is described below

commit dbd86f2ad4b8430185a0bdb4187ea52e9cd8abeb
Author: 罗泽轩 
AuthorDate: Fri Apr 2 15:26:24 2021 +0800

ci: bypass test if the change is doc only (#3950)

Signed-off-by: spacewander 
---
 .github/workflows/build.yml   | 4 
 .github/workflows/centos7-ci.yml  | 4 
 .github/workflows/chaos.yml   | 7 ++-
 .github/workflows/fuzzing-ci.yaml | 4 
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f577ab8..44bddf9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,8 +3,12 @@ name: CI
 on:
   push:
 branches: [master, 'release/**']
+paths-ignore:
+  - 'docs/**'
   pull_request:
 branches: [master]
+paths-ignore:
+  - 'docs/**'
 
 jobs:
   build:
diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 4f99fd3..3dc5d96 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -3,8 +3,12 @@ name: CI Centos7
 on:
   push:
 branches: [master, 'release/**']
+paths-ignore:
+  - 'docs/**'
   pull_request:
 branches: [master]
+paths-ignore:
+  - 'docs/**'
 
 jobs:
   test_apisix:
diff --git a/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
index e4447b2..867160b 100644
--- a/.github/workflows/chaos.yml
+++ b/.github/workflows/chaos.yml
@@ -1,6 +1,11 @@
 name: Chaos Test
 
-on: [pull_request]
+on:
+  pull_request:
+branches:
+  - master
+paths-ignore:
+  - 'docs/**'
 
 jobs:
   chaos-test:
diff --git a/.github/workflows/fuzzing-ci.yaml 
b/.github/workflows/fuzzing-ci.yaml
index 58c2b37..9da05af 100644
--- a/.github/workflows/fuzzing-ci.yaml
+++ b/.github/workflows/fuzzing-ci.yaml
@@ -4,9 +4,13 @@ on:
   push:
 branches:
   - master
+paths-ignore:
+  - 'docs/**'
   pull_request:
 branches:
   - master
+paths-ignore:
+  - 'docs/**'
 
 jobs:
   test_apisix:


[GitHub] [apisix] juzhiyuan commented on a change in pull request #3950: ci: bypass test if the change is doc only

2021-04-02 Thread GitBox


juzhiyuan commented on a change in pull request #3950:
URL: https://github.com/apache/apisix/pull/3950#discussion_r606110126



##
File path: .github/workflows/build.yml
##
@@ -3,8 +3,12 @@ name: CI
 on:
   push:
 branches: [master, 'release/**']
+paths-ignore:

Review comment:
   @LiteSun Dashboard could use this way, too 




-- 
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 #3903: request help: Accessing ctx.var.upstream_uri in global rule causes failure of proxy-rewrite

2021-04-02 Thread GitBox


Firstsawyou commented on issue #3903:
URL: https://github.com/apache/apisix/issues/3903#issuecomment-812377486


   Hi, @zwjzxh520 
   @spacewander  provides two solutions, you can refer to the following:
   
   Method one: use `ngx.var`  instead `ctx.var`, for example: 
`ngx.var.upstream_uri` .  For detailed examples, you can refer to #3914 
   
   Method two:  use a new way to cache ctx.var: #3915
   


-- 
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 #3976: ci: fix broken misspell check

2021-04-02 Thread GitBox


spacewander opened a new pull request #3976:
URL: https://github.com/apache/apisix/pull/3976


   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 closed issue #3975: request help: Is there a plugin that can limit the tcp connection?

2021-04-02 Thread GitBox


spacewander closed issue #3975:
URL: https://github.com/apache/apisix/issues/3975


   


-- 
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 #3975: request help: Is there a plugin that can limit the tcp connection?

2021-04-02 Thread GitBox


spacewander commented on issue #3975:
URL: https://github.com/apache/apisix/issues/3975#issuecomment-812371279


   No


-- 
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] zwjzxh520 commented on issue #3903: request help: Accessing ctx.var.upstream_uri in global rule causes failure of proxy-rewrite

2021-04-02 Thread GitBox


zwjzxh520 commented on issue #3903:
URL: https://github.com/apache/apisix/issues/3903#issuecomment-812368163


   @Firstsawyou 你好,请问这个问题怎么修复呢?


-- 
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 #3974: Enhance the documentation of echo plugin

2021-04-02 Thread GitBox


spacewander commented on issue #3974:
URL: https://github.com/apache/apisix/issues/3974#issuecomment-812361447


   I dig into the history, looks like we can remove this field.
   It is used to demonstrate how to take advantage of the access phase.


-- 
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 #3556: feat: support rewrite HTTP method

2021-04-02 Thread GitBox


spacewander commented on a change in pull request #3556:
URL: https://github.com/apache/apisix/pull/3556#discussion_r606101677



##
File path: t/plugin/proxy-rewrite.t
##
@@ -1370,3 +1370,100 @@ host: test.com:6443
 x-real-ip: 127.0.0.1
 --- no_error_log
 [error]
+
+
+
+=== TEST 47: set route(rewrite HTTP method)
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+"methods": ["GET"],
+"plugins": {
+"proxy-rewrite": {
+"method": "POST"
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/hello"

Review comment:
   We need to add a new method in 
`https://github.com/apache/apisix/blob/master/t/lib/server.lua` to echo the 
proxied HTTP method and check the response




-- 
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] okaybase commented on pull request #333: fix: add name field when create route and upstream

2021-04-02 Thread GitBox


okaybase commented on pull request #333:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/333#issuecomment-812358907


   @tokers thanks very much for your test cases and help! :smile: 


-- 
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] silveric10 opened a new issue #3975: request help: Is there a plugin that can limit the tcp connection?

2021-04-02 Thread GitBox


silveric10 opened a new issue #3975:
URL: https://github.com/apache/apisix/issues/3975


   ### Issue description
   I learned that Limit-req, Limit-count and Limit-concurrency are all used to 
limit the http request count, but is there a plugin that can limit the tcp 
connection? Thank you.
   
   ### Environment
   
   * apisix version (cmd: `apisix version`):
   * OS (cmd: `uname -a`):
   * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`):
   * etcd version, if have (cmd: run `curl 
http://127.0.0.1:9090/v1/server_info` to get the info from server-info API):
   * apisix-dashboard version, if have:
   


-- 
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] tokers opened a new pull request #336: test: add test cases for echo plugin

2021-04-02 Thread GitBox


tokers opened a new pull request #336:
URL: https://github.com/apache/apisix-ingress-controller/pull/336


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [ ] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   
   ___
   ### Bugfix
   - Description
   
   - How to fix?
   
   ___
   ### New feature or improvement
   - Describe the details and related test reports.
   
   ___
   ### Backport patches
   - Why need to backport?
   
   - Source branch
   
   - Related commits and pull requests
   
   - Target branch
   


-- 
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 pull request #3556: feat: support rewrite HTTP method

2021-04-02 Thread GitBox


Firstsawyou commented on pull request #3556:
URL: https://github.com/apache/apisix/pull/3556#issuecomment-812352732


   @spacewander  @tokers  When you are free, please take a look at this PR.


-- 
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] tokers opened a new issue #3974: Enhance the documentation of echo plugin

2021-04-02 Thread GitBox


tokers opened a new issue #3974:
URL: https://github.com/apache/apisix/issues/3974


   # Improve Docs
   
   ## Please describe which part of docs should be improved or typo fixed
   
   
![image](https://user-images.githubusercontent.com/10428333/113387894-c2baf100-93bf-11eb-8a94-933b2e482f80.png)
   
   The descriptions for `auth_value` are obscure, it doesn't really explain 
what is `auth_value`, also, related usage about `auth_value` is missing.
   
   A clear and concise description of what you want and what your use case is.
   
   Add elaborate descriptions for `auth_value` and prepare some examples.
   
   ## Describe the solution you'd like
   
   A clear and concise description of what you want to happen.
   


-- 
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] Firstsawyou commented on issue #335: add e2e test cases for request-rewrite plugin

2021-04-02 Thread GitBox


Firstsawyou commented on issue #335:
URL: 
https://github.com/apache/apisix-ingress-controller/issues/335#issuecomment-812347979


   > @Firstsawyou
   
   It looks great, let me try 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] zwjzxh520 commented on issue #3903: request help: Accessing ctx.var.upstream_uri in global rule causes failure of proxy-rewrite

2021-04-02 Thread GitBox


zwjzxh520 commented on issue #3903:
URL: https://github.com/apache/apisix/issues/3903#issuecomment-812347987


   臣附议


-- 
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] tokers commented on issue #335: add e2e test cases for request-rewrite plugin

2021-04-02 Thread GitBox


tokers commented on issue #335:
URL: 
https://github.com/apache/apisix-ingress-controller/issues/335#issuecomment-812344677


   @Firstsawyou 


-- 
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] codecov-io edited a comment on pull request #333: fix: add name field when create route and upstream

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #333:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/333#issuecomment-812295318


   # 
[Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=h1)
 Report
   > Merging 
[#333](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=desc)
 (44641ed) into 
[master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/80062976ab9bed2c147f1ad7812a003af02e96ff?el=desc)
 (8006297) will **decrease** coverage by `0.36%`.
   > The diff coverage is `100.00%`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/graphs/tree.svg?width=650=150=pr=WPLQXPY3V0)](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master #333  +/-   ##
   ==
   - Coverage   43.72%   43.36%   -0.37% 
   ==
 Files  40   39   -1 
 Lines3428 3434   +6 
   ==
   - Hits 1499 1489  -10 
   - Misses   1761 1775  +14 
   - Partials  168  170   +2 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=tree)
 | Coverage Δ | |
   |---|---|---|
   | 
[pkg/apisix/resource.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC9yZXNvdXJjZS5nbw==)
 | `78.43% <100.00%> (+0.21%)` | :arrow_up: |
   | 
[pkg/apisix/route.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC9yb3V0ZS5nbw==)
 | `43.47% <100.00%> (-0.48%)` | :arrow_down: |
   | 
[pkg/apisix/upstream.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC91cHN0cmVhbS5nbw==)
 | `46.85% <100.00%> (+0.61%)` | :arrow_up: |
   | 
[pkg/apisix/cluster.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC9jbHVzdGVyLmdv)
 | `28.44% <0.00%> (-5.97%)` | :arrow_down: |
   | 
[test/e2e/e2e.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-dGVzdC9lMmUvZTJlLmdv)
 | | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=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-ingress-controller/pull/333?src=pr=footer).
 Last update 
[8006297...44641ed](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=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-ingress-controller] tokers opened a new issue #335: add e2e test cases for request-rewrite plugin

2021-04-02 Thread GitBox


tokers opened a new issue #335:
URL: https://github.com/apache/apisix-ingress-controller/issues/335


   See https://github.com/apache/apisix-ingress-controller/issues/321 for more 
details.


-- 
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] tokers commented on pull request #333: fix: add name field when create route and upstream

2021-04-02 Thread GitBox


tokers commented on pull request #333:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/333#issuecomment-812343792


   @okaybase Thanks for your contribution. I added some test cases for your 
changes, you may look through 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-ingress-controller] codecov-io edited a comment on pull request #333: fix: add name field when create route and upstream

2021-04-02 Thread GitBox


codecov-io edited a comment on pull request #333:
URL: 
https://github.com/apache/apisix-ingress-controller/pull/333#issuecomment-812295318


   # 
[Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=h1)
 Report
   > Merging 
[#333](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=desc)
 (d083e12) into 
[master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/80062976ab9bed2c147f1ad7812a003af02e96ff?el=desc)
 (8006297) will **decrease** coverage by `0.41%`.
   > The diff coverage is `100.00%`.
   
   > :exclamation: Current head d083e12 differs from pull request most recent 
head 44641ed. Consider uploading reports for the commit 44641ed to get more 
accurate results
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/graphs/tree.svg?width=650=150=pr=WPLQXPY3V0)](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master #333  +/-   ##
   ==
   - Coverage   43.72%   43.31%   -0.42% 
   ==
 Files  40   39   -1 
 Lines3428 3431   +3 
   ==
   - Hits 1499 1486  -13 
   - Misses   1761 1775  +14 
   - Partials  168  170   +2 
   ```
   
   
   | [Impacted 
Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=tree)
 | Coverage Δ | |
   |---|---|---|
   | 
[pkg/apisix/route.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC9yb3V0ZS5nbw==)
 | `42.76% <100.00%> (-1.19%)` | :arrow_down: |
   | 
[pkg/apisix/upstream.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC91cHN0cmVhbS5nbw==)
 | `46.85% <100.00%> (+0.61%)` | :arrow_up: |
   | 
[pkg/apisix/cluster.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-cGtnL2FwaXNpeC9jbHVzdGVyLmdv)
 | `28.44% <0.00%> (-5.97%)` | :arrow_down: |
   | 
[test/e2e/e2e.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333/diff?src=pr=tree#diff-dGVzdC9lMmUvZTJlLmdv)
 | | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=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-ingress-controller/pull/333?src=pr=footer).
 Last update 
[8006297...44641ed](https://codecov.io/gh/apache/apisix-ingress-controller/pull/333?src=pr=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




  1   2   >