[incubator-apisix-dashboard] branch next updated: feat: update getAdminAPIConfig
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git The following commit(s) were added to refs/heads/next by this push: new c769f83 feat: update getAdminAPIConfig c769f83 is described below commit c769f8322777e8d36e9e6ae8d8b5642b2a58de6e Author: juzhiyuan AuthorDate: Wed May 27 14:19:01 2020 +0800 feat: update getAdminAPIConfig --- src/app.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.tsx b/src/app.tsx index 70ce2e1..9971333 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -83,12 +83,12 @@ const errorHandler = (error: { response: Response; data: any }): Promise
[GitHub] [incubator-apisix] juzhiyuan commented on issue #1613: request help: dashboard page return 403
juzhiyuan commented on issue #1613: URL: https://github.com/apache/incubator-apisix/issues/1613#issuecomment-634449083 > ### Issue description > I install apisix via docker image, follow the document steps, its quite smoothly, but when i try to view dashboard, it returns 403. > ![image](https://user-images.githubusercontent.com/56294517/82857938-0265b080-9f45-11ea-98c3-4f722280b4eb.png) > > then i try to modify config.yaml file allow_admin param,but it still does'nt work. I'm wondering what's the problem, please help me. > > ![image](https://user-images.githubusercontent.com/56294517/82858064-62f4ed80-9f45-11ea-864a-3c813784727c.png) > > ### Environment > * apisix version (cmd: `apisix version`): > * OS:macOS、docker hi @totemofwolf Could you please help him to deal with the 403 error? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-apisix-website] juzhiyuan closed issue #27: Apache apisix official website part of the Chinese page is displayed in English
juzhiyuan closed issue #27: URL: https://github.com/apache/incubator-apisix-website/issues/27 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] [incubator-apisix-website] juzhiyuan commented on issue #27: Apache apisix official website part of the Chinese page is displayed in English
juzhiyuan commented on issue #27: URL: https://github.com/apache/incubator-apisix-website/issues/27#issuecomment-634445888 will be fixed by #47 #46 #45 #44 #35 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
[incubator-apisix-website] branch asf-site updated: Deploy to GitHub pages
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1f922c7 Deploy to GitHub pages 1f922c7 is described below commit 1f922c7d52d9b932a80e3713e8fdc89df889b4b1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed May 27 05:45:28 2020 + Deploy to GitHub pages --- README.md| 4 ++-- categories/index.xml | 4 ++-- contribute/2fa/index.html| 6 +++--- contribute/committer/index.html | 8 contribute/contributor/index.html| 8 contribute/index.xml | 6 +++--- contribute/release/index.html| 6 +++--- contribute/security/index.html | 6 +++--- contribute/subscribe/index.html | 10 +- downloads/index.html | 10 +- index.html | 14 +++--- index.xml| 8 tags/index.xml | 4 ++-- team/index.html | 10 +- zh/categories/index.xml | 4 ++-- zh/contribute/2fa/index.html | 6 +++--- zh/contribute/committer/index.html | 10 +- zh/contribute/contributor/index.html | 8 zh/contribute/index.xml | 10 +- zh/contribute/release/index.html | 6 +++--- zh/contribute/security/index.html| 6 +++--- zh/contribute/subscribe/index.html | 14 +++--- zh/downloads/index.html | 10 +- zh/index.html| 14 +++--- zh/index.xml | 12 ++-- zh/tags/index.xml| 4 ++-- zh/team/index.html | 8 27 files changed, 108 insertions(+), 108 deletions(-) diff --git a/README.md b/README.md index 31f9715..28c277d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Apache APISIX +# Apache APISIX (incubating) -> The website of [Apache APISIX](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. +> The website of [Apache APISIX (incubating)](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. ## Development ```sh diff --git a/categories/index.xml b/categories/index.xml index 87d0f83..f1dfdf1 100644 --- a/categories/index.xml +++ b/categories/index.xml @@ -1,9 +1,9 @@ http://www.w3.org/2005/Atom";> -Categories on Apache APISIX +Categories on Apache APISIX (incubating) https://apisix.incubator.apache.org/categories/ -Recent content in Categories on Apache APISIX +Recent content in Categories on Apache APISIX (incubating) Hugo -- gohugo.io https://apisix.incubator.apache.org/categories/index.xml"; rel="self" type="application/rss+xml" /> diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html index 0191870..3e1cf20 100644 --- a/contribute/2fa/index.html +++ b/contribute/2fa/index.html @@ -16,7 +16,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t -Apache APISIX +Apache APISIX (incubating) https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> @@ -287,7 +287,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t -http://www.apache.org/"; target="_blank">https://www.apache.org/foundation/press/kit/asf_logo_wide_small.png"; alt="Apache APISIX" > +http://www.apache.org/"; target="_blank">https://www.apache.org/foundation/press/kit/asf_logo_wide_small.png"; alt="Apache APISIX (incubating)" > @@ -296,7 +296,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t -Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX, and its feather logo are trademarks of The Apache Software Foundation. +Copyright © 2019-2020 The Apache Software Foundation. Apache APISIX (incubating), and its feather logo are trademarks of The Apache Software Foundation. diff --git a/contribute/committer/index.html b/contribute/committer/index.html index d5a6413..16ecb8f 100644 --- a/contribute/committer/index.html +++ b/contribute/committer/index.html @@ -23,7 +23,7 @@ -Apache APISIX +Apache APISIX (incubating) https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> @@ -250,7 +250,7 @@ Promotion -The Apache APISIX community follows the http://community.apache.org/newcommitter.html";>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to in
[GitHub] [incubator-apisix-website] moonming merged pull request #48: feat: added incubating
moonming merged pull request #48: URL: https://github.com/apache/incubator-apisix-website/pull/48 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
[incubator-apisix-website] branch master updated: feat: added incubating (#48)
This is an automated email from the ASF dual-hosted git repository. wenming pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 95f8f34 feat: added incubating (#48) 95f8f34 is described below commit 95f8f341eb4fa5dc15d9959d57aab14e35ec537c Author: 琚致远 AuthorDate: Wed May 27 13:45:07 2020 +0800 feat: added incubating (#48) --- README.md | 4 ++-- config.yaml| 14 +++--- content/contribute/committer/index.en.md | 2 +- content/contribute/committer/index.zh.md | 2 +- content/contribute/contributor/index.en.md | 4 ++-- content/contribute/contributor/index.zh.md | 2 +- content/contribute/subscribe/index.en.md | 2 +- content/contribute/subscribe/index.zh.md | 4 ++-- content/downloads/index.en.md | 2 +- content/downloads/index.zh.md | 2 +- content/team/index.en.md | 4 ++-- content/team/index.zh.md | 2 +- layouts/partials/footer.html | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 31f9715..28c277d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Apache APISIX +# Apache APISIX (incubating) -> The website of [Apache APISIX](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. +> The website of [Apache APISIX (incubating)](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. ## Development ```sh diff --git a/config.yaml b/config.yaml index 5b4ff54..f32a2d3 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ baseURL: https://apisix.incubator.apache.org/ -title: Apache APISIX +title: Apache APISIX (incubating) theme: hugo-fresh googleAnalytics: #Put in your tracking code without quotes like this: UA-XX... #Disables warningss @@ -13,10 +13,10 @@ languages: params: hero: # Main hero title -title: Apache APISIX +title: Apache APISIX (incubating) # Hero subtitle (optional) subtitle1: Cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices. -subtitle2: Apache APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle2: Apache APISIX (incubating) is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. subtitle3: Apache releases are beginning from version 0.9. # Button text buttontext: View on GitHub @@ -75,7 +75,7 @@ languages: name: 中 link: /zh section1: -title: Why Apache APISIX? +title: Why Apache APISIX (incubating)? tiles: - title: High availability, safety first icon: mouse-globe @@ -108,7 +108,7 @@ languages: params: hero: # Main hero title - title: Apache APISIX + title: Apache APISIX (incubating) # Hero subtitle (optional) subtitle1: 云原生、高性能、可扩展的微服务 API 网关 subtitle2: 基于 Nginx 和 etcd 来实现,具备动态路由、插件热加载和 gRPC 代理和协议转换功能,更适合微服务体系下的 API 管理 @@ -170,7 +170,7 @@ languages: name: EN link: / section1: - title: 为什么选择 Apache APISIX? + title: 为什么选择 Apache APISIX (incubating)? tiles: - title: 高可用,安全第一 icon: mouse-globe @@ -185,7 +185,7 @@ languages: icon: doc-sync text: 支持 http 到 gRPC 的协议转换,支持 websocket、gRPC、Dubbo、MQTT 的代理,支持包括 ARM64 在内的多种平台 section3: - title: 谁在使用 Apache APISIX? + title: 谁在使用 Apache APISIX (incubating)? image: https://raw.githubusercontent.com/iresty/iresty.com/master/user-wall.jpg section5: true footer: diff --git a/content/contribute/committer/index.en.md b/content/contribute/committer/index.en.md index ecd5231..df66509 100644 --- a/content/contribute/committer/index.en.md +++ b/content/contribute/committer/index.en.md @@ -28,7 +28,7 @@ include_footer: true Promotion -The Apache APISIX community follows the http://community.apache.org/newcommitter.html";>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC. +The Apache APISIX (incubating) community follows the http://community.apache.org/newcommitter.html";>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and
[incubator-apisix-website] branch feat-add-incubating updated (3f0c4ec -> ce20cfc)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-add-incubating in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git. from 3f0c4ec feat: added incubating add ce20cfc Update index.en.md No new revisions were added by this update. Summary of changes: content/contribute/contributor/index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[GitHub] [incubator-apisix-website] juzhiyuan opened a new pull request #48: feat: added incubating
juzhiyuan opened a new pull request #48: URL: https://github.com/apache/incubator-apisix-website/pull/48 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] [incubator-apisix-website] juzhiyuan opened a new issue #47: Translate Downloads in Chinese
juzhiyuan opened a new issue #47: URL: https://github.com/apache/incubator-apisix-website/issues/47 https://apisix.apache.org/zh/downloads/ 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] [incubator-apisix-website] juzhiyuan opened a new issue #46: Translate 2FA Guide in Chinese
juzhiyuan opened a new issue #46: URL: https://github.com/apache/incubator-apisix-website/issues/46 https://apisix.apache.org/zh/contribute/2fa/ 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] [incubator-apisix-website] juzhiyuan opened a new issue #45: Translate Security Guide in Chinese
juzhiyuan opened a new issue #45: URL: https://github.com/apache/incubator-apisix-website/issues/45 https://apisix.apache.org/zh/contribute/security/ 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] [incubator-apisix-website] juzhiyuan closed issue #31: Adding CD support
juzhiyuan closed issue #31: URL: https://github.com/apache/incubator-apisix-website/issues/31 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] [incubator-apisix-website] juzhiyuan commented on issue #31: Adding CD support
juzhiyuan commented on issue #31: URL: https://github.com/apache/incubator-apisix-website/issues/31#issuecomment-634438055 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] [incubator-apisix] shengnoah opened a new issue #1617: feature: support url check with regular expression matching
shengnoah opened a new issue #1617: URL: https://github.com/apache/incubator-apisix/issues/1617 ### Issue description Support url check with regular expression matching. If url contains some specical characters and regular expression defined matching. Set dynamic proxy upstream point to HTTTP Server A. If msimatch regular expression. Set dynamic proxy upstream point to HTTTP Server B. ### Example URL: http://127.0.0.1/index.pht?a=
[GitHub] [incubator-apisix] membphis merged pull request #1611: fix some doc style for response-rewrite* and health-check.md
membphis merged pull request #1611: URL: https://github.com/apache/incubator-apisix/pull/1611 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] [incubator-apisix-website] juzhiyuan merged pull request #42: Change Hugo version in GitHub Action
juzhiyuan merged pull request #42: URL: https://github.com/apache/incubator-apisix-website/pull/42 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] [incubator-apisix] membphis commented on pull request #1598: Fix garbled Chinese response in browser. close #1559
membphis commented on pull request #1598: URL: https://github.com/apache/incubator-apisix/pull/1598#issuecomment-633617552 @xxm404 many thx, merged already 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] [incubator-apisix] dabue commented on issue #1615: bugfix(prometheus): the `overhead` should use millisecond units, so it needs to be multiplied by 1000
dabue commented on issue #1615: URL: https://github.com/apache/incubator-apisix/issues/1615#issuecomment-634029233 I wanna 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] [incubator-apisix] membphis merged pull request #1612: doc: add asf.yaml.
membphis merged pull request #1612: URL: https://github.com/apache/incubator-apisix/pull/1612 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] [incubator-apisix] membphis commented on pull request #1616: [bugfix] correct the overhead to fix the bug for #1615
membphis commented on pull request #1616: URL: https://github.com/apache/incubator-apisix/pull/1616#issuecomment-634380944 can you add a test case to confirm this 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] [incubator-apisix] membphis opened a new issue #1610: plugin(prometheus): support to hot reload
membphis opened a new issue #1610: URL: https://github.com/apache/incubator-apisix/issues/1610 This is the current todo comments: https://github.com/apache/incubator-apisix/pull/1607/files#diff-dc8151ecf7fc460e27a70fb1e00e7f55R53 The metrics can only be initialized in the init and init worker phases, and we need to let it support other phases. 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] [incubator-apisix] membphis commented on a change in pull request #1607: change: updated prometheus to version 1.1 .
membphis commented on a change in pull request #1607: URL: https://github.com/apache/incubator-apisix/pull/1607#discussion_r429983280 ## File path: apisix/plugins/prometheus/exporter.lua ## @@ -32,10 +33,29 @@ local DEFAULT_BUCKETS = { 1, 2, 5, 7, 10, 15, 20, 25, 30, 40, 50, 60, 70, local metrics = {} -local _M = {version = 0.3} +local inner_tab_arr = {} +local clear_tab = core.table.clear +local function gen_arr(...) +clear_tab(inner_tab_arr) + +for i = 1, select('#', ...) do +inner_tab_arr[i] = select(i, ...) +end + +return inner_tab_arr +end + + +local _M = {} function _M.init() +-- todo: support hot reload, we may need to update the lua-prometheus Review comment: I have created an issue, fix this later ## File path: apisix/plugins/prometheus/exporter.lua ## @@ -32,10 +33,29 @@ local DEFAULT_BUCKETS = { 1, 2, 5, 7, 10, 15, 20, 25, 30, 40, 50, 60, 70, local metrics = {} -local _M = {version = 0.3} +local inner_tab_arr = {} +local clear_tab = core.table.clear +local function gen_arr(...) +clear_tab(inner_tab_arr) + +for i = 1, select('#', ...) do +inner_tab_arr[i] = select(i, ...) +end + +return inner_tab_arr +end + + +local _M = {} function _M.init() +-- todo: support hot reload, we may need to update the lua-prometheus Review comment: I have created an issue, fix this later https://github.com/apache/incubator-apisix/issues/1610 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] [incubator-apisix] membphis commented on a change in pull request #1599: Fix/batch-requests-cookie
membphis commented on a change in pull request #1599: URL: https://github.com/apache/incubator-apisix/pull/1599#discussion_r429953774 ## File path: t/plugin/batch-requests.t ## @@ -684,3 +684,84 @@ GET /aggregate passed --- no_error_log [error] + + + +=== TEST 15: copy cookie to every rquest Review comment: `rquest` typo 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] [incubator-apisix] membphis closed issue #1559: The custom plug-in returns the result garbled
membphis closed issue #1559: URL: https://github.com/apache/incubator-apisix/issues/1559 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] [incubator-apisix] membphis commented on pull request #1588: fixed some doc styles
membphis commented on pull request #1588: URL: https://github.com/apache/incubator-apisix/pull/1588#issuecomment-633621038 I think we can close this PR first. @dayongi if you want to submit your new docs, you can submit them with new small PRs. 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] [incubator-apisix] membphis commented on pull request #1589: doc: add coc file
membphis commented on pull request #1589: URL: https://github.com/apache/incubator-apisix/pull/1589#issuecomment-633821093 @ShiningRush we need this line. https://github.com/apache/skywalking/blob/master/CODE_OF_CONDUCT.md ![image](https://user-images.githubusercontent.com/6814606/82864867-1a92fb00-9f58-11ea-8305-82949a91711c.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] [incubator-apisix-dashboard] juzhiyuan commented on issue #215: Fix wrong GitHub Action
juzhiyuan commented on issue #215: URL: https://github.com/apache/incubator-apisix-dashboard/issues/215#issuecomment-633739581 related PR https://github.com/apache/incubator-apisix-website/pull/41 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] [incubator-apisix] agile6v merged pull request #1595: test cases: add doc and test cases for how to redirect http to https.
agile6v merged pull request #1595: URL: https://github.com/apache/incubator-apisix/pull/1595 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] [incubator-apisix-dashboard] juzhiyuan opened a new issue #215: Fix wrong GitHub Action
juzhiyuan opened a new issue #215: URL: https://github.com/apache/incubator-apisix-dashboard/issues/215 We need to fix the GitHub Action so it could push bundled files to `asf-site` branch instead of `gh-pages`. related issue https://github.com/apache/incubator-apisix-dashboard/issues/213 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] [incubator-apisix-dashboard] Rapiz1 commented on issue #216: Fix wrong styles for website
Rapiz1 commented on issue #216: URL: https://github.com/apache/incubator-apisix-dashboard/issues/216#issuecomment-633819639 It's strange because I `diff` the new and the old style. They seem mostly equivalent. 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] [incubator-apisix-website] juzhiyuan edited a comment on pull request #41: Change publish branch for GitHub Action
juzhiyuan edited a comment on pull request #41: URL: https://github.com/apache/incubator-apisix-website/pull/41#issuecomment-633813528 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] [incubator-apisix-website] Rapiz1 opened a new pull request #42: Change Hugo version in GitHub Action
Rapiz1 opened a new pull request #42: URL: https://github.com/apache/incubator-apisix-website/pull/42 [Works on my fork](https://github.com/Rapiz1/incubator-apisix-website/tree/asf-site) 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] [incubator-apisix-website] juzhiyuan opened a new issue #44: Translate Contributor Guide
juzhiyuan opened a new issue #44: URL: https://github.com/apache/incubator-apisix-website/issues/44 https://apisix.apache.org/zh/contribute/contributor/ 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] [incubator-apisix] membphis closed pull request #1588: fixed some doc styles
membphis closed pull request #1588: URL: https://github.com/apache/incubator-apisix/pull/1588 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] [incubator-apisix-website] juzhiyuan merged pull request #41: Change publish branch for GitHub Action
juzhiyuan merged pull request #41: URL: https://github.com/apache/incubator-apisix-website/pull/41 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] [incubator-apisix] dabue opened a new pull request #1616: correct the overhead to fix the bug for #1615
dabue opened a new pull request #1616: URL: https://github.com/apache/incubator-apisix/pull/1616 correct the value of overhead in plugins/prometheus/exporter.lua Fix #1665 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] [incubator-apisix-website] Rapiz1 commented on pull request #43: Try to fix style
Rapiz1 commented on pull request #43: URL: https://github.com/apache/incubator-apisix-website/pull/43#issuecomment-633919776 Glad to hear that 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] [incubator-apisix-dashboard] juzhiyuan closed issue #216: Fix wrong styles for website
juzhiyuan closed issue #216: URL: https://github.com/apache/incubator-apisix-dashboard/issues/216 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] [incubator-apisix-docker] gxthrj opened a new pull request #54: Add github action
gxthrj opened a new pull request #54: URL: https://github.com/apache/incubator-apisix-docker/pull/54 Add github action with docker-compose in linux os Related to # 3 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] [incubator-apisix] membphis merged pull request #1591: fix: add default checkw for default and hide install command
membphis merged pull request #1591: URL: https://github.com/apache/incubator-apisix/pull/1591 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] [incubator-apisix] membphis commented on pull request #1607: change: updated prometheus to version 1.1 .
membphis commented on pull request #1607: URL: https://github.com/apache/incubator-apisix/pull/1607#issuecomment-633768774 here is the result of the benchmark: ![image](https://user-images.githubusercontent.com/6814606/82853091-481b7c80-9f37-11ea-888a-db48f142e408.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] [incubator-apisix-website] juzhiyuan commented on pull request #41: Change publish branch for GitHub Action
juzhiyuan commented on pull request #41: URL: https://github.com/apache/incubator-apisix-website/pull/41#issuecomment-633737784 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] [incubator-apisix-website] juzhiyuan commented on pull request #43: Try to fix style
juzhiyuan commented on pull request #43: URL: https://github.com/apache/incubator-apisix-website/pull/43#issuecomment-633919343 @Rapiz1 Thanks!! It works in the end! 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] [incubator-apisix-website] Rapiz1 opened a new pull request #41: Change publish branch for GitHub Action
Rapiz1 opened a new pull request #41: URL: https://github.com/apache/incubator-apisix-website/pull/41 Fix https://github.com/apache/incubator-apisix-dashboard/issues/215 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] [incubator-apisix] dabue opened a new pull request #1611: fix some doc style for response-rewrite* and health-check.md
dabue opened a new pull request #1611: URL: https://github.com/apache/incubator-apisix/pull/1611 fix the doc style for response-rewrite* and health-check.md related issue: #1273 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] [incubator-apisix] JanLi-air commented on issue #1615: bugfix(prometheus): the `overhead` should use millisecond units, so it needs to be multiplied by 1000
JanLi-air commented on issue #1615: URL: https://github.com/apache/incubator-apisix/issues/1615#issuecomment-634030245 overhead already has 1000 multiplied, this should be `overhead = overhead - tonumber(ctx.var.upstream_response_time) * 1000` 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] [incubator-apisix] membphis merged pull request #1598: Fix garbled Chinese response in browser. close #1559
membphis merged pull request #1598: URL: https://github.com/apache/incubator-apisix/pull/1598 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] [incubator-apisix-docker] moonming merged pull request #54: Add github action
moonming merged pull request #54: URL: https://github.com/apache/incubator-apisix-docker/pull/54 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] [incubator-apisix] membphis commented on issue #1615: bugfix(prometheus): the `overhead` should use millisecond units, so it needs to be multiplied by 1000
membphis commented on issue #1615: URL: https://github.com/apache/incubator-apisix/issues/1615#issuecomment-634031184 @JanLi-air many thx, your way is right. I was wrong 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] [incubator-apisix-website] Rapiz1 commented on pull request #41: Change publish branch for GitHub Action
Rapiz1 commented on pull request #41: URL: https://github.com/apache/incubator-apisix-website/pull/41#issuecomment-633590203 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] [incubator-apisix-dashboard] juzhiyuan opened a new issue #216: Fix wrong styles for website
juzhiyuan opened a new issue #216: URL: https://github.com/apache/incubator-apisix-dashboard/issues/216 related PR https://github.com/apache/incubator-apisix-website/pull/41 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] [incubator-apisix-dashboard] juzhiyuan closed issue #215: Fix wrong GitHub Action
juzhiyuan closed issue #215: URL: https://github.com/apache/incubator-apisix-dashboard/issues/215 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] [incubator-apisix] cindyliu-tec commented on issue #1613: request help: dashboard page return 403
cindyliu-tec commented on issue #1613: URL: https://github.com/apache/incubator-apisix/issues/1613#issuecomment-633794838 An other problem, I also try to install via source code, is hard to install luarocks dependencies in china, i have never succeed even one time, it get stuck there, it's there any solution? ![image](https://user-images.githubusercontent.com/56294517/82859028-25459400-9f48-11ea-8671-613738d81d84.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] [incubator-apisix] membphis opened a new issue #1615: bugfix(prometheus):
membphis opened a new issue #1615: URL: https://github.com/apache/incubator-apisix/issues/1615 The statistics should use millisecond units, so it needs to be multiplied by 1000. https://github.com/apache/incubator-apisix/blob/master/apisix/plugins/prometheus/exporter.lua#L113 ```lua overhead = overhead - tonumber(ctx.var.upstream_response_time) overhead = overhead * 1000 ``` 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] [incubator-apisix] membphis commented on a change in pull request #1591: fix: add default checkw for default and hide install command
membphis commented on a change in pull request #1591: URL: https://github.com/apache/incubator-apisix/pull/1591#discussion_r429987017 ## File path: Makefile ## @@ -108,9 +108,8 @@ reload: default $(OR_EXEC) -p $$PWD/ -c $$PWD/conf/nginx.conf -s reload -### install: Install the apisix Review comment: this line is useful, we can not delete it. ![image](https://user-images.githubusercontent.com/6814606/82825642-2e018000-9ede-11ea-8539-a27b1960a5d5.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] [incubator-apisix] membphis commented on pull request #1609: feat: enhance `PATCH` method, allow to update partial data.
membphis commented on pull request #1609: URL: https://github.com/apache/incubator-apisix/pull/1609#issuecomment-633616688 https://travis-ci.org/github/apache/incubator-apisix/jobs/690830709#L879 ``` t/admin/routes.t (Wstat: 2048 Tests: 135 Failed: 8) Failed tests: 79-83, 85-87 Non-zero exit status: 8 t/admin/services.t (Wstat: 512 Tests: 81 Failed: 2) Failed tests: 67-68 Non-zero exit status: 2 t/admin/upstream.t (Wstat: 512 Tests: 109 Failed: 2) Failed tests: 65-66 Non-zero exit status: 2 ``` 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] [incubator-apisix-website] Rapiz1 opened a new pull request #43: Try to fix style
Rapiz1 opened a new pull request #43: URL: https://github.com/apache/incubator-apisix-website/pull/43 Fix https://github.com/apache/incubator-apisix-dashboard/issues/216 I'm not familiar with `hugo` but with the `extended` parameter, the page looks normal. Tested with `python -m http.server` 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] [incubator-apisix] moonming opened a new pull request #1612: doc: add asf.yaml.
moonming opened a new pull request #1612: URL: https://github.com/apache/incubator-apisix/pull/1612 `asf.yaml` is used to control the description and tags of the project 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] [incubator-apisix] cindyliu-tec opened a new issue #1613: request help: dashboard page return 403
cindyliu-tec opened a new issue #1613: URL: https://github.com/apache/incubator-apisix/issues/1613 ### Issue description I install apisix via docker image, follow the document steps, its quite smoothly, but when i try to view dashboard, it returns 403. ![image](https://user-images.githubusercontent.com/56294517/82857938-0265b080-9f45-11ea-98c3-4f722280b4eb.png) then i try to modify config.yaml file allow_admin param,but it still does'nt work. I'm wondering what's the problem, please help me. ![image](https://user-images.githubusercontent.com/56294517/82858064-62f4ed80-9f45-11ea-864a-3c813784727c.png) ### Environment * apisix version (cmd: `apisix version`): * OS:macOS、docker 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] [incubator-apisix] cyxinda opened a new issue #1614: bug: the value of operationName in ExitSpan is nil in the plugin of skywalking
cyxinda opened a new issue #1614: URL: https://github.com/apache/incubator-apisix/issues/1614 ### Issue description the value of operationName in ExitSpan is nil in the plugin of skywalking,that is because of the value of ctx.var.upstream_uri in the line 54 of the file of apisix/plugins/skywalking/tracer.lua is nil. ### Environment * apisix version (cmd: `apisix version`):the mix version of master and moonming/apisix * OS: centos 7.5 ### Minimal test code / Steps to reproduce the issue 1.There are some wrong with the ui of skywalking,as follow: ![image](https://user-images.githubusercontent.com/7237898/82865363-24692e00-9f59-11ea-97cc-9805c0e1d9b4.png) 2. I analysis of the messages from skywalking web server ,And find that the endpointname is nil. ![image](https://user-images.githubusercontent.com/7237898/82865580-a6f1ed80-9f59-11ea-8981-5aa990122124.png) 3.I log the message that is sended to skywalking server in the apisix.the operationName value is nil string. ![image](https://user-images.githubusercontent.com/7237898/82865791-2bdd0700-9f5a-11ea-9c76-2c4d7333743c.png) And the code about that is in the line 54 of the file of apisix/plugins/skywalking/tracer.lua. ![image](https://user-images.githubusercontent.com/7237898/82865967-9130f800-9f5a-11ea-9fc5-a1fd3f028004.png) ### What's the actual result? (including assertion message & call stack if applicable) the value of ctx.var.upstream_uri in the line 54 of the file of apisix/plugins/skywalking/tracer.lua is nil ### 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] [incubator-apisix] membphis commented on a change in pull request #1595: test cases: add doc and test cases for how to redirect http to https.
membphis commented on a change in pull request #1595: URL: https://github.com/apache/incubator-apisix/pull/1595#discussion_r429985906 ## File path: FAQ.md ## @@ -107,11 +107,81 @@ curl -i http://127.0.0.1:9080/apisix/admin/routes/2 -H 'X-API-KEY: edd1c9f034335 }' ``` + Here is the operator list of current `lua-resty-radixtree`: https://github.com/iresty/lua-resty-radixtree#operator-list +## How to redirect http to https via APISIX? + +An example, redirect `http://foo.com` to `https://foo.com` + +There are several different ways to do this. +1. `redirect` plugin: + +```shell +curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' +{ +"uri": "/hello", +"host": "foo.com", +"vars": [ +[ +"scheme", +"==", +"http" +] +], +"plugins": { +"redirect": { +"uri": "https://$host$request_uri";, +"ret_code": 301 +} +} +}' +``` + +1. `serverless` plugin: Review comment: @moonming any news? ![image](https://user-images.githubusercontent.com/6814606/82825420-cba87f80-9edd-11ea-982c-a8ca1582be67.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] [incubator-apisix-website] juzhiyuan merged pull request #43: Try to fix style
juzhiyuan merged pull request #43: URL: https://github.com/apache/incubator-apisix-website/pull/43 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] [incubator-apisix] membphis merged pull request #1607: change: updated prometheus to version 1.1 .
membphis merged pull request #1607: URL: https://github.com/apache/incubator-apisix/pull/1607 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
[incubator-apisix-website] 01/01: feat: added incubating
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch feat-add-incubating in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git commit 3f0c4ec424c674e6e7c7be56ab1f131f43420a52 Author: juzhiyuan AuthorDate: Wed May 27 10:00:16 2020 +0800 feat: added incubating --- README.md | 4 ++-- config.yaml| 14 +++--- content/contribute/committer/index.en.md | 2 +- content/contribute/committer/index.zh.md | 2 +- content/contribute/contributor/index.en.md | 2 +- content/contribute/contributor/index.zh.md | 2 +- content/contribute/subscribe/index.en.md | 2 +- content/contribute/subscribe/index.zh.md | 4 ++-- content/downloads/index.en.md | 2 +- content/downloads/index.zh.md | 2 +- content/team/index.en.md | 4 ++-- content/team/index.zh.md | 2 +- layouts/partials/footer.html | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 31f9715..28c277d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Apache APISIX +# Apache APISIX (incubating) -> The website of [Apache APISIX](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. +> The website of [Apache APISIX (incubating)](https://github.com/apache/incubator-apisix), a cloud-native microservices api gateway. ## Development ```sh diff --git a/config.yaml b/config.yaml index 5b4ff54..f32a2d3 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ baseURL: https://apisix.incubator.apache.org/ -title: Apache APISIX +title: Apache APISIX (incubating) theme: hugo-fresh googleAnalytics: #Put in your tracking code without quotes like this: UA-XX... #Disables warningss @@ -13,10 +13,10 @@ languages: params: hero: # Main hero title -title: Apache APISIX +title: Apache APISIX (incubating) # Hero subtitle (optional) subtitle1: Cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices. -subtitle2: Apache APISIX is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. +subtitle2: Apache APISIX (incubating) is based on Nginx and etcd. Compared with traditional API gateways, APISIX has dynamic routing and plug-in hot loading, which is especially suitable for API management under micro-service system. subtitle3: Apache releases are beginning from version 0.9. # Button text buttontext: View on GitHub @@ -75,7 +75,7 @@ languages: name: 中 link: /zh section1: -title: Why Apache APISIX? +title: Why Apache APISIX (incubating)? tiles: - title: High availability, safety first icon: mouse-globe @@ -108,7 +108,7 @@ languages: params: hero: # Main hero title - title: Apache APISIX + title: Apache APISIX (incubating) # Hero subtitle (optional) subtitle1: 云原生、高性能、可扩展的微服务 API 网关 subtitle2: 基于 Nginx 和 etcd 来实现,具备动态路由、插件热加载和 gRPC 代理和协议转换功能,更适合微服务体系下的 API 管理 @@ -170,7 +170,7 @@ languages: name: EN link: / section1: - title: 为什么选择 Apache APISIX? + title: 为什么选择 Apache APISIX (incubating)? tiles: - title: 高可用,安全第一 icon: mouse-globe @@ -185,7 +185,7 @@ languages: icon: doc-sync text: 支持 http 到 gRPC 的协议转换,支持 websocket、gRPC、Dubbo、MQTT 的代理,支持包括 ARM64 在内的多种平台 section3: - title: 谁在使用 Apache APISIX? + title: 谁在使用 Apache APISIX (incubating)? image: https://raw.githubusercontent.com/iresty/iresty.com/master/user-wall.jpg section5: true footer: diff --git a/content/contribute/committer/index.en.md b/content/contribute/committer/index.en.md index ecd5231..df66509 100644 --- a/content/contribute/committer/index.en.md +++ b/content/contribute/committer/index.en.md @@ -28,7 +28,7 @@ include_footer: true Promotion -The Apache APISIX community follows the http://community.apache.org/newcommitter.html";>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC. +The Apache APISIX (incubating) community follows the http://community.apache.org/newcommitter.html";>Apache Community’s process on accepting a new committer. After a contributor participates APISIX's community actively, (P)PMC and Committers will make decisions to invite the contributor join Committers and (P)PMC. Processes are: 1. Start the discussio
[incubator-apisix-website] branch feat-add-incubating created (now 3f0c4ec)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-add-incubating in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git. at 3f0c4ec feat: added incubating This branch includes the following new commits: new 3f0c4ec feat: added incubating 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.
[incubator-apisix] branch master updated: test cases: add doc and test cases for how to redirect http to https. (#1595)
This is an automated email from the ASF dual-hosted git repository. agile6v pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git The following commit(s) were added to refs/heads/master by this push: new 67a2096 test cases: add doc and test cases for how to redirect http to https. (#1595) 67a2096 is described below commit 67a20965408ee9bb354b9bfb59fcf5bd38584905 Author: Wen Ming AuthorDate: Tue May 26 23:11:29 2020 +0800 test cases: add doc and test cases for how to redirect http to https. (#1595) * add FAQ about redirect http To https * add test cases for serverless plugin and redirect plugin Co-authored-by: rhubard <18734141...@163.com> --- FAQ.md| 72 ++- FAQ_CN.md | 71 +- t/plugin/redirect.t | 52 + t/plugin/serverless.t | 59 + 4 files changed, 252 insertions(+), 2 deletions(-) diff --git a/FAQ.md b/FAQ.md index c75218f..55c1590 100644 --- a/FAQ.md +++ b/FAQ.md @@ -78,7 +78,7 @@ An example, if you want to group by the request param `arg_id`: 1. Group A:arg_id <= 1000 2. Group B:arg_id > 1000 -here is the way: +here is the way: ```shell curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' { @@ -107,11 +107,81 @@ curl -i http://127.0.0.1:9080/apisix/admin/routes/2 -H 'X-API-KEY: edd1c9f034335 }' ``` + Here is the operator list of current `lua-resty-radixtree`: https://github.com/iresty/lua-resty-radixtree#operator-list +## How to redirect http to https via APISIX? + +An example, redirect `http://foo.com` to `https://foo.com` + +There are several different ways to do this. +1. `redirect` plugin: + +```shell +curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' +{ +"uri": "/hello", +"host": "foo.com", +"vars": [ +[ +"scheme", +"==", +"http" +] +], +"plugins": { +"redirect": { +"uri": "https://$host$request_uri";, +"ret_code": 301 +} +} +}' +``` + +2. `serverless` plugin: + +```shell +curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' +{ +"uri": "/hello", +"plugins": { +"serverless-pre-function": { +"phase": "rewrite", +"functions": ["return function() if ngx.var.scheme == \"http\" and ngx.var.host == \"foo.com\" then ngx.header[\"Location\"] = \"https://foo.com\"; .. ngx.var.request_uri; ngx.exit(ngx.HTTP_MOVED_PERMANENTLY); end; end"] +} +} +}' +``` + +Then test it to see if it works: +```shell +curl -i -H 'Host: foo.com' http://127.0.0.1:9080/hello +``` + +The response body should be: +``` +HTTP/1.1 301 Moved Permanently +Date: Mon, 18 May 2020 02:56:04 GMT +Content-Type: text/html +Content-Length: 166 +Connection: keep-alive +Location: https://foo.com/hello +Server: APISIX web server + + +301 Moved Permanently + +301 Moved Permanently +openresty + + +``` + + ## How to fix OpenResty Installation Failure on MacOS 10.15 When you install the OpenResty on MacOs 10.15, you may face this error + ```shell > brew install openresty Updating Homebrew... diff --git a/FAQ_CN.md b/FAQ_CN.md index 8221cd4..2a576a6 100644 --- a/FAQ_CN.md +++ b/FAQ_CN.md @@ -73,7 +73,7 @@ luarocks 服务。 运行 `luarocks config rocks_servers` 命令(这个命令 如果使用代理仍然解决不了这个问题,那可以在安装的过程中添加 `--verbose` 选项来查看具体是慢在什么地方。排除前面的 第一种情况,只可能是第二种,`git` 协议被封。这个时候可以执行 `git config --global url."https://".insteadOf git://` 命令使用 `https` 协议替代。 -## 如何通过APISIX支持A/B测试? +## 如何通过 APISIX 支持 A/B 测试? 比如,根据入参`arg_id`分组: @@ -81,6 +81,7 @@ luarocks 服务。 运行 `luarocks config rocks_servers` 命令(这个命令 2. B组:arg_id > 1000 可以这么做: + ```shell curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' { @@ -109,9 +110,77 @@ curl -i http://127.0.0.1:9080/apisix/admin/routes/2 -H 'X-API-KEY: edd1c9f034335 }' ``` + 更多的 lua-resty-radixtree 匹配操作,可查看操作列表: https://github.com/iresty/lua-resty-radixtree#operator-list +## 如何支持 http 自动跳转到 https? + +比如,将 `http://foo.com` 重定向到 `https://foo.com` + +有几种不同的方法来实现: +1. 使用`redirect`插件: + +```shell +curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' +{ +"uri": "/hello", +"host": "foo.com", +"vars": [ +[ +"scheme", +"==", +"http" +] +], +"plugins": { +"redirect": { +"uri": "https://$host$request_uri";, +"ret_code": 301 +} +} +}' +``` + +2. 使用`serverless`插件: + +```shell +curl -i http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: ed
[incubator-apisix] branch master updated: makefile: add default check for install command (#1591)
This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git The following commit(s) were added to refs/heads/master by this push: new 1bc2af5 makefile: add default check for install command (#1591) 1bc2af5 is described below commit 1bc2af56c1bd168e8e8282bf0b75f644cc9b3abc Author: Vinci Xu <277040...@qq.com> AuthorDate: Tue May 26 21:26:52 2020 +0800 makefile: add default check for install command (#1591) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 66b44cc..16ded88 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ reload: default ### install: Install the apisix .PHONY: install -install: +install: default $(INSTALL) -d /usr/local/apisix/ $(INSTALL) -d /usr/local/apisix/logs/ $(INSTALL) -d /usr/local/apisix/conf/cert
[incubator-apisix-website] branch asf-site updated: Deploy to GitHub pages
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 7f01eba Deploy to GitHub pages 7f01eba is described below commit 7f01ebab0ef7a678691d9193edde1b283a1947d8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue May 26 09:34:45 2020 + Deploy to GitHub pages --- contribute/2fa/index.html| 2 +- contribute/committer/index.html | 2 +- contribute/contributor/index.html| 2 +- contribute/release/index.html| 2 +- contribute/security/index.html | 2 +- contribute/subscribe/index.html | 2 +- downloads/index.html | 2 +- index.html | 2 +- team/index.html | 2 +- zh/contribute/2fa/index.html | 2 +- zh/contribute/committer/index.html | 2 +- zh/contribute/contributor/index.html | 2 +- zh/contribute/release/index.html | 2 +- zh/contribute/security/index.html| 2 +- zh/contribute/subscribe/index.html | 2 +- zh/downloads/index.html | 2 +- zh/index.html| 2 +- zh/team/index.html | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contribute/2fa/index.html b/contribute/2fa/index.html index 3a15846..0191870 100644 --- a/contribute/2fa/index.html +++ b/contribute/2fa/index.html @@ -20,7 +20,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/contribute/committer/index.html b/contribute/committer/index.html index 792abb8..d5a6413 100644 --- a/contribute/committer/index.html +++ b/contribute/committer/index.html @@ -27,7 +27,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/contribute/contributor/index.html b/contribute/contributor/index.html index 064cb03..7126f47 100644 --- a/contribute/contributor/index.html +++ b/contribute/contributor/index.html @@ -23,7 +23,7 @@ Submit an issue 1. Before submitting your issues, please go through a comprehens https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/contribute/release/index.html b/contribute/release/index.html index ff2e7b3..67d659c 100644 --- a/contribute/release/index.html +++ b/contribute/release/index.html @@ -26,7 +26,7 @@ GnuPG-2.x可使用: https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/contribute/security/index.html b/contribute/security/index.html index e641991..372f23b 100644 --- a/contribute/security/index.html +++ b/contribute/security/index.html @@ -20,7 +20,7 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/contribute/subscribe/index.html b/contribute/subscribe/index.html index aa862c9..94f6499 100644 --- a/contribute/subscribe/index.html +++ b/contribute/subscribe/index.html @@ -21,7 +21,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/downloads/index.html b/downloads/index.html index cb4fb6d..764e435 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -19,7 +19,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/index.html b/index.html index 53e9620..caf941e 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/team/index.html b/team/index.html index 3b35633..a38d88c 100644 --- a/team/index.html +++ b/team/index.html @@ -19,7 +19,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/zh/contribute/2fa/index.html b/zh/contribute/2fa/index.html index f19c5a6..7d64d82 100644 --- a/zh/contribute/2fa/index.html +++ b/zh/contribute/2fa/index.html @@ -20,7 +20,7 @@ Note:If you do not enable 2FA, you will be removed from the project and unable t https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/zh/contribute/committer/index.html b/zh/contribute/committer/index.html index d5fbd97..86e4eff 100644 --- a/zh/contribute/committer/index.html +++ b/zh/contribute/committer/index.html @@ -33,7 +33,7 @@ https://fonts.googleapis.com/css?family=Open+Sans:400,600"; rel="stylesheet"> - + diff --git a/zh/contribute/contributor/index.html b/zh/contribute/contributor/index.html index 6c7cb9d..2817f16 100644 --- a/zh/contri
[incubator-apisix-website] branch master updated: Try to fix style (#43)
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/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new a981a96 Try to fix style (#43) a981a96 is described below commit a981a967bc109f045602092a6f979dc7ffd62d33 Author: Rapiz AuthorDate: Tue May 26 17:34:24 2020 +0800 Try to fix style (#43) --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c55e5a5..463e87c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,7 @@ jobs: uses: peaceiris/actions-hugo@v2.4.11 with: hugo-version: '0.58.3' +extended: true - name: Build run: hugo