[GitHub] [apisix] iamayushdas commented on pull request #3768: docs: fixed powered-by link

2021-03-05 Thread GitBox


iamayushdas commented on pull request #3768:
URL: https://github.com/apache/apisix/pull/3768#issuecomment-791885541


   @juzhiyuan review 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] nic-chen commented on pull request #1557: feat: sync fields of `upstream` from APISIX

2021-03-05 Thread GitBox


nic-chen commented on pull request #1557:
URL: https://github.com/apache/apisix-dashboard/pull/1557#issuecomment-791850533


   should add some more test cases for it, will update 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




[GitHub] [apisix-dashboard] nic-chen commented on pull request #1557: feat: sync fields of `upstream` from APISIX

2021-03-05 Thread GitBox


nic-chen commented on pull request #1557:
URL: https://github.com/apache/apisix-dashboard/pull/1557#issuecomment-791850425


   > Hi, please have a search at how many fields are mismatched between 
manager-api and admin-api, and sync them ASAP. This is needed to replace 
admin-api.
   
   This is all the fields that need to be synchronized for the resources that 
are already in use.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1556: feat: rewrite e2e test(route_with_vars_test) with ginkgo

2021-03-05 Thread GitBox


Jaycean commented on a change in pull request #1556:
URL: https://github.com/apache/apisix-dashboard/pull/1556#discussion_r588803930



##
File path: api/test/e2enew/route/route_with_vars_test.go
##
@@ -0,0 +1,325 @@
+/*
+ * 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 route
+
+import (
+   "encoding/json"
+   "net/http"
+
+   "github.com/onsi/ginkgo"
+   "github.com/stretchr/testify/assert"
+
+   "e2enew/base"
+)
+
+var upstream map[string]interface{} = map[string]interface{}{
+   "type": "roundrobin",
+   "nodes": []map[string]interface{}{
+   {
+   "host":   base.UpstreamIp,
+   "port":   1980,
+   "weight": 1,
+   },
+   },
+}
+
+var _ = ginkgo.Describe("test route with vars (args)", func() {
+   ginkgo.It("add route with vars (args)", func() {
+   t := ginkgo.GinkgoT()
+   var createRouteBody map[string]interface{} = 
map[string]interface{}{
+   "uri": "/hello",
+   "vars": [][]string{
+   {"arg_name", "==", "aaa"},
+   },
+   "upstream": upstream,
+   }
+   _createRouteBody, err := json.Marshal(createRouteBody)
+   assert.Nil(t, err)
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.ManagerApiExpect(),
+   Method:   http.MethodPut,
+   Path: "/apisix/admin/routes/r1",
+   Body: string(_createRouteBody),
+   Headers:  map[string]string{"Authorization": 
base.GetToken()},
+   ExpectStatus: http.StatusOK,
+   })
+   })
+   ginkgo.It("hit the route with right args", func() {
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.APISIXExpect(),
+   Method:   http.MethodGet,
+   Path: `/hello`,
+   Query:"name=aaa",
+   ExpectStatus: http.StatusOK,
+   Sleep:base.SleepTime,
+   })
+   })
+   ginkgo.It("hit the route with wrong args", func() {
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.APISIXExpect(),
+   Method:   http.MethodGet,
+   Path: `/hello`,
+   Query:"name=bbb",
+   ExpectStatus: http.StatusNotFound,
+   Sleep:base.SleepTime,
+   })
+   })
+   ginkgo.It("hit the route with no args", func() {
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.APISIXExpect(),
+   Method:   http.MethodGet,
+   Path: `/hello`,
+   ExpectStatus: http.StatusNotFound,
+   Sleep:base.SleepTime,
+   })
+   })
+
+   ginkgo.It("update route with vars (header)", func() {
+   t := ginkgo.GinkgoT()
+   var createRouteBody map[string]interface{} = 
map[string]interface{}{
+   "uri": "/hello",
+   "vars": [][]string{
+   {"http_k", "==", "header"},
+   },
+   "upstream": upstream,
+   }
+   _createRouteBody, err := json.Marshal(createRouteBody)
+   assert.Nil(t, err)
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.ManagerApiExpect(),
+   Method:   http.MethodPut,
+   Path: "/apisix/admin/routes/r1",
+   Body: string(_createRouteBody),
+   Headers:  map[string]string{"Authorization": 
base.GetToken()},
+   ExpectStatus: http.StatusOK,
+   })
+   })
+   ginkgo.It("hit the route with right 

[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1556: feat: rewrite e2e test(route_with_vars_test) with ginkgo

2021-03-05 Thread GitBox


Jaycean commented on a change in pull request #1556:
URL: https://github.com/apache/apisix-dashboard/pull/1556#discussion_r588803895



##
File path: api/test/e2enew/route/route_with_vars_test.go
##
@@ -0,0 +1,325 @@
+/*
+ * 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 route
+
+import (
+   "encoding/json"
+   "net/http"
+
+   "github.com/onsi/ginkgo"
+   "github.com/stretchr/testify/assert"
+
+   "e2enew/base"
+)
+
+var upstream map[string]interface{} = map[string]interface{}{
+   "type": "roundrobin",
+   "nodes": []map[string]interface{}{
+   {
+   "host":   base.UpstreamIp,
+   "port":   1980,
+   "weight": 1,
+   },
+   },
+}
+
+var _ = ginkgo.Describe("test route with vars (args)", func() {
+   ginkgo.It("add route with vars (args)", func() {
+   t := ginkgo.GinkgoT()
+   var createRouteBody map[string]interface{} = 
map[string]interface{}{
+   "uri": "/hello",
+   "vars": [][]string{
+   {"arg_name", "==", "aaa"},
+   },
+   "upstream": upstream,
+   }
+   _createRouteBody, err := json.Marshal(createRouteBody)
+   assert.Nil(t, err)
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.ManagerApiExpect(),
+   Method:   http.MethodPut,
+   Path: "/apisix/admin/routes/r1",
+   Body: string(_createRouteBody),
+   Headers:  map[string]string{"Authorization": 
base.GetToken()},
+   ExpectStatus: http.StatusOK,
+   })
+   })
+   ginkgo.It("hit the route with right args", func() {
+   base.RunTestCase(base.HttpTestCase{
+   Object:   base.APISIXExpect(),
+   Method:   http.MethodGet,
+   Path: `/hello`,
+   Query:"name=aaa",
+   ExpectStatus: http.StatusOK,
+   Sleep:base.SleepTime,

Review comment:
   done.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix] iamayushdas opened a new pull request #3768: docs: fixed powered-by link

2021-03-05 Thread GitBox


iamayushdas opened a new pull request #3768:
URL: https://github.com/apache/apisix/pull/3768


   ### 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?
   * [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] juzhiyuan commented on a change in pull request #3693: feat: add Spanish translation of the FAQ

2021-03-05 Thread GitBox


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



##
File path: docs/es/latest/FAQ.md
##
@@ -0,0 +1,357 @@
+
+
+# PREGUNTAS FRECUENTES
+
+## ¿Por qué un nuevo portal API?
+
+Existen nuevos requerimientos para los portales API en el campo de los 
microservicios: mayor flexibilidad, requerimientos de desempeño más elevados y 
origen (native) en la nube.
+
+## ¿Cuáles son las diferencias entre APISIX y otros portales API?
+
+APISIX está basado en etcd para guardar y sincronizar la configuración, no en 
bases de datos relacionales tales como Postgres o MySQL.
+
+Esto no solamente elimina el recabado de información (polling) y hace el 
código más conciso, sino también hace que la sincronización de la configuración 
se haga más en tiempo real. Al mismo tiempo, no habrá un punto único en el 
sistema, lo que resulta más útil.
+
+Adicionalmente, APISIX tiene un enrutado dinámico y carga en caliente de los 
plug-ins, lo que es especialmente aplicable al manejo de API bajo sistemas de 
micro-servicios.
+
+## ¿Cómo es el desempeño de APISIX?
+
+Uno de los objetivos del diseño y desarrollo de APISIX es lograr el más 
elevado desempeño en la industria. Datos de las pruebas específicas pueden 
consultarse aquí:[banco de pruebas - 
benchmark](https://github.com/apache/apisix/blob/master/doc/benchmark.md)
+
+APISIX es el portal API de mayor desempeño; con un QPS de un solo núcleo logra 
23,000, con un retardo promedio de solamente 0.6 milisegundos.
+
+## ¿Tiene APISIX un interfase de cónsola?
+
+Sí, en la versión 0.6 contamos con un tablero incorporado, y usted puede 
operar APISIX a través de la interfase web.
+
+## ¿Puedo escribir mi propio plugin?
+
+Por supuesto, APISIX provee plugins personalizados y flexibles para que los 
desarrolladores y las empresas escriban sus propios programas.
+
+[Cómo escribir un plug-in](doc/plugin-develop.md)
+
+## ¿Por qué elegimos etcd como el centro de la configuración?
+
+Para el centro de la configuración, la configuración del almacenamiento es 
solamente la función más básica, y APISIX necesita también las siguientes 
prestaciones:
+
+1. Grupos (Cluster)
+2. Transacciones
+3. Control de concurrencia multi-versión
+4. Notificación de cambios
+5. Alto rendimiento
+
+Más información en [Por qué 
etcd](https://github.com/etcd-io/etcd/blob/master/Documentation/learning/why.md#comparison-chart).
+
+## ¿Por qué sucede que instalar dependencias APISIX con Luarocks provoca 
interrupciones por exceso de tiempo (timeout), o instalaciones lentas y 
fallidas?
+
+Existen dos posibilidades cuando encontramos Luarocks muy lentos:
+
+1. El servidor usado para instalar Luarocks está bloqueado
+2. En algún punto entre su red y el servidor de github se bloquea el protocolo 
'git'
+
+Para el primer problema usted puede usar https_proxy o usar la opción 
`--server` para especificar un servidor de Luarocks al que usted pueda acceder 
con mayor velocidad.
+Ejecute el comando `luarocks config rocks_servers` (este comando es soportado 
por versiones posteriores a luarocks 3.0) para ver qué servidores están 
disponibles.
+
+Si usar un proxy no resuelve este problema, usted puede agregar la opción 
`--verbose` durante la instalación para ver qué tan lento está. Excluyendo el 
primer caso, solamente en el segundo, cuando el protocolo `git` está bloqueado, 
podemos ejecutar `git config --global url."https://".insteadOf git://` para 
usar el protocolo 'HTTPS' en lugar de `git`.
+
+## ¿Cómo se soporta un lanzamiento en etapa "gray release" (lanzamiento gris) 
a través de APISIX?
+
+Un ejemplo, `foo.com/product/index.html?id=204=2`, lanzamiento gris (gray 
release) basado en `id` en la cadena de consulta (query string) en URL como una 
condición:
+
+1. Grupo A:id <= 1000
+2. Grupo B:id > 1000
+
+Hay dos formas diferentes de hacer esto:
+
+1. Usar el campo `vars` de la ruta para hacerlo.
+
+```shell
+curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: 
edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+"uri": "/index.html",
+"vars": [
+["arg_id", "<=", "1000"]
+],
+"plugins": {
+"redirect": {
+"uri": "/test?group_id=1"
+}
+}
+}'
+
+curl -i http://127.0.0.1:9080/apisix/admin/routes/2 -H 'X-API-KEY: 
edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
+{
+"uri": "/index.html",
+"vars": [
+["arg_id", ">", "1000"]
+],
+"plugins": {
+"redirect": {
+"uri": "/test?group_id=2"
+}
+}
+}'
+```
+
+Aquí encontramos la lista de operadores del `lua-resty-radixtree` actual:
+https://github.com/iresty/lua-resty-radixtree#operator-list
+
+2. Usar el plug-in `traffic-split` para hacerlo.
+
+Por favor consultar la documentación de plug-in 
[traffic-split.md](doc/plugins/traffic-split.md) para ver ejemplos de uso.

Review comment:
   Hi, I noticed that there have some outdated paths, we could use 
something like 

[GitHub] [apisix] juzhiyuan commented on issue #3726: [Discuss] standardize release guide & branch/tag relations

2021-03-05 Thread GitBox


juzhiyuan commented on issue #3726:
URL: https://github.com/apache/apisix/issues/3726#issuecomment-791806494


   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] Yiyiyimu commented on issue #3726: [Discuss] standardize release guide & branch/tag relations

2021-03-05 Thread GitBox


Yiyiyimu commented on issue #3726:
URL: https://github.com/apache/apisix/issues/3726#issuecomment-791649138


   > Hi, any conclusion here? 
   
   Hi I think I could follow the proposal and try to update the release guide 
this weekend~



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 #1560: feat: rewrite e2e test(route-with-valid-remote-addr-test) with ginkgo

2021-03-05 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1560?src=pr=h1) 
Report
   > Merging 
[#1560](https://codecov.io/gh/apache/apisix-dashboard/pull/1560?src=pr=desc) 
(0f4e463) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/9130e09837f7e6283ba4645fab5c482b18a61949?el=desc)
 (9130e09) will **increase** coverage by `3.05%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1560?src=pr=tree)
   
   ```diff
   @@Coverage Diff @@
   ##   master#1560  +/-   ##
   ==
   + Coverage   70.18%   73.24%   +3.05% 
   ==
 Files 130   86  -44 
 Lines5340 2321-3019 
 Branches  549  583  +34 
   ==
   - Hits 3748 1700-2048 
   + Misses   1344  621 -723 
   + Partials  2480 -248 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `?` | |
   | backend-unit-test | `?` | |
   | frontend-e2e-test | `73.24% <ø> (+1.50%)` | :arrow_up: |
   
   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/1560?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[web/src/pages/Route/constants.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb25zdGFudHMudHM=)
 | `100.00% <0.00%> (ø)` | |
   | 
[web/src/pages/Route/components/Step1/MetaView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1N0ZXAxL01ldGFWaWV3LnRzeA==)
 | `100.00% <0.00%> (ø)` | |
   | 
[api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv)
 | | |
   | 
[api/internal/core/store/selector.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc2VsZWN0b3IuZ28=)
 | | |
   | 
[...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==)
 | | |
   | 
[api/internal/handler/ssl/ssl.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc3NsL3NzbC5nbw==)
 | | |
   | 
[api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=)
 | | |
   | 
[api/internal/core/store/validate\_mock.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGVfbW9jay5nbw==)
 | | |
   | 
[api/internal/handler/label/label.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvbGFiZWwvbGFiZWwuZ28=)
 | | |
   | 
[api/internal/handler/handler.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvaGFuZGxlci5nbw==)
 | | |
   | ... and [57 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1560/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1560?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/1560?src=pr=footer).
 Last update 
[9130e09...0f4e463](https://codecov.io/gh/apache/apisix-dashboard/pull/1560?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] Jaycean opened a new pull request #1560: feat: rewrite e2e test(route-with-valid-remote-addr-test) with ginkgo

2021-03-05 Thread GitBox


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


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [ ] Bugfix
   - [x] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   #1500
   
   ___
   ### New feature or improvement
   -  Rewrite e2e test(route-with-valid-remote) with ginkgo



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 #1559: test: update test

2021-03-05 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=h1) 
Report
   > Merging 
[#1559](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=desc) 
(3761315) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/938b2b9f34c5fa5e7ef6fddef29acb29b25c09a1?el=desc)
 (938b2b9) will **decrease** coverage by `15.24%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1559   +/-   ##
   ===
   - Coverage   70.86%   55.62%   -15.25% 
   ===
 Files 135   49   -86 
 Lines5485 3164 -2321 
 Branches  5830  -583 
   ===
   - Hits 3887 1760 -2127 
   + Misses   1350 1101  -249 
   - Partials  248  303   +55 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `55.62% <ø> (ø)` | |
   | backend-e2e-test-ginkgo | `39.79% <ø> (-0.26%)` | :arrow_down: |
   | backend-unit-test | `?` | |
   | 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/1559?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/store/query.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvcXVlcnkuZ28=)
 | `0.00% <0.00%> (-88.10%)` | :arrow_down: |
   | 
[api/internal/core/store/selector.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc2VsZWN0b3IuZ28=)
 | `0.00% <0.00%> (-75.93%)` | :arrow_down: |
   | 
[api/internal/handler/plugin/plugin.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcGx1Z2luL3BsdWdpbi5nbw==)
 | `15.15% <0.00%> (-72.73%)` | :arrow_down: |
   | 
[api/internal/utils/runtime/runtime.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3J1bnRpbWUvcnVudGltZS5nbw==)
 | `0.00% <0.00%> (-64.29%)` | :arrow_down: |
   | 
[api/internal/core/store/validate\_mock.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGVfbW9jay5nbw==)
 | `0.00% <0.00%> (-50.00%)` | :arrow_down: |
   | 
[api/internal/handler/service/service.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmljZS9zZXJ2aWNlLmdv)
 | `57.44% <0.00%> (-34.05%)` | :arrow_down: |
   | 
[api/internal/handler/ssl/ssl.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc3NsL3NzbC5nbw==)
 | `38.46% <0.00%> (-30.77%)` | :arrow_down: |
   | 
[api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=)
 | `57.22% <0.00%> (-30.73%)` | :arrow_down: |
   | 
[api/internal/filter/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9hdXRoZW50aWNhdGlvbi5nbw==)
 | `41.66% <0.00%> (-30.56%)` | :arrow_down: |
   | 
[api/internal/filter/ip\_filter.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9pcF9maWx0ZXIuZ28=)
 | `48.71% <0.00%> (-23.08%)` | :arrow_down: |
   | ... and [101 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?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/1559?src=pr=footer).
 Last update 
[938b2b9...3761315](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?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 

[GitHub] [apisix-dashboard] codecov-io commented on pull request #1559: test: update test

2021-03-05 Thread GitBox


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


   # 
[Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=h1) 
Report
   > Merging 
[#1559](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=desc) 
(3761315) into 
[master](https://codecov.io/gh/apache/apisix-dashboard/commit/938b2b9f34c5fa5e7ef6fddef29acb29b25c09a1?el=desc)
 (938b2b9) will **decrease** coverage by `31.07%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree 
graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/graphs/tree.svg?width=650=150=pr=Q1HERXN96P)](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?src=pr=tree)
   
   ```diff
   @@ Coverage Diff @@
   ##   master#1559   +/-   ##
   ===
   - Coverage   70.86%   39.79%   -31.08% 
   ===
 Files 135   49   -86 
 Lines5485 3164 -2321 
 Branches  5830  -583 
   ===
   - Hits 3887 1259 -2628 
   - Misses   1350 1640  +290 
   - Partials  248  265   +17 
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | backend-e2e-test | `?` | |
   | backend-e2e-test-ginkgo | `39.79% <ø> (-0.26%)` | :arrow_down: |
   | backend-unit-test | `?` | |
   | 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/1559?src=pr=tree) 
| Coverage Δ | |
   |---|---|---|
   | 
[api/internal/core/store/query.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvcXVlcnkuZ28=)
 | `0.00% <0.00%> (-88.10%)` | :arrow_down: |
   | 
[api/internal/core/store/selector.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc2VsZWN0b3IuZ28=)
 | `0.00% <0.00%> (-75.93%)` | :arrow_down: |
   | 
[api/internal/handler/plugin/plugin.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcGx1Z2luL3BsdWdpbi5nbw==)
 | `15.15% <0.00%> (-72.73%)` | :arrow_down: |
   | 
[api/internal/handler/label/label.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvbGFiZWwvbGFiZWwuZ28=)
 | `9.43% <0.00%> (-72.65%)` | :arrow_down: |
   | 
[api/internal/handler/data\_loader/route\_export.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfZXhwb3J0Lmdv)
 | `3.38% <0.00%> (-65.79%)` | :arrow_down: |
   | 
[api/internal/utils/runtime/runtime.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3J1bnRpbWUvcnVudGltZS5nbw==)
 | `0.00% <0.00%> (-64.29%)` | :arrow_down: |
   | 
[api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=)
 | `27.41% <0.00%> (-56.46%)` | :arrow_down: |
   | 
[api/internal/core/store/validate\_mock.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGVfbW9jay5nbw==)
 | `0.00% <0.00%> (-50.00%)` | :arrow_down: |
   | 
[api/internal/handler/route/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGUvcm91dGUuZ28=)
 | `33.47% <0.00%> (-44.77%)` | :arrow_down: |
   | 
[api/internal/filter/authentication.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9hdXRoZW50aWNhdGlvbi5nbw==)
 | `30.55% <0.00%> (-41.67%)` | :arrow_down: |
   | ... and [109 
more](https://codecov.io/gh/apache/apisix-dashboard/pull/1559/diff?src=pr=tree-more)
 | |
   
   --
   
   [Continue to review full report at 
Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?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/1559?src=pr=footer).
 Last update 
[938b2b9...3761315](https://codecov.io/gh/apache/apisix-dashboard/pull/1559?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] [apisix-dashboard] guoqqqi opened a new pull request #1559: test: update test

2021-03-05 Thread GitBox


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


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [ ] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   - Related issues
   #1538 
   ___
   ### Bugfix
   - Description
   e2e failed
   - How to fix?
   Enhanced stability, modified the domSelector name for some tests.
   ___



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 #3766: docs: add --server command

2021-03-05 Thread GitBox


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



##
File path: docs/en/latest/FAQ.md
##
@@ -71,6 +71,10 @@ There are two possibilities when encountering slow luarocks:
 For the first problem, you can use https_proxy or use the `--server` option to 
specify a luarocks server that you can access or access faster.
 Run the `luarocks config rocks_servers` command(this command is supported 
after luarocks 3.0) to see which server are available.
 
+```shell
+luarocks install apisix --server https://luarocks.cn

Review comment:
   Strictly speaking, it is not wrong. But such a way to install APISIX's 
dependencies is not recommended. So it would be better to avoid using it in the 
doc.





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 #1557: feat: sync fields of `upstream` from APISIX

2021-03-05 Thread GitBox


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


   
![image](https://user-images.githubusercontent.com/2106987/110135159-2249cf00-7e09-11eb-853a-0a3a9728cd74.png)
   
   BTW, @LiteSun Please create an issue about why CodeCov misses some data 
occasionally.



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 #1557: feat: sync fields of `upstream` from APISIX

2021-03-05 Thread GitBox


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


   Hi, please have a search at how many fields are mismatched between 
manager-api and admin-api, and sync them ASAP. This is needed to replace 
admin-api.



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 issue #3726: [Discuss] standardize release guide & branch/tag relations

2021-03-05 Thread GitBox


juzhiyuan commented on issue #3726:
URL: https://github.com/apache/apisix/issues/3726#issuecomment-791482346


   Hi, any conclusion here? 



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 #1490: feat: support yaml to config plugin in plugin config page

2021-03-05 Thread GitBox


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


   I have no idea how to resolve this conflict  please fix it 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] stu01509 commented on issue #3767: docs: fix powered-by link

2021-03-05 Thread GitBox


stu01509 commented on issue #3767:
URL: https://github.com/apache/apisix/issues/3767#issuecomment-791477602


   I will fix it



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix] spacewander commented on a change in pull request #3766: docs: add --server command

2021-03-05 Thread GitBox


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



##
File path: docs/en/latest/FAQ.md
##
@@ -71,6 +71,10 @@ There are two possibilities when encountering slow luarocks:
 For the first problem, you can use https_proxy or use the `--server` option to 
specify a luarocks server that you can access or access faster.
 Run the `luarocks config rocks_servers` command(this command is supported 
after luarocks 3.0) to see which server are available.
 
+```shell
+luarocks install apisix --server https://luarocks.cn

Review comment:
   This command is wrong. We should wrap the server option in `make deps`: 
https://github.com/apache/apisix/blob/f657b9023b07091687a3163cb4de8594b0a0f593/Makefile#L61





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 opened a new issue #3767: docs: fix powered-by link

2021-03-05 Thread GitBox


juzhiyuan opened a new issue #3767:
URL: https://github.com/apache/apisix/issues/3767


   # Improve Docs
   
   ## Please describe which part of docs should be improved or typo fixed
   
   Hi, I noticed that this `powered-by.md` is missing 樂 for this file is under 
the root directory.
   
   
![image](https://user-images.githubusercontent.com/2106987/110125384-35a36d00-7dfe-11eb-9c1a-26d7e45426b8.png)
   
   ## Describe the solution you'd like
   
   1. Visit https://github.com/apache/apisix/edit/master/README.md
   
   
![image](https://user-images.githubusercontent.com/2106987/110129027-67b6ce00-7e02-11eb-8363-333bdeeff88a.png)
   
   2. Use `[Powered By](powered-by.md)` instead.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-website] juzhiyuan opened a new issue #246: docs: added event about releasing APISIX 2.4

2021-03-05 Thread GitBox


juzhiyuan opened a new issue #246:
URL: https://github.com/apache/apisix-website/issues/246


   Hi, we just released Apache APISIX 2.4, we could add an event for this.
   
   1. See https://github.com/apache/apisix/blob/master/CHANGELOG.md#240 
   2. Add a new event here: 
https://github.com/apache/apisix-website/tree/master/website/events 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-website] stu01509 edited a comment on issue #224: The top `version` is not set for phone layout

2021-03-05 Thread GitBox


stu01509 edited a comment on issue #224:
URL: https://github.com/apache/apisix-website/issues/224#issuecomment-791394321


   > > Hi @juzhiyuan
   > > I knew the version info is wrapped by **DocsVersionDropdownNavbarItem**, 
but where can I found more detail about this?
   > > 
https://github.com/apache/apisix-website/blob/master/website/src/theme/DocSidebar/index.js#L191-L193
   > 
   > Check out this
   > https://v2.docusaurus.io/docs/next/using-themes#swizzling-theme-components
   > 
https://github.com/facebook/docusaurus/tree/master/packages/docusaurus-theme-classic/src/theme/NavbarItem
   
   Thanks for your information, I will take a look.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-website] stu01509 opened a new pull request #245: fix: fix the version number in mobile size overflow

2021-03-05 Thread GitBox


stu01509 opened a new pull request #245:
URL: https://github.com/apache/apisix-website/pull/245


   Fixes: #224
   
   Changes:
   I adjust the `sidebarVersionSwitch` to outside and add the 
`sidebarVersionSwitch a` class to prevent when the screen size below 997px, the 
**a** tag will be adding `display: none` property.
   
   
   
   Screenshots of the change:
   
   
   
![image](https://user-images.githubusercontent.com/22230889/110121706-af852780-7df9-11eb-90be-bc75bea90cfa.png)
   
   
![image](https://user-images.githubusercontent.com/22230889/110121732-b875f900-7df9-11eb-9717-2229c02d5a0d.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




[apisix] branch master updated: docs: change the img tag to markdown syntax (#3765)

2021-03-05 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 f657b90  docs: change the img tag to markdown syntax (#3765)
f657b90 is described below

commit f657b9023b07091687a3163cb4de8594b0a0f593
Author: Cliff Su 
AuthorDate: Fri Mar 5 21:09:30 2021 +0800

docs: change the img tag to markdown syntax (#3765)
---
 docs/en/latest/architecture-design.md | 12 ++--
 docs/en/latest/benchmark.md   |  8 
 docs/zh/latest/architecture-design.md | 12 ++--
 docs/zh/latest/benchmark.md   | 10 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/en/latest/architecture-design.md 
b/docs/en/latest/architecture-design.md
index 9995297..e751da8 100644
--- a/docs/en/latest/architecture-design.md
+++ b/docs/en/latest/architecture-design.md
@@ -53,7 +53,7 @@ title: Architecture Design
 
 ### Plugin Hierarchy Structure
 
-
+![flow-plugin-internal](../../assets/images/flow-plugin-internal.png)
 
 ## APISIX Config
 
@@ -91,7 +91,7 @@ The route mainly consists of three parts: matching rules (e.g 
uri, host, remote_
 
 The following image shows an example of some Route rules. When some attribute 
values are the same, the figure is identified by the same color.
 
-
+![routes-example](../../assets/images/routes-example.png)
 
 We configure all the parameters directly in the Route, it's easy to set up, 
and each Route has a relatively high degree of freedom. But when our Route has 
more repetitive configurations (such as enabling the same plugin configuration 
or upstream information), once we need update these same properties, we have to 
traverse all the Routes and modify them, so it's adding a lot of complexity of 
management and maintenance.
 
@@ -131,7 +131,7 @@ For specific options of Route, please refer to [Admin 
API](admin-api.md#route).
 
 A `Service` is an abstraction of an API (which can also be understood as a set 
of Route abstractions). It usually corresponds to the upstream service 
abstraction. Between `Route` and `Service`, usually the relationship of N:1, 
please see the following image.
 
-
+![service-example](../../assets/images/service-example.png)
 
 Different Route rules are bound to a Service at the same time. These Routes 
will have the same upstream and plugin configuration, reducing redundant 
configuration.
 
@@ -268,7 +268,7 @@ In theory, you can write arbitrary Lua code in `Script`, or 
you can directly cal
 
 Upstream is a virtual host abstraction that performs load balancing on a given 
set of service nodes according to configuration rules. Upstream address 
information can be directly configured to `Route` (or `Service`). When Upstream 
has duplicates, you need to use "reference" to avoid duplication.
 
-
+![upstream-example](../../assets/images/upstream-example.png)
 
 As shown in the image above, by creating an Upstream object and referencing it 
by ID in `Route`, you can ensure that only the value of an object is maintained.
 
@@ -490,7 +490,7 @@ Set the route that best suits your business needs in the 
local configuration `co
 
 For the API gateway, it is usually possible to identify a certain type of 
requester by using a domain name such as a request domain name, a client IP 
address, etc., and then perform plugin filtering and forward the request to the 
specified upstream, but sometimes the depth is insufficient.
 
-
+![consumer-who](../../assets/images/consumer-who.png)
 
 As shown in the image above, as an API gateway, you should know who the API 
Consumer is, so you can configure different rules for different API Consumers.
 
@@ -501,7 +501,7 @@ As shown in the image above, as an API gateway, you should 
know who the API Cons
 
 In APISIX, the process of identifying a Consumer is as follows:
 
-
+![consumer-internal](../../assets/images/consumer-internal.png)
 
 1. Authorization certification: e.g [key-auth](./plugins/key-auth.md), 
[JWT](./plugins/jwt-auth.md), etc.
 2. Get consumer_name: By authorization, you can naturally get the 
corresponding Consumer `id`, which is the unique identifier of the Consumer 
object.
diff --git a/docs/en/latest/benchmark.md b/docs/en/latest/benchmark.md
index 7484061..c8e91f0 100644
--- a/docs/en/latest/benchmark.md
+++ b/docs/en/latest/benchmark.md
@@ -37,13 +37,13 @@ and the response size was 1KB.
 
 The x-axis means the size of CPU core, and the y-axis is QPS.
 
-
+![benchmark-1](../../assets/images/benchmark-1.jpg)
 
  Latency
 
 Note the y-axis latency in **microsecond(μs)** not millisecond.
 
-
+![latency-1](../../assets/images/latency-1.jpg)
 
  Flame Graph
 
@@ -82,13 +82,13 @@ and the response size was 1KB.
 
 The x-axis means the size of CPU core, and the y-axis is QPS.
 
-
+![benchmark-2](../../assets/images/benchmark-2.jpg)
 
  Latency
 
 Note the y-axis latency in 

[GitHub] [apisix] spacewander merged pull request #3765: docs: change the img tag to markdown syntax

2021-03-05 Thread GitBox


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


   



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 #3730: docs: use markdown way to import images

2021-03-05 Thread GitBox


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


   



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 #3758: fix: the traffic-split plugin is invalid to bind upstream via upstream_id

2021-03-05 Thread GitBox


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



##
File path: apisix/plugins/traffic-split.lua
##
@@ -309,7 +314,8 @@ function _M.access(conf, ctx)
 return
 end
 
-local rr_up, err = lrucache(weighted_upstreams, nil, new_rr_obj, 
weighted_upstreams)
+local rr_up, err = lrucache(weighted_upstreams, nil, new_rr_obj, 
weighted_upstreams,

Review comment:
   Need to solve 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-website] juzhiyuan merged pull request #244: feat: upgrade APISIX version

2021-03-05 Thread GitBox


juzhiyuan merged pull request #244:
URL: https://github.com/apache/apisix-website/pull/244


   



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-website] branch master updated: feat: upgrade APISIX version (#244)

2021-03-05 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-website.git


The following commit(s) were added to refs/heads/master by this push:
 new a82a1b4  feat: upgrade APISIX version (#244)
a82a1b4 is described below

commit a82a1b42b81af83c6b5d2ed5862ba3af5fa3f245
Author: 罗泽轩 
AuthorDate: Fri Mar 5 21:08:20 2021 +0800

feat: upgrade APISIX version (#244)
---
 website/docusaurus.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 48acd6c..ab89147 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -22,8 +22,8 @@ module.exports = {
 shape: "triangle",
 color: "var(--ifm-color-primary)",
 githubRepo: "apache/apisix",
-version: "2.3",
-releaseDate: "2021-02-09",
+version: "2.4",
+releaseDate: "2021-03-05",
 firstDocPath: "/architecture-design",
   },
   {



[GitHub] [apisix-website] stu01509 commented on issue #224: The top `version` is not set for phone layout

2021-03-05 Thread GitBox


stu01509 commented on issue #224:
URL: https://github.com/apache/apisix-website/issues/224#issuecomment-791394321


   > > Hi @juzhiyuan
   > > I knew the version info is wrapped by **DocsVersionDropdownNavbarItem**, 
but where can I found more detail about this?
   > > 
https://github.com/apache/apisix-website/blob/master/website/src/theme/DocSidebar/index.js#L191-L193
   > 
   > Check out this
   > https://v2.docusaurus.io/docs/next/using-themes#swizzling-theme-components
   > 
https://github.com/facebook/docusaurus/tree/master/packages/docusaurus-theme-classic/src/theme/NavbarItem
   
   Thank you information, I will take a look.



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] stu01509 opened a new pull request #3766: docs: add --server command

2021-03-05 Thread GitBox


stu01509 opened a new pull request #3766:
URL: https://github.com/apache/apisix/pull/3766


   ### What this PR does / why we need it:
   
   
   Fix #3671 
   
   Add **--server** command option.
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [ ] Is this PR backward compatible? **If it is not backward compatible, 
please discuss on the [mailing 
list](https://github.com/apache/apisix/tree/master#community) first**
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix] tzssangglass commented on a change in pull request #3758: fix: the traffic-split plugin is invalid to bind upstream via upstream_id

2021-03-05 Thread GitBox


tzssangglass commented on a change in pull request #3758:
URL: https://github.com/apache/apisix/pull/3758#discussion_r588243727



##
File path: t/plugin/traffic-split.t
##
@@ -1615,7 +1615,134 @@ passed
 
 
 
-=== TEST 46: the upstream_id is used in the plugin
+=== TEST 46: set route(id: 1, upstream_id: 1, upstream_id in plugin: 2), and 
`weighted_upstreams` does not have a structure with only `weight`
+--- 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,
+[=[{
+"uri": "/hello*",
+"plugins": {
+"traffic-split": {
+"rules": [
+{
+"match": [
+{
+"vars": [["uri", "==", "/hello"]]
+}
+],
+"weighted_upstreams": [
+{"upstream_id": 2}
+]
+}
+]
+}
+},
+"upstream_id":"1"
+}]=]
+)
+
+if code >= 300 then
+ngx.status = code
+end
+ngx.say(body)
+}
+}
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 47: when `match` rule passed, use the `upstream_id` in plugin, and 
when it failed, use the `upstream_id` in route
+--- pipelined_requests eval
+["GET /hello", "GET /hello1", "GET /hello", "GET /hello1", "GET /hello", "GET 
/hello1"]
+--- response_body eval
+["hello world\n", "hello1 world\n", "hello world\n", "hello1 world\n", "hello 
world\n", "hello1 world\n"]
+--- grep_error_log_out eval
+[
+"match_flag: true",
+"upstream_id: 2",
+"match_flag: false",
+"original_uid: 1"
+]
+
+
+
+=== TEST 48: set route(id: 1, upstream_id: 1, upstream_id in plugin: 2), and 
`weighted_upstreams` has a structure with only `weight`
+--- 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,
+[=[{
+"uri": "/server_port",
+"plugins": {
+"traffic-split": {
+"rules": [
+{
+"match": [
+{
+"vars": [["uri", "==", 
"/server_port"]]
+}
+],
+"weighted_upstreams": [
+{"upstream_id": 2, "weight": 1},
+{"weight": 1}
+]
+}
+]
+}
+},
+"upstream_id":"1"
+}]=]
+)
+if code >= 300 then
+ngx.status = code
+end
+ngx.say(body)
+}
+}
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 49: all requests `match` rule passed, proxy requests to the upstream 
of route based on the structure with only `weight` in `weighted_upstreams`
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local bodys = {}
+local headers = {}

Review comment:
   update





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] stu01509 opened a new pull request #3765: docs: change the img tag to markdown syntax

2021-03-05 Thread GitBox


stu01509 opened a new pull request #3765:
URL: https://github.com/apache/apisix/pull/3765


   ### What this PR does / why we need it:
   
   
   Fix #3730 
   Change the img tag to markdown syntax.
   ### 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] Firstsawyou commented on issue #3764: bug:

2021-03-05 Thread GitBox


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


   You should provide the installation steps of APISIX dependent environment, 
such as the installation of `openresty, openresty-openssl-xxx`.



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 release/2.4 created (now 9ee82f9)

2021-03-05 Thread spacewander
This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a change to branch release/2.4
in repository https://gitbox.apache.org/repos/asf/apisix.git.


  at 9ee82f9  ci: auto generate and check for rpm package (#3621)

No new revisions were added by this update.



[apisix] branch master updated: feat: release 2.4 (#3723)

2021-03-05 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 b7b784f  feat: release 2.4 (#3723)
b7b784f is described below

commit b7b784f6f19e7307a381913ffa6d27159297dc85
Author: 罗泽轩 
AuthorDate: Fri Mar 5 18:23:24 2021 +0800

feat: release 2.4 (#3723)
---
 .gitignore |  1 +
 CHANGELOG.md   | 31 +++
 README.md  |  8 ++--
 apisix/core/version.lua|  2 +-
 docs/en/latest/config.json |  2 +-
 docs/en/latest/how-to-build.md | 16 
 docs/es/latest/README.md   |  8 ++--
 docs/es/latest/config.json |  2 +-
 docs/zh/latest/CHANGELOG.md| 31 +++
 docs/zh/latest/README.md   |  8 ++--
 docs/zh/latest/config.json |  2 +-
 docs/zh/latest/how-to-build.md | 16 
 rockspec/apisix-2.4-0.rockspec | 90 ++
 13 files changed, 185 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index f94b319..691ed4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@ t/lib/dubbo-backend/dubbo-backend-provider/target/
 /build-cache/
 # release tar package
 *.tgz
+release/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b43fba..979ad79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
 
 ## Table of Contents
 
+- [2.4.0](#240)
 - [2.3.0](#230)
 - [2.2.0](#220)
 - [2.1.0](#210)
@@ -39,6 +40,36 @@ title: Changelog
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 2.4.0
+
+### Change
+
+- change: global rules should not be executed on the internal api by default 
[#3396](https://github.com/apache/apisix/pull/3396)
+- change: default to cache DNS record according to the TTL 
[#3530](https://github.com/apache/apisix/pull/3530)
+
+### Core
+
+- :sunrise: feat: support SRV record 
[#3686](https://github.com/apache/apisix/pull/3686)
+- :sunrise: feat: add dns discovery 
[#3629](https://github.com/apache/apisix/pull/3629)
+- :sunrise: feat: add consul kv discovery module 
[#3615](https://github.com/apache/apisix/pull/3615)
+- :sunrise: feat: support to bind plugin config by `plugin_config_id` 
[#3567](https://github.com/apache/apisix/pull/3567)
+- :sunrise: feat: support listen http2 with plaintext 
[#3547](https://github.com/apache/apisix/pull/3547)
+- :sunrise: feat: support DNS  record 
[#3484](https://github.com/apache/apisix/pull/3484)
+
+### Plugin
+
+- :sunrise: feat: the traffic-split plugin supports upstream_id 
[#3512](https://github.com/apache/apisix/pull/3512)
+- :sunrise: feat(zipkin): support b3 req header 
[#3551](https://github.com/apache/apisix/pull/3551)
+
+### Bugfix
+
+- fix(chash): ensure retry can try every node 
[#3651](https://github.com/apache/apisix/pull/3651)
+- fix: script does not work when the route is bound to a service 
[#3678](https://github.com/apache/apisix/pull/3678)
+- fix: use openssl111 in openresty dir in precedence 
[#3603](https://github.com/apache/apisix/pull/3603)
+- fix(zipkin): don't cache the per-req sample ratio 
[#3522](https://github.com/apache/apisix/pull/3522)
+
+For more changes, please refer to 
[Milestone](https://github.com/apache/apisix/milestone/13)
+
 ## 2.3.0
 
 ### Change
diff --git a/README.md b/README.md
index 49636f7..6e74f7e 100644
--- a/README.md
+++ b/README.md
@@ -153,9 +153,9 @@ There are several ways to install the Apache Release 
version of APISIX:
- Download the latest source code release package:
 
  ```shell
- $ mkdir apisix-2.3
- $ wget https://downloads.apache.org/apisix/2.3/apache-apisix-2.3-src.tgz
- $ tar zxvf apache-apisix-2.3-src.tgz -C apisix-2.3
+ $ mkdir apisix-2.4
+ $ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
+ $ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
  ```
 
- Install the dependencies:
@@ -192,7 +192,7 @@ There are several ways to install the Apache Release 
version of APISIX:
- install APISIX:
 
```shell
-   $ sudo yum install -y 
https://github.com/apache/apisix/releases/download/2.3/apisix-2.3-0.x86_64.rpm
+   $ sudo yum install -y 
https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
```
 
- check version of APISIX:
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index e419532..8c93638 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,5 @@
 -- limitations under the License.
 --
 return {
-VERSION = "2.3"
+VERSION = "2.4"
 }
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index 2e24ca5..c37954b 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
 {
-  "version": 2.3,
+  "version": 2.4,
   "sidebar": [
 {
   "type": "doc",
diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md
index 4aec089..885f20d 

[GitHub] [apisix] spacewander merged pull request #3723: feat: release 2.4

2021-03-05 Thread GitBox


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


   



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

2021-03-05 Thread GitBox


wudj opened a new issue #3764:
URL: https://github.com/apache/apisix/issues/3764


   ### Issue description
   
   ### Environment
   
   * apisix version (cmd: `apisix version`):2.3
   * OS (cmd: `uname -a`):Ubuntu 16 LTS
   * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`): 1.19.31
   * etcd version, if have (cmd: run `curl 
http://127.0.0.1:9090/v1/server_info` to get the info from server-info 
API):v3.4.13
   * apisix-dashboard version, if have:
   
   ### Minimal test code / Steps to reproduce the issue
   
   1. ./bin/apisix start
   2.
   3.
   
   ### What's the actual result? (including assertion message & call stack if 
applicable)
   ./bin/apisix start
   /usr/local/openresty/luajit/bin/luajit ./apisix/cli/apisix.lua start
   nginx: [error] init_by_lua error: /home/souche/apisix2.3/apisix/init.lua:68: 
pcre jit stack allocation failed
   stack traceback:
[C]: in function 'error'
/usr/local/openresty/lualib/ngx/re.lua:311: in function 'opt'
/home/souche/apisix2.3/apisix/init.lua:68: in function 'http_init'
init_by_lua:9: in main chunk
   ### What's the expected result?
   start successfully



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-dashboard] nic-chen commented on issue #1549: feat: support `discovery_type` in Dashboard

2021-03-05 Thread GitBox


nic-chen commented on issue #1549:
URL: 
https://github.com/apache/apisix-dashboard/issues/1549#issuecomment-791306031


   > i think there still need some code for dashboard show, so i can't check 
the feature from dashboard now.
   
   yes, you are right. the pr is only for backend.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-dashboard] nic-chen commented on pull request #1558: feat:Support duplicate one existing Route

2021-03-05 Thread GitBox


nic-chen commented on pull request #1558:
URL: https://github.com/apache/apisix-dashboard/pull/1558#issuecomment-791305010


   need some test cases for duplicate check, thanks. @batman-ezio 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1558: feat:Support duplicate one existing Route

2021-03-05 Thread GitBox


nic-chen commented on a change in pull request #1558:
URL: https://github.com/apache/apisix-dashboard/pull/1558#discussion_r588163878



##
File path: api/internal/handler/route/route.go
##
@@ -307,6 +307,12 @@ func generateLuaCode(script map[string]interface{}) 
(string, error) {
 
 func (h *Handler) Create(c droplet.Context) (interface{}, error) {
input := c.Input().(*entity.Route)
+   // check duplicate name
+   if err := h.checkDuplicateName(c, input.Name, ""); err != nil {

Review comment:
   should add this check for `Update` too. Thanks.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-dashboard] batman-ezio opened a new pull request #1558: feat:Support duplicate one existing Route

2021-03-05 Thread GitBox


batman-ezio opened a new pull request #1558:
URL: https://github.com/apache/apisix-dashboard/pull/1558


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [apisix-website] spacewander opened a new pull request #244: feat: upgrade APISIX version

2021-03-05 Thread GitBox


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


   Fixes: #[Add issue number here]
   
   Changes:
   
   
   
   Screenshots of the 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




[apisix] 01/01: ci: auto generate and check for rpm package (#3621)

2021-03-05 Thread spacewander
This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch release/rpm
in repository https://gitbox.apache.org/repos/asf/apisix.git

commit 9ee82f9d27b2866e8f64244b9f2493e881df771f
Author: Shuyang Wu 
AuthorDate: Wed Mar 3 17:59:59 2021 +0800

ci: auto generate and check for rpm package (#3621)

Co-authored-by: John Bampton 
---
 .github/workflows/build.yml  |  1 +
 .github/workflows/centos7-ci.yml | 51 
 utils/centos7-ci.sh  |  6 ++---
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4337e2f..46cfcd8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,6 +54,7 @@ jobs:
   submodules: recursive
 
   - name: Extract branch name
+if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
 id: branch_env
 shell: bash
 run: |
diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 1e3b5fc..4f99fd3 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -2,11 +2,9 @@ name: CI Centos7
 
 on:
   push:
-branches:
-  - master
+branches: [master, 'release/**']
   pull_request:
-branches:
-  - master
+branches: [master]
 
 jobs:
   test_apisix:
@@ -29,6 +27,24 @@ jobs:
   with:
 submodules: recursive
 
+- name: Extract branch name
+  if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
+  id: branch_env
+  shell: bash
+  run: |
+echo "##[set-output name=version;]$(echo ${GITHUB_REF##*/})"
+
+- name: Build rpm package
+  if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
+  run: |
+export VERSION=${{ steps.branch_env.outputs.version }}
+sudo gem install --no-document fpm
+git clone https://github.com/api7/apisix-build-tools.git
+cd apisix-build-tools
+make package type=rpm app=apisix version=${VERSION} 
checkout=release/${VERSION}
+cd ..
+rm -rf $(ls -1 --ignore=apisix-build-tools --ignore=t --ignore=utils 
--ignore=Makefile --ignore=rockspec)
+
 - name: Install Redis Cluster
   run: |
 docker run -d -p ${MASTER1_PORT}:6379 -p ${MASTER2_PORT}:6380 -p 
${MASTER3_PORT}:6381 -p ${SLAVE1_PORT}:6382 -p ${SLAVE2_PORT}:6383 -p 
${SLAVE3_PORT}:6384 --name redis-cluster vishnunair/docker-redis-cluster:latest
@@ -60,11 +76,12 @@ jobs:
 -v /home/runner/work/apisix/apisix/t/certs:/certs \
 bitnami/etcd:3.4.0
 
-- name: run centos7 docker and mapping apisix into container
+- name: Run centos7 docker and mapping apisix into container
   run: |
-docker run -itd -v /home/runner/work/apisix/apisix:/tmp/apisix --name 
centos7Instance --net="host" docker.io/centos:7 /bin/bash
+docker run -itd -v /home/runner/work/apisix/apisix:/apisix --name 
centos7Instance --net="host" docker.io/centos:7 /bin/bash
+# docker exec centos7Instance bash -c "cp -r /tmp/apisix ./"
 
-- name: run other docker containers for test
+- name: Run other docker containers for test
   run: |
 docker run --rm -itd -p 6379:6379 --name apisix_redis redis:3.0-alpine
 docker run --rm -itd -e HTTP_PORT= -e HTTPS_PORT= -p : 
-p : mendhak/http-https-echo
@@ -80,11 +97,25 @@ jobs:
 docker run --rm --name consul_1 -d -p 8500:8500 consul:1.7 consul 
agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
 docker run --rm --name consul_2 -d -p 8600:8500 consul:1.7 consul 
agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info 
-data-dir=/consul/data
 
-- name: install dependencies
+- name: Install dependencies
   run: |
-docker exec centos7Instance bash -c "cp -r /tmp/apisix ./"
 docker exec centos7Instance bash -c "cd apisix && 
./utils/centos7-ci.sh install_dependencies"
 
-- name: run test cases
+- name: Install rpm package
+  if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
+  run: |
+docker exec centos7Instance bash -c "cd apisix && rpm -iv 
--prefix=/apisix ./apisix-build-tools/output/apisix-${{ 
steps.branch_env.outputs.version }}-0.x86_64.rpm"
+# Dependencies are attached with rpm, so revert `make deps`
+docker exec centos7Instance bash -c "cd apisix && rm -rf deps"
+docker exec centos7Instance bash -c "cd apisix && mv usr/bin . && mv 
usr/local/apisix/* ."
+
+- name: Run test cases
   run: |
 docker exec centos7Instance bash -c "cd apisix && 
./utils/centos7-ci.sh run_case"
+
+- name: Publish Artifact
+  if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
+  uses: actions/upload-artifact@v2.2.2
+  with:
+name: "rpm"
+path: "./apisix-build-tools/output/apisix-${{ 

[apisix] branch release/rpm created (now 9ee82f9)

2021-03-05 Thread spacewander
This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a change to branch release/rpm
in repository https://gitbox.apache.org/repos/asf/apisix.git.


  at 9ee82f9  ci: auto generate and check for rpm package (#3621)

This branch includes the following new commits:

 new 9ee82f9  ci: auto generate and check for rpm package (#3621)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.