[GitHub] [apisix-website] iamayushdas commented on issue #326: docs: many broken links our residing in website
iamayushdas commented on issue #326: URL: https://github.com/apache/apisix-website/issues/326#issuecomment-831698099 @xdshivani would you like to work in this issue? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas removed a comment on pull request #4175: docs: fix broken links and ids in plugins
iamayushdas removed a comment on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831686349 @KishaniKandasamy what do you think about adding or nesting it into authentication -> hmac-auth -> Signature generate example, or you can add a section of example as a type of doc inside authentication, do you agree? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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-commenter edited a comment on pull request #1816: feat: Use monaco editor
codecov-commenter edited a comment on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-826045073 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1816](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (9e0f7cb) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/45908018abf258cc303cca46ffbab60bbd2a837b?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (4590801) will **increase** coverage by `0.55%`. > The diff coverage is `59.13%`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1816 +/- ## == + Coverage 71.78% 72.34% +0.55% == Files 172 125 -47 Lines6100 2958-3142 Branches 713 711 -2 == - Hits 4379 2140-2239 + Misses 1478 818 -660 + Partials 2430 -243 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `?` | | | frontend-e2e-test | `72.34% <59.13%> (+0.36%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/components/RawDataEditor/RawDataEditor.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Jhd0RhdGFFZGl0b3IvUmF3RGF0YUVkaXRvci50c3g=) | `40.67% <40.00%> (+2.94%)` | :arrow_up: | | [web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4) | `64.78% <60.97%> (+1.85%)` | :arrow_up: | | [...ages/Route/components/DebugViews/DebugDrawView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL0RlYnVnVmlld3MvRGVidWdEcmF3Vmlldy50c3g=) | `78.80% <77.41%> (+1.66%)` | :arrow_up: | | [web/src/components/Plugin/PluginPage.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5QYWdlLnRzeA==) | `97.40% <100.00%> (-1.30%)` | :arrow_down: | | [web/src/pages/Route/constants.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb25zdGFudHMudHM=) | `100.00% <100.00%> (ø)` | | | [web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=) | `94.64% <0.00%> (-0.10%)` | :arrow_down: | | [web/src/components/Plugin/data.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9kYXRhLnRzeA==) | `100.00% <0.00%> (ø)` | | |
[GitHub] [apisix] spacewander commented on a change in pull request #4175: docs: fix broken links and ids in plugins
spacewander commented on a change in pull request #4175:
URL: https://github.com/apache/apisix/pull/4175#discussion_r625513277
##
File path: docs/en/latest/config.json
##
@@ -162,6 +162,13 @@
"discovery/eureka"
]
},
+{
+ "type": "category",
+ "label": "Examples",
Review comment:
Don't add it to the sidebar. It doesn't belong to that.
Please revert the change.
Please explain yourself clearly when submitting the change.
I don't even know why you want to add it to the sidebar.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix] iamayushdas edited a comment on pull request #4175: docs: fix broken links and ids in plugins
iamayushdas edited a comment on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831686349 @KishaniKandasamy what do you think about adding or nesting it into authentication -> hmac-auth -> Signature generate example, or you can add a section of example as a type of doc inside authentication, do you agree? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on pull request #4175: docs: fix broken links and ids in plugins
iamayushdas commented on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831686349 @KishaniKandasamy what do you think about adding or nesting it into authentication -> hmac-auth -> Signature generate example -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #4175: docs: fix broken links and ids in plugins
spacewander commented on a change in pull request #4175: URL: https://github.com/apache/apisix/pull/4175#discussion_r625512291 ## File path: docs/en/latest/plugins/authz-keycloak.md ## @@ -42,9 +42,9 @@ For more information on Keycloak, refer to [Keycloak Authorization Docs](https:/ | Name | Type | Requirement | Default | Valid | Description | | -- | - | --- | - | -- | --- | -| discovery | string| optional| | https://host.domain/auth/realms/foo/.well-known/uma2-configuration | URL to discovery document for Keycloak Authorization Services. | -| token_endpoint | string| optional| | https://host.domain/auth/realms/foo/protocol/openid-connect/token | A OAuth2-compliant Token Endpoint that supports the `urn:ietf:params:oauth:grant-type:uma-ticket` grant type. Overrides value from discovery, if given. | -| resource_registration_endpoint | string| optional| | https://host.domain/auth/realms/foo/authz/protection/resource_set | A Keycloak Protection API-compliant resource registration endpoint. Overrides value from discovery, if given. | +| discovery | string| optional| | `https://host.domain/auth/realms/foo/.well-known/uma2-configuration` | URL to discovery document for Keycloak Authorization Services. | Review comment: I can't understand what you mean. Does adding '``' make things different? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #3719: I switched the resolver to lua-resty-dns-client， I found a problem. At present, after using this dns client, upstream services can implement dns searc
spacewander closed issue #3719: URL: https://github.com/apache/apisix/issues/3719 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #4114: feat: patch tcp.sock.connect to use our DNS resolver
spacewander merged pull request #4114: URL: https://github.com/apache/apisix/pull/4114 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat: patch tcp.sock.connect to use our DNS resolver (#4114)
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 f914807 feat: patch tcp.sock.connect to use our DNS resolver (#4114)
f914807 is described below
commit f9148073aa5edc774b87cae7cb3eee5d634e3f61
Author: 罗泽轩
AuthorDate: Tue May 4 13:07:48 2021 +0800
feat: patch tcp.sock.connect to use our DNS resolver (#4114)
Co-authored-by: Alex Zhang
---
apisix/core.lua | 1 +
apisix/core/resolver.lua | 51
apisix/core/utils.lua| 3 ++-
apisix/init.lua | 30 ++---
apisix/patch.lua | 42 -
apisix/plugins/traffic-split.lua | 3 +--
t/misc/patch.t | 25 ++
t/node/route-domain-with-local-dns.t | 4 +--
8 files changed, 125 insertions(+), 34 deletions(-)
diff --git a/apisix/core.lua b/apisix/core.lua
index b0c3da6..0ef6ae9 100644
--- a/apisix/core.lua
+++ b/apisix/core.lua
@@ -48,5 +48,6 @@ return {
dns_client = require("apisix.core.dns.client"),
etcd= require("apisix.core.etcd"),
tablepool = require("tablepool"),
+resolver= require("apisix.core.resolver"),
empty_tab = {},
}
diff --git a/apisix/core/resolver.lua b/apisix/core/resolver.lua
new file mode 100644
index 000..d6b76cd
--- /dev/null
+++ b/apisix/core/resolver.lua
@@ -0,0 +1,51 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local json = require("apisix.core.json")
+local log = require("apisix.core.log")
+local utils = require("apisix.core.utils")
+
+
+local _M = {}
+
+
+function _M.init_resolver(args)
+local dns_resolver = args and args["dns_resolver"]
+utils.set_resolver(dns_resolver)
+log.info("dns resolver ", json.delay_encode(dns_resolver, true))
+end
+
+
+function _M.parse_domain(host)
+local ip_info, err = utils.dns_parse(host)
+if not ip_info then
+log.error("failed to parse domain: ", host, ", error: ",err)
+return nil, err
+end
+
+log.info("parse addr: ", json.delay_encode(ip_info))
+log.info("resolver: ", json.delay_encode(utils.get_resolver()))
+log.info("host: ", host)
+if ip_info.address then
+log.info("dns resolver domain: ", host, " to ", ip_info.address)
+return ip_info.address
+end
+
+return nil, "failed to parse domain"
+end
+
+
+return _M
diff --git a/apisix/core/utils.lua b/apisix/core/utils.lua
index 921df6a..1b304f7 100644
--- a/apisix/core/utils.lua
+++ b/apisix/core/utils.lua
@@ -114,9 +114,10 @@ end
_M.dns_parse = dns_parse
-function _M.set_resolver(resolvers)
+local function set_resolver(resolvers)
dns_resolvers = resolvers
end
+_M.set_resolver = set_resolver
function _M.get_resolver(resolvers)
diff --git a/apisix/init.lua b/apisix/init.lua
index 4a30b77..e090377 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -47,17 +47,9 @@ if ngx.config.subsystem == "http" then
end
local load_balancer
local local_conf
-local dns_resolver
local ver_header= "APISIX/" .. core.version.VERSION
-local function parse_args(args)
-dns_resolver = args and args["dns_resolver"]
-core.utils.set_resolver(dns_resolver)
-core.log.info("dns resolver", core.json.delay_encode(dns_resolver, true))
-end
-
-
local _M = {version = 0.4}
@@ -72,7 +64,7 @@ function _M.http_init(args)
"maxrecord=8000", "sizemcode=64",
"maxmcode=4000", "maxirconst=1000")
-parse_args(args)
+core.resolver.init_resolver(args)
core.id.init()
local process = require("ngx.process")
@@ -156,24 +148,6 @@ function _M.http_ssl_phase()
end
-local function parse_domain(host)
-local ip_info, err = core.utils.dns_parse(host)
-if not ip_info then
-core.log.error("failed to parse domain: ", host, ", error: ",err)
-return nil, err
-end
-
-core.log.info("parse addr: ", core.json.delay_encode(ip_info))
-core.log.info("resolver: ",
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1816: feat: Use monaco editor
netlify[bot] edited a comment on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-824585997 Deploy preview for *apisix-dashboard* processing. Building with commit 9e0f7cbbda126e23d67ef8b811174a647e1bc71b https://app.netlify.com/sites/apisix-dashboard/deploys/6090d3732a09cd00076cb998 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] KishaniKandasamy commented on a change in pull request #4175: docs: fix broken links and ids in plugins
KishaniKandasamy commented on a change in pull request #4175:
URL: https://github.com/apache/apisix/pull/4175#discussion_r625503789
##
File path: docs/en/latest/config.json
##
@@ -162,6 +162,13 @@
"discovery/eureka"
]
},
+{
+ "type": "category",
+ "label": "Examples",
Review comment:
then Shall I add this directly to the sidebar?I don't know how to add
https://github.com/apache/apisix/blob/master/docs/en/latest/examples/plugins-hmac-auth-generate-signature.md
tor.Sorry
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on issue #4150: bug: Inconsistent behavior of schema check for response-rewrite plugin between AdminAPI and ManagerAPI
iamayushdas commented on issue #4150: URL: https://github.com/apache/apisix/issues/4150#issuecomment-831675431 i guess the issue is resolved now, you can close the issue now -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] KishaniKandasamy commented on a change in pull request #4175: docs: fix broken links and ids in plugins
KishaniKandasamy commented on a change in pull request #4175: URL: https://github.com/apache/apisix/pull/4175#discussion_r625500678 ## File path: docs/en/latest/plugins/skywalking.md ## @@ -101,7 +101,7 @@ plugin_attr: skywalking: service_name: APISIX service_instance_name: "APISIX Instance Name" -endpoint_addr: http://127.0.0.1:12800 +endpoint_addr: `http://127.0.0.1:12800` Review comment: > Don't blindly add '``'. OOOkay -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] KishaniKandasamy commented on a change in pull request #4175: docs: fix broken links and ids in plugins
KishaniKandasamy commented on a change in pull request #4175: URL: https://github.com/apache/apisix/pull/4175#discussion_r625500422 ## File path: docs/en/latest/plugins/authz-keycloak.md ## @@ -42,9 +42,9 @@ For more information on Keycloak, refer to [Keycloak Authorization Docs](https:/ | Name | Type | Requirement | Default | Valid | Description | | -- | - | --- | - | -- | --- | -| discovery | string| optional| | https://host.domain/auth/realms/foo/.well-known/uma2-configuration | URL to discovery document for Keycloak Authorization Services. | -| token_endpoint | string| optional| | https://host.domain/auth/realms/foo/protocol/openid-connect/token | A OAuth2-compliant Token Endpoint that supports the `urn:ietf:params:oauth:grant-type:uma-ticket` grant type. Overrides value from discovery, if given. | -| resource_registration_endpoint | string| optional| | https://host.domain/auth/realms/foo/authz/protection/resource_set | A Keycloak Protection API-compliant resource registration endpoint. Overrides value from discovery, if given. | +| discovery | string| optional| | `https://host.domain/auth/realms/foo/.well-known/uma2-configuration` | URL to discovery document for Keycloak Authorization Services. | Review comment: I thought they are just **valid url format** and it seems they don't direct to anywhere.   -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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-commenter edited a comment on pull request #1816: feat: Use monaco editor
codecov-commenter edited a comment on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-826045073 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1816](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (3f486ed) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/45908018abf258cc303cca46ffbab60bbd2a837b?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (4590801) will **increase** coverage by `0.54%`. > The diff coverage is `62.39%`. > :exclamation: Current head 3f486ed differs from pull request most recent head 041ece3. Consider uploading reports for the commit 041ece3 to get more accurate results [](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1816 +/- ## == + Coverage 71.78% 72.32% +0.54% == Files 172 125 -47 Lines6100 2956-3144 Branches 713 711 -2 == - Hits 4379 2138-2241 + Misses 1478 818 -660 + Partials 2430 -243 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `?` | | | frontend-e2e-test | `72.32% <62.39%> (+0.34%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1816?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/components/Plugin/data.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9kYXRhLnRzeA==) | `100.00% <ø> (ø)` | | | [web/src/libs/iconfont.js](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9saWJzL2ljb25mb250Lmpz) | `41.37% <ø> (ø)` | | | [web/src/pages/Service/components/Step1.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL2NvbXBvbmVudHMvU3RlcDEudHN4) | `100.00% <ø> (ø)` | | | [web/src/components/RawDataEditor/RawDataEditor.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Jhd0RhdGFFZGl0b3IvUmF3RGF0YUVkaXRvci50c3g=) | `40.67% <40.00%> (+2.94%)` | :arrow_up: | | [web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=) | `94.64% <66.66%> (-0.10%)` | :arrow_down: | | [web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4) | `65.71% <67.56%> (+2.77%)` | :arrow_up: | | [...ages/Route/components/DebugViews/DebugDrawView.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1816/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL0RlYnVnVmlld3MvRGVidWdEcmF3Vmlldy50c3g=) | `77.71% <77.41%>
[GitHub] [apisix-dashboard] qian0817 commented on a change in pull request #1816: feat: Use monaco editor
qian0817 commented on a change in pull request #1816:
URL: https://github.com/apache/apisix-dashboard/pull/1816#discussion_r625499416
##
File path: web/src/components/Plugin/PluginDetail.tsx
##
@@ -190,49 +188,53 @@ const PluginDetail: React.FC = ({
});
});
};
- const handleModeChange = (value: PluginComponent.CodeMirrorMode) => {
+
+ const editorWillMount = (monaco: typeof monacoEditor) => {
+fetchSchema(name, schemaType).then((schema)=> {
+ const schemaConfig = {
+validate: true,
+schemas: [
+ {
+uri: `https://apisix.apache.org/`,
Review comment:
This uri seems like useless if the schema is already set, but this is
required by type and must be a valid uri. So I just use
`https://apisix.apache.org` as a placeholder.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub 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] netlify[bot] edited a comment on pull request #1816: feat: Use monaco editor
netlify[bot] edited a comment on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-824585997 Deploy preview for *apisix-dashboard* processing. Building with commit 041ece3912df45eff04b7a2ac75a3f36eeecb86a https://app.netlify.com/sites/apisix-dashboard/deploys/6090c646ba48990008be5506 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] qian0817 commented on a change in pull request #1816: feat: Use monaco editor
qian0817 commented on a change in pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#discussion_r625496911 ## File path: web/package.json ## @@ -131,7 +132,8 @@ "prettier": "^2.0.1", "pro-download": "1.0.1", "puppeteer-core": "^4.0.1", -"stylelint": "^13.0.0" +"stylelint": "^13.0.0", +"webpack": "^5.35.0" Review comment: yes, need to include webpack 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] netlify[bot] edited a comment on pull request #1816: feat: Use monaco editor
netlify[bot] edited a comment on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-824585997 Deploy preview for *apisix-dashboard* processing. Building with commit c46fb025971884142ac9c6ca490cdba162527d0a https://app.netlify.com/sites/apisix-dashboard/deploys/6090c58fa2f6570007959b30 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] membphis merged pull request #4163: feat: step 3, manage the plugin runner
membphis merged pull request #4163: URL: https://github.com/apache/apisix/pull/4163 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat: step 3, manage the plugin runner (#4163)
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/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 624f59f feat: step 3, manage the plugin runner (#4163)
624f59f is described below
commit 624f59fc78baf9eccc3987ee6bb12d9c0a3d0c43
Author: 罗泽轩
AuthorDate: Tue May 4 10:41:08 2021 +0800
feat: step 3, manage the plugin runner (#4163)
* feat: step 3, manage the plugin runner
* feat: step 4, add prepare_conf protocol
---
apisix/cli/ngx_tpl.lua | 1 +
apisix/constants.lua | 3 +
apisix/init.lua| 1 +
apisix/plugins/ext-plugin/init.lua | 201 ++---
conf/config-default.yaml | 3 +
t/APISIX.pm| 1 +
t/lib/ext-plugin.lua | 29 +-
t/plugin/ext-plugin/runner.sh | 22
t/plugin/ext-plugin/sanity.t | 151 +++-
9 files changed, 396 insertions(+), 16 deletions(-)
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
index 7173a3a..5f935cd 100644
--- a/apisix/cli/ngx_tpl.lua
+++ b/apisix/cli/ngx_tpl.lua
@@ -47,6 +47,7 @@ worker_rlimit_core {* worker_rlimit_core *};
worker_shutdown_timeout {* worker_shutdown_timeout *};
env APISIX_PROFILE;
+env PATH; # for searching external plugin runner's binary
{% if envs then %}
{% for _, name in ipairs(envs) do %}
diff --git a/apisix/constants.lua b/apisix/constants.lua
index c668959..8dac0cb 100644
--- a/apisix/constants.lua
+++ b/apisix/constants.lua
@@ -15,6 +15,9 @@
-- limitations under the License.
--
return {
+RPC_ERROR = 0,
+RPC_PREPARE_CONF = 1,
+RPC_HTTP_REQ_CALL = 2,
HTTP_ETCD_DIRECTORY = {
["/upstreams"] = true,
["/plugins"] = true,
diff --git a/apisix/init.lua b/apisix/init.lua
index 6d8234b..4a30b77 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -127,6 +127,7 @@ function _M.http_init_worker()
require("apisix.debug").init_worker()
require("apisix.upstream").init_worker()
+require("apisix.plugins.ext-plugin.init").init_worker()
local_conf = core.config.local_conf()
diff --git a/apisix/plugins/ext-plugin/init.lua
b/apisix/plugins/ext-plugin/init.lua
index 8901529..924e9f4 100644
--- a/apisix/plugins/ext-plugin/init.lua
+++ b/apisix/plugins/ext-plugin/init.lua
@@ -14,8 +14,20 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
+local is_http = ngx.config.subsystem == "http"
+local flatbuffers = require("flatbuffers")
+local prepare_conf_req = require("A6.PrepareConf.Req")
+local prepare_conf_resp = require("A6.PrepareConf.Resp")
+local text_entry = require("A6.TextEntry")
+local constants = require("apisix.constants")
local core = require("apisix.core")
local helper = require("apisix.plugins.ext-plugin.helper")
+local process, ngx_pipe, events
+if is_http then
+process = require("ngx.process")
+ngx_pipe = require("ngx.pipe")
+events = require("resty.worker.events")
+end
local bit = require("bit")
local band = bit.band
local lshift = bit.lshift
@@ -25,6 +37,10 @@ local ffi_str = ffi.string
local socket_tcp = ngx.socket.tcp
local str_byte = string.byte
local str_format = string.format
+local ngx_timer_at = ngx.timer.at
+local exiting = ngx.worker.exiting
+local error = error
+local events_list
local lrucache = core.lrucache.new({
@@ -34,15 +50,40 @@ local lrucache = core.lrucache.new({
local schema = {
type = "object",
-properties = {},
+properties = {
+conf = {
+type = "array",
+items = {
+type = "object",
+properties = {
+name = {
+type = "string",
+maxLength = 128,
+minLength = 1
+},
+value = {
+type = "string",
+},
+}
+},
+minItems = 1,
+},
+extra_info = {
+type = "array",
+items = {
+type = "string",
+maxLength = 64,
+minLength = 1,
+},
+minItems = 1,
+}
+},
}
local _M = {
schema = schema,
}
-local RPC_ERROR = 0
-local RPC_PREPARE_CONF = 1
-local RPC_HTTP_REQ_CALL = 2
+local builder = flatbuffers.Builder(0)
local send
@@ -86,7 +127,7 @@ local function receive(sock)
end
local ty = str_byte(hdr, 1)
-if ty == RPC_ERROR then
+if ty == constants.RPC_ERROR then
return nil, "TODO: handler err"
end
@@ -115,8 +156,36 @@ local rpc_call
local rpc_handlers = {
nil,
function (conf, ctx, sock)
-local req = "prepare"
-local ok, err = send(sock, RPC_PREPARE_CONF, req)
+
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831648865 After reviewing Chinese versions, I will submit PRs to update EN. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on a change in pull request #4155: URL: https://github.com/apache/apisix/pull/4155#discussion_r625475491 ## File path: docs/zh/latest/plugins/api-breaker.md ## @@ -21,98 +21,69 @@ title: api-breaker # --> -## 目录 +## 简介 -- [**定义**](#定义) -- [**属性列表**](#属性列表) -- [**启用方式**](#启用方式) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) +启用该插件后，网关将根据配置判断上游是否异常，若异常，则直接返回预设的错误码，且在一定时间内不再访问上游。 -## 定义 +## 参数 -该插件实现 API 熔断功能，帮助我们保护上游业务服务。 +|参数名称 |类型| 必选 | 默认值 | 使用范围 | 描述| +| :-: | :: | :---: | :: | :---: | :: | +| break_response_code | 整数型 | 是 || 200 ~ 599 | 上游不健康时，将返回该状态码。 | 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] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831641900 > Please fix English doc first @moonming Please review Chinese docs first. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831641725 > Is it necessary to use docusaurus special syntax? Why not use directly? Those contents are used in the docs site, this syntax will be rendered as `Admonitions Box`.  -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on a change in pull request #4155: URL: https://github.com/apache/apisix/pull/4155#discussion_r625469631 ## File path: docs/zh/latest/plugins/api-breaker.md ## @@ -21,98 +21,69 @@ title: api-breaker # --> -## 目录 +## 简介 -- [**定义**](#定义) -- [**属性列表**](#属性列表) -- [**启用方式**](#启用方式) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) +启用该插件后，网关将根据配置判断上游是否异常，若异常，则直接返回预设的错误码，且在一定时间内不再访问上游。 -## 定义 +## 参数 -该插件实现 API 熔断功能，帮助我们保护上游业务服务。 +|参数名称 |类型| 必选 | 默认值 | 使用范围 | 描述| +| :-: | :: | :---: | :: | :---: | :: | +| break_response_code | 整数型 | 是 || 200 ~ 599 | 上游不健康时，将返回该状态码。 | Review comment: 樂 ok -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on a change in pull request #4155: URL: https://github.com/apache/apisix/pull/4155#discussion_r625469378 ## File path: docs/zh/latest/plugins/basic-auth.md ## @@ -21,128 +21,154 @@ title: basic-auth # --> -## 目录 +## 简介 -- [**名字**](#名字) -- [**属性**](#属性) -- [**如何启用**](#如何启用) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) +启用该插件后，客户端访问路由、服务时需提供正确的用户名与密码，插件将从 HTTP 请求头 Authorization 中获取凭证信息。 -## 名字 +:::caution 注意 Review comment: Those contents are used in the docs site, this syntax will be rendered as `Admonitions Box`.  -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on issue #4176: request help:
spacewander commented on issue #4176: URL: https://github.com/apache/apisix/issues/4176#issuecomment-831638280 You can use ip-restriction and consumer-restriction plugin. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] moonming commented on pull request #4155: docs: improve plugins' documentation (Chinese)
moonming commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831638101 > For docs in English, I would prefer submitting a new PR ✌️ English doc first -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #4155: docs: improve plugins' documentation (Chinese)
spacewander commented on a change in pull request #4155: URL: https://github.com/apache/apisix/pull/4155#discussion_r625459642 ## File path: docs/zh/latest/plugins/api-breaker.md ## @@ -21,98 +21,69 @@ title: api-breaker # --> -## 目录 +## 简介 -- [**定义**](#定义) -- [**属性列表**](#属性列表) -- [**启用方式**](#启用方式) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) +启用该插件后，网关将根据配置判断上游是否异常，若异常，则直接返回预设的错误码，且在一定时间内不再访问上游。 -## 定义 +## 参数 -该插件实现 API 熔断功能，帮助我们保护上游业务服务。 +|参数名称 |类型| 必选 | 默认值 | 使用范围 | 描述| +| :-: | :: | :---: | :: | :---: | :: | +| break_response_code | 整数型 | 是 || 200 ~ 599 | 上游不健康时，将返回该状态码。 | Review comment: The indentation should be left alignment. The center alignment can't be maintained by humans. Please fix all the similar places. ## File path: docs/zh/latest/plugins/basic-auth.md ## @@ -21,128 +21,154 @@ title: basic-auth # --> -## 目录 +## 简介 -- [**名字**](#名字) -- [**属性**](#属性) -- [**如何启用**](#如何启用) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) +启用该插件后，客户端访问路由、服务时需提供正确的用户名与密码，插件将从 HTTP 请求头 Authorization 中获取凭证信息。 -## 名字 +:::caution 注意 Review comment: Is it necessary to use docusaurus special syntax? Why not use `` directly? ## File path: docs/zh/latest/plugins/cors.md ## @@ -21,85 +21,99 @@ title: cors # --> -## 目录 - -- [**简介**](#简介) -- [**属性**](#属性) -- [**如何启用**](#如何启用) -- [**测试插件**](#测试插件) -- [**禁用插件**](#禁用插件) - ## 简介 -`cors` 插件可以让你为服务端启用 [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) 的返回头。 +启用该插件后，网关将针对路由根据预设参数设置 CORS 规则，以便消费者在浏览器中发起请求。 -## 属性 +## 术语 -| 名称 | 类型| 可选项 | 默认值 | 有效值 | 描述 | -| | --- | -- | -- | -- | | -| allow_origins| string | 可选 | "*"|| 允许跨域访问的 Origin，格式如：`scheme`://`host`:`port`，比如: https://somehost.com:8081 。多个值使用 `,` 分割，`allow_credential` 为 `false` 时可以使用 `*` 来表示所有 Origin 均允许通过。你也可以在启用了 `allow_credential` 后使用 `**` 强制允许所有 Origin 都通过，但请注意这样存在安全隐患。 | -| allow_methods| string | 可选 | "*"|| 允许跨域访问的 Method，比如: `GET`，`POST`等。多个值使用 `,` 分割，`allow_credential` 为 `false` 时可以使用 `*` 来表示所有 Origin 均允许通过。你也可以在启用了 `allow_credential` 后使用 `**` 强制允许所有 Method 都通过，但请注意这样存在安全隐患。 | -| allow_headers| string | 可选 | "*"|| 允许跨域访问时请求方携带哪些非 `CORS规范` 以外的 Header， 多个值使用 `,` 分割，`allow_credential` 为 `false` 时可以使用 `*` 来表示所 有 Header 均允许通过。你也可以在启用了 `allow_credential` 后使用 `**` 强制允许所有 Method 都通过，但请注意这样存在安全隐患。 | -| expose_headers | string | 可选 | "*"|| 允许跨域访问时响应方携带哪些非 `CORS规范` 以外的 Header， 多个值使用 `,` 分割。 | -| max_age | integer | 可选 | 5 || 浏览器缓存 CORS 结果的最大时间，单位为秒，在这个时间范围内浏览器会复用上一次的检查结果，`-1` 表示不缓存。请注意各个浏览器允许的的最大时间不同，详情请参考 [MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age#Directives)。 | -| allow_credential | boolean | 可选 | false || 是否允许跨域访问的请求方携带凭据（如 Cookie 等）。根据 CORS 规范，如果设置该选项为 `true`，那么将不能在其他选项中使用 `*`。 | -| allow_origins_by_regex | array | 可选 | nil || 使用正则表达式数组来匹配允许跨域访问的 Origin, 如[".*\.test.com"] 可以匹配任何test.com的子域名`*`。 | +- Origin：请求首部字段 Origin 指示了请求来自于哪个站点。该字段仅指示服务器名称，并不包含任何路径信息。该首部用于 CORS 请求或者 POST 请求。除了不包含路径信息，该字段与 Referer 首部字段相似。 -> **提示** -> -> 请注意 `allow_credential` 是一个很敏感的选项，谨慎选择开启。开启之后，其他参数默认的 `*` 将失效，你必须显式指定它们的值。 -> 使用 `**` 时要充分理解它引入了一些安全隐患，比如 CSRF，所以确保这样的安全等级符合自己预期再使用。 +## 参数 -## 如何启用 +| 参数名 |类型| 必选 | 默认值 | 描述 | +| :: | :: | :---: | :: | :-: | +| allow_origins | 字符串 | 否 | *| `Access-Control-Allow-Origin` 请求头表示允许跨域的 Origin 白名单，格式：`协议://主机名:端口号`。当有多个值时，使用 `,` 分隔。当 `allow_credential = false` 时，可以使用 `*` 以允许任意 Origin；当 `allow_credential = true` 时，可以使用 `**` 强制允许任意
[GitHub] [apisix] juzhiyuan edited a comment on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan edited a comment on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831629657 @iamayushdas, after discussing with @Yiyiyimu, I agree with him, this is more challenge for a non-CN speaker, you could pick other issues like `Web Test` or `Featrures` or `bugfix` issues. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831629657 After discuss with @Yiyiyimu, I agree with him, this is more challenge for a non-CN speaker, you could pick other issues like `Web Test` or `Featrures` or `bugfix` issues. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on pull request #4175: docs: fix broken links and ids in plugins
spacewander commented on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831628212 Would you put similar changes into one PR instead of submitting them one by one? 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] spacewander commented on a change in pull request #4175: docs: fix broken links and ids in plugins
spacewander commented on a change in pull request #4175:
URL: https://github.com/apache/apisix/pull/4175#discussion_r625455517
##
File path: docs/en/latest/config.json
##
@@ -162,6 +162,13 @@
"discovery/eureka"
]
},
+{
+ "type": "category",
+ "label": "Examples",
Review comment:
This section is not part of the category.
##
File path: docs/en/latest/plugins/skywalking.md
##
@@ -101,7 +101,7 @@ plugin_attr:
skywalking:
service_name: APISIX
service_instance_name: "APISIX Instance Name"
-endpoint_addr: http://127.0.0.1:12800
+endpoint_addr: `http://127.0.0.1:12800`
Review comment:
Don't blindly add '``'.
##
File path: docs/en/latest/plugins/authz-keycloak.md
##
@@ -42,9 +42,9 @@ For more information on Keycloak, refer to [Keycloak
Authorization Docs](https:/
| Name | Type | Requirement | Default
| Valid
| Description
|
| -- | - | --- |
- |
-- |
---
|
-| discovery | string| optional|
|
https://host.domain/auth/realms/foo/.well-known/uma2-configuration | URL to
discovery document for Keycloak Authorization Services.
|
-| token_endpoint | string| optional|
|
https://host.domain/auth/realms/foo/protocol/openid-connect/token | A
OAuth2-compliant Token Endpoint that supports the
`urn:ietf:params:oauth:grant-type:uma-ticket` grant type. Overrides value from
discovery, if given. |
-| resource_registration_endpoint | string| optional|
|
https://host.domain/auth/realms/foo/authz/protection/resource_set | A Keycloak
Protection API-compliant resource registration endpoint. Overrides value from
discovery, if given. |
+| discovery | string| optional|
|
`https://host.domain/auth/realms/foo/.well-known/uma2-configuration` | URL to
discovery document for Keycloak Authorization Services.
|
Review comment:
Why add '``' surround the link?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub 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] hozaifaaoud opened a new issue #4176: request help:
hozaifaaoud opened a new issue #4176: URL: https://github.com/apache/apisix/issues/4176 ### Issue description ### Environment * apisix version (cmd: `apisix version`): APISIX/2.3 * OS (cmd: `uname -a`): #60-Ubuntu * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`): * etcd version, if have (cmd: run `curl http://127.0.0.1:9090/v1/server_info` to get the info from server-info API): * apisix-dashboard version, if have: * luarocks version, if the issue is about installation (cmd: `luarocks --version`): How can I limit a route to a group of IPs and also a group of API keys... and If I created a new consumer with a new API key and IP address, how can I update the route so that the route accepts the new consumer? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 pull request #4155: docs: improve plugins' documentation (Chinese)
Yiyiyimu commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831568914 > okay i will be working on EN docs in next PR, will take help from @guoqqqi or @Yiyiyimu if i do wrong > while understanding chinese Hi @iamayushdas Thanks for the volunteer! But as I told you before, it might not be a good idea to do the Chinese-English translation for a non-CNEN-bilingual speaker, since it is not a good idea to fully rely on translation tools to do the job. I think we still need a Chinese contributor on this kind of task. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1816: feat: Use monaco editor
juzhiyuan commented on a change in pull request #1816:
URL: https://github.com/apache/apisix-dashboard/pull/1816#discussion_r625377805
##
File path: web/package.json
##
@@ -131,7 +132,8 @@
"prettier": "^2.0.1",
"pro-download": "1.0.1",
"puppeteer-core": "^4.0.1",
-"stylelint": "^13.0.0"
+"stylelint": "^13.0.0",
+"webpack": "^5.35.0"
Review comment:
Do we need to maintain webpack manually here?
##
File path: web/src/components/Plugin/PluginDetail.tsx
##
@@ -190,49 +188,53 @@ const PluginDetail: React.FC = ({
});
});
};
- const handleModeChange = (value: PluginComponent.CodeMirrorMode) => {
+
+ const editorWillMount = (monaco: typeof monacoEditor) => {
+fetchSchema(name, schemaType).then((schema)=> {
+ const schemaConfig = {
+validate: true,
+schemas: [
+ {
+uri: `https://apisix.apache.org/`,
Review comment:
May I know what's this opinion does?
##
File path: web/src/components/RawDataEditor/RawDataEditor.tsx
##
@@ -33,77 +33,66 @@ type Props = {
onSubmit?: (data: Record) => void;
};
-enum codeMirrorModeList {
+enum monacoLanguageList {
JSON = 'JSON',
YAML = 'YAML',
}
const RawDataEditor: React.FC = ({ visible, readonly = true, type, data
= {}, onClose = () => { }, onSubmit = () => { } }) => {
- const ref = useRef(null);
const { formatMessage } = useIntl();
- const [codeMirrorMode, setCodeMirrorMode] =
useState(
-codeMirrorModeList.JSON,
+ const [monacoLanguage, setMonacoLanguage] =
useState(
+monacoLanguageList.JSON,
);
+ const [content, setContent] = useState('')
useEffect(() => {
-setCodeMirrorMode(codeMirrorModeList.JSON);
+switch (monacoLanguage) {
+ case monacoLanguageList.JSON:
+setContent(JSON.stringify(data, null, 4));
+break;
+ case monacoLanguageList.YAML: {
+const {data: yamlData} = json2yaml(JSON.stringify(data, null, 4));
+setContent(yamlData)
+break;
+ }
+ default:
+}
+ }, [data])
+
+ useEffect(() => {
+setMonacoLanguage(monacoLanguageList.JSON);
}, [visible])
const modeOptions = [
-{ label: codeMirrorModeList.JSON, value: codeMirrorModeList.JSON },
-{ label: codeMirrorModeList.YAML, value: codeMirrorModeList.YAML },
+{ label: monacoLanguageList.JSON, value: monacoLanguageList.JSON },
+{ label: monacoLanguageList.YAML, value: monacoLanguageList.YAML },
];
- const handleModeChange = (value: PluginComponent.CodeMirrorMode) => {
+ const handleModeChange = (value: PluginComponent.MonacoLanguage) => {
switch (value) {
- case codeMirrorModeList.JSON: {
-const { data: yamlData, error } =
yaml2json(ref.current.editor.getValue(), true);
-
-if (error) {
- notification.error({
-message: 'Invalid Yaml data',
- });
- return;
-}
-ref.current.editor.setValue(
- js_beautify(yamlData, {
-indent_size: 2,
- }),
-);
+ case monacoLanguageList.JSON:
+setContent(c => {
+ const {data:jsonData,error} = yaml2json(c, true);
+ if (error){
+notification.error({message: 'Invalid Yaml data'});
+return c;
+ }
+ return js_beautify(jsonData, {indent_size: 4});
+})
break;
- }
- case codeMirrorModeList.YAML: {
-const { data: jsonData, error } =
json2yaml(ref.current.editor.getValue());
-
-if (error) {
- notification.error({
-message: 'Invalid JSON data',
- });
- return;
-}
-ref.current.editor.setValue(jsonData);
+ case monacoLanguageList.YAML:
+setContent(c => {
+ const {data:yamlData,error} = json2yaml(c);
+ if (error){
+notification.error({message: 'Invalid Json data'});
Review comment:
ditto
##
File path: web/src/components/RawDataEditor/RawDataEditor.tsx
##
@@ -33,77 +33,66 @@ type Props = {
onSubmit?: (data: Record) => void;
};
-enum codeMirrorModeList {
+enum monacoLanguageList {
JSON = 'JSON',
YAML = 'YAML',
}
const RawDataEditor: React.FC = ({ visible, readonly = true, type, data
= {}, onClose = () => { }, onSubmit = () => { } }) => {
- const ref = useRef(null);
const { formatMessage } = useIntl();
- const [codeMirrorMode, setCodeMirrorMode] =
useState(
-codeMirrorModeList.JSON,
+ const [monacoLanguage, setMonacoLanguage] =
useState(
+monacoLanguageList.JSON,
);
+ const [content, setContent] = useState('')
useEffect(() => {
-setCodeMirrorMode(codeMirrorModeList.JSON);
+switch (monacoLanguage) {
+ case monacoLanguageList.JSON:
+setContent(JSON.stringify(data, null, 4));
+break;
+ case monacoLanguageList.YAML: {
+const {data: yamlData} = json2yaml(JSON.stringify(data, null, 4));
+
[GitHub] [apisix] iamayushdas edited a comment on pull request #4175: docs: fix broken links and ids in plugins
iamayushdas edited a comment on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831275128 @Yiyiyimu @tokers have a look to this please -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] guoqqqi commented on pull request #1816: feat: Use monaco editor
guoqqqi commented on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-831384729 Cool! 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] juzhiyuan merged pull request #1836: build: using curl command instead of wget
juzhiyuan merged pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 merged pull request #1837: docs: fix Chinese typos in the `retries.tooltip` field of upstream component
juzhiyuan merged pull request #1837: URL: https://github.com/apache/apisix-dashboard/pull/1837 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-dashboard] branch master updated: docs: fix Chinese typos in the `retries.tooltip` field of upstream component (#1837)
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-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 16dfb4d docs: fix Chinese typos in the `retries.tooltip` field of
upstream component (#1837)
16dfb4d is described below
commit 16dfb4d669b4cb6eecc38a3bee92067938dc5ccb
Author: 千橘 雫霞
AuthorDate: Mon May 3 23:36:57 2021 +0800
docs: fix Chinese typos in the `retries.tooltip` field of upstream
component (#1837)
---
web/src/components/Upstream/locales/zh-CN.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/components/Upstream/locales/zh-CN.ts
b/web/src/components/Upstream/locales/zh-CN.ts
index 809a60a..7e623ec 100644
--- a/web/src/components/Upstream/locales/zh-CN.ts
+++ b/web/src/components/Upstream/locales/zh-CN.ts
@@ -38,7 +38,7 @@ export default {
'component.upstream.fields.key.tooltip': '哈希键（Hash Key）',
'component.upstream.fields.retries': '重试次数',
- 'component.upstream.fields.retries.tooltip': '重试机制将请求发到下一个上游节点。值为 0
表示禁用重试机制，留空表是使用可用后端节点的数量。',
+ 'component.upstream.fields.retries.tooltip': '重试机制将请求发到下一个上游节点。值为 0
表示禁用重试机制，留空表示使用可用后端节点的数量。',
'component.upstream.fields.checks.active.type': '类型',
'component.upstream.fields.checks.active.type.tooltip': '是使用 HTTP 或 HTTPS
进行主动健康检查，还是只尝试 TCP 连接。',
[apisix-dashboard] branch master updated (e89665f -> d7e08cb)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git. from e89665f feat: add the service page upstream select option (#1633) add d7e08cb chore: using curl command instead of wget (#1836) No new revisions were added by this update. Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831345303 @iamayushdas ok! Once this PR is merged without incorrect contents, then you could start doing 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] iamayushdas commented on pull request #4175: docs: fix broken links and ids in plugins
iamayushdas commented on pull request #4175: URL: https://github.com/apache/apisix/pull/4175#issuecomment-831275128 @guoqqi @tokers have a look to this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] iamayushdas commented on pull request #4155: docs: improve plugins' documentation (Chinese)
iamayushdas commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831273389 > For docs in English, I would prefer submitting a new PR okay i will be working on EN docs in next PR, will take help from @guoqqqi or @Yiyiyimu if i do wrong while understanding chinese -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] dmsolr commented on pull request #1836: build: using curl command instead of wget
dmsolr commented on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-831248444 > @dmsolr Please check the failuer case Hi @juzhiyuan It is fixed, please recheck. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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-commenter edited a comment on pull request #1836: build: using curl command instead of wget
codecov-commenter edited a comment on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-830278564 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1836](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (880349d) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b4f372082d18b7cec1916ed355e6ea3a12d8986f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (b4f3720) will **decrease** coverage by `0.12%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1836 +/- ## == - Coverage 71.10% 70.97% -0.13% == Files 173 173 Lines6202 6202 Branches 711 710 -1 == - Hits 4410 4402 -8 - Misses 1536 1543 +7 - Partials 256 257 +1 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `45.58% <ø> (-0.07%)` | :arrow_down: | | backend-e2e-test-ginkgo | `48.34% <ø> (-0.19%)` | :arrow_down: | | backend-unit-test | `52.47% <ø> (ø)` | | | frontend-e2e-test | `72.07% <ø> (-0.07%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/helpers.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9oZWxwZXJzLnRzeA==) | `68.85% <0.00%> (-3.28%)` | :arrow_down: | | [api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=) | `86.82% <0.00%> (-2.40%)` | :arrow_down: | | [api/internal/core/storage/etcd.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmFnZS9ldGNkLmdv) | `45.45% <0.00%> (-1.82%)` | :arrow_down: | | [web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=) | `94.64% <0.00%> (-0.10%)` | :arrow_down: | | [web/src/components/Upstream/UpstreamForm.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL1Vwc3RyZWFtRm9ybS50c3g=) | `81.69% <0.00%> (+0.26%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1836: build: using curl command instead of wget
netlify[bot] edited a comment on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-830275093 Deploy preview for *apisix-dashboard* ready! Built with commit 880349de3fdae8a95682c43db3ec6e46667596b4 https://deploy-preview-1836--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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-commenter edited a comment on pull request #1836: build: using curl command instead of wget
codecov-commenter edited a comment on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-830278564 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1836](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (880349d) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b4f372082d18b7cec1916ed355e6ea3a12d8986f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (b4f3720) will **decrease** coverage by `1.12%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1836 +/- ## == - Coverage 71.10% 69.98% -1.13% == Files 173 48 -125 Lines6202 3258-2944 Branches 7110 -711 == - Hits 4410 2280-2130 + Misses 1536 721 -815 - Partials 256 257 +1 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `45.58% <ø> (-0.07%)` | :arrow_down: | | backend-e2e-test-ginkgo | `48.34% <ø> (-0.19%)` | :arrow_down: | | backend-unit-test | `52.47% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [api/internal/core/store/store.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmUuZ28=) | `86.82% <0.00%> (-2.40%)` | :arrow_down: | | [api/internal/core/storage/etcd.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmFnZS9ldGNkLmdv) | `45.45% <0.00%> (-1.82%)` | :arrow_down: | | [web/src/pages/Service/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL3NlcnZpY2UudHM=) | | | | [web/src/components/Upstream/components/Retries.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvUmV0cmllcy50c3g=) | | | | [...components/active-check/Unhealthy/HttpStatuses.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL1VuaGVhbHRoeS9IdHRwU3RhdHVzZXMudHN4) | | | | [web/src/components/Plugin/PluginDetail.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9QbHVnaW5EZXRhaWwudHN4) | | | | [web/src/components/Plugin/UI/limit-count.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbi9VSS9saW1pdC1jb3VudC50c3g=) | | | |
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1836: build: using curl command instead of wget
codecov-commenter edited a comment on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-830278564 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1836](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (880349d) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b4f372082d18b7cec1916ed355e6ea3a12d8986f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (b4f3720) will **decrease** coverage by `18.62%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@ Coverage Diff @@ ## master#1836 +/- ## === - Coverage 71.10% 52.47% -18.63% === Files 173 39 -134 Lines6202 2742 -3460 Branches 7110 -711 === - Hits 4410 1439 -2971 + Misses 1536 1109 -427 + Partials 256 194 -62 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `52.47% <ø> (ø)` | | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1836?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `0.00% <0.00%> (-71.03%)` | :arrow_down: | | [api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv) | `0.00% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `0.00% <0.00%> (-55.47%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1836/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `0.00% <0.00%> (-50.00%)` | :arrow_down: | |
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1836: build: using curl command instead of wget
netlify[bot] edited a comment on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-830275093 Deploy preview for *apisix-dashboard* processing. Building with commit 880349de3fdae8a95682c43db3ec6e46667596b4 https://app.netlify.com/sites/apisix-dashboard/deploys/608fdff17f007700080a6ca4 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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-commenter commented on pull request #1837: docs: fix Chinese typos in the `retries.tooltip` field of upstream component
codecov-commenter commented on pull request #1837: URL: https://github.com/apache/apisix-dashboard/pull/1837#issuecomment-831115796 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1837?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1837](https://codecov.io/gh/apache/apisix-dashboard/pull/1837?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (31856c6) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b4f372082d18b7cec1916ed355e6ea3a12d8986f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (b4f3720) will **increase** coverage by `1.04%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1837?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1837 +/- ## == + Coverage 71.10% 72.14% +1.04% == Files 173 125 -48 Lines6202 2944-3258 Branches 711 711 == - Hits 4410 2124-2286 + Misses 1536 820 -716 + Partials 2560 -256 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `?` | | | frontend-e2e-test | `72.14% <ø> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1837?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==) | | | | [api/internal/handler/service/service.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmljZS9zZXJ2aWNlLmdv) | | | | [api/internal/core/store/validate\_mock.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvdmFsaWRhdGVfbW9jay5nbw==) | | | | [api/internal/route.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL3JvdXRlLmdv) | | | | [api/cmd/service.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2NtZC9zZXJ2aWNlLmdv) | | | | [api/cmd/managerapi.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2NtZC9tYW5hZ2VyYXBpLmdv) | | | | [api/internal/log/zap.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2xvZy96YXAuZ28=) | | | | [api/internal/conf/conf.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1837/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvbmYvY29uZi5nbw==) | | | |
[GitHub] [apisix-dashboard] imjoey commented on issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
imjoey commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-831103618 @Molio-tan the logs seem not very helpful. So could you please show us more information from the `/var/log/message` and `dmesg` command during the installation? I believe that they could give us some clues. 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] juzhiyuan commented on issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
juzhiyuan commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-831102895 noted, thanks for clarification! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #1830: feat: add switch of online debug
juzhiyuan commented on pull request #1830: URL: https://github.com/apache/apisix-dashboard/pull/1830#issuecomment-831102555 I have replied in the mailing list, do we really need a Switcher to fix this issue? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on issue #1798: the problem of empty vars expressions in "Advanced Routing Matching Conditions"
juzhiyuan commented on issue #1798: URL: https://github.com/apache/apisix-dashboard/issues/1798#issuecomment-831102159 @belongwqz no, wait for #1799 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] imjoey commented on issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
imjoey commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-831101775 > Hi @imjoey, do you have other solutions to resolve this issue? Should we file an issue to Yarn or NPM? @juzhiyuan Sorry, I'm afraid not yet as the logs did not show enough details. Actually, as far as I know, both Yarn and NPM have good support for ARM64. IMHO, it's supposed that the reason is some npm packages are not compatible with Kylin V10 on ARM64. While unfortunately, I do not have an ARM64 environment to reproduce it. We can still get more info from @Molio-tan. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #1788: feat: embed assets in api binary
juzhiyuan commented on pull request #1788: URL: https://github.com/apache/apisix-dashboard/pull/1788#issuecomment-831101776 and the conflicts too :) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on pull request #1765: docs: Update api documentation
juzhiyuan commented on pull request #1765: URL: https://github.com/apache/apisix-dashboard/pull/1765#issuecomment-831101571 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #1835: docs: add the visit the dashboard
juzhiyuan commented on pull request #1835: URL: https://github.com/apache/apisix-dashboard/pull/1835#issuecomment-831100849 @stu01509 Would you mind updating the CN docs too? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] sober-wang commented on issue #356: request help: KubeSphere setup
sober-wang commented on issue #356: URL: https://github.com/apache/apisix-ingress-controller/issues/356#issuecomment-831100552 > > > > But when I entry apisix pod request my http server is connect. see ... > > ``` > > [root@k8smaster01 ~]# kubectl -n ws get pods -owide > > NAMEREADY STATUSRESTARTS AGEIP NODE NOMINATED NODE READINESS GATES > > apisix-gw-deployment-7bf998c895-ckprd 1/1 Running 0 85d10.244.1.3 k8snode04 > > apisix-ingress-controller-fb9fc6579-prlzk 1/1 Running 0 99m10.244.12.24 k8snode07 > > myhttp-794dc65cdc-ph2f9 1/1 Running 0 136d 10.244.4.198 k8snode02 > > test-network-776895fdbd-8xb7p 1/1 Running 0 54d10.244.3.75k8snode01 > > [root@k8smaster01 ~]# kubectl -n ws exec -it apisix-gw-deployment-7bf998c895-ckprd -- curl http://myhttp-svc:9527 > > Hello world ,The runtime os is [ linux ], Now member is [ myhttp-794dc65cdc-ph2f9 ] > > [root@k8smaster01 ~]# kubectl -n ws exec -it apisix-gw-deployment-7bf998c895-ckprd -- curl http://myhttp-svc:9527/dbsecurity > > Hello world ,The runtime os is [ linux ], Now member is [ myhttp-794dc65cdc-ph2f9 ] > > [root@k8smaster01 ~]# ls > > anaconda-ks.cfg dd.txt epel-release-latest-7.noarch.rpm sudo-1.9.5-3.el6.x86_64.rpm test.sh xengine-dev-configmap.yaml > > [root@k8smaster01 ~]# kubectl -n ws exec -it apisix-gw-deployment-7bf998c895-ckprd -- curl http://10.244.4.198:9527 > > Hello world ,The runtime os is [ linux ], Now member is [ myhttp-794dc65cdc-ph2f9 ] > > [root@k8smaster01 ~]# > > ``` > > > > > > And apisix pod have some error log . > > ``` > > 10.244.12.24 - - [02/May/2021:15:08:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/fe7b69e0 HTTP/1.1" 404 39 0.002 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:08:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/4157840a HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:08:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/313d7085 HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:11:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/fe7b69e0 HTTP/1.1" 404 39 0.002 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:11:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/4157840a HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:11:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/313d7085 HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:14:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/fe7b69e0 HTTP/1.1" 404 39 0.002 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:14:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/4157840a HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:14:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/313d7085 HTTP/1.1" 404 39 0.004 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:17:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/fe7b69e0 HTTP/1.1" 404 39 0.003 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:17:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/4157840a HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb; > > 10.244.12.24 - - [02/May/2021:15:17:53 +0800] apisix-gw-lb:9080 "GET /apisix/admin/upstreams/313d7085 HTTP/1.1" 404 39 0.001 "-" "Go-http-client/1.1" - - - "http://apisix-gw-lb > > ``` > > > > > > my ApisixRoute : > > ```yaml > > apiVersion: apisix.apache.org/v1 > > kind: ApisixRoute > > metadata: > > name: myhttp > > spec: > > rules: > > - host: storm.myhttp.io > > http: > > paths: > > - backend: > > serviceName: myhttp-svc > > servicePort: 9527 > > path: /* > > ``` > > > > > > my server information: > > ``` > > # deployment > > Name: myhttp > > Namespace: ws > > CreationTimestamp: Thu, 19 Nov 2020 14:37:32 +0800 > > Labels: app=myhttp > > Annotations:deployment.kubernetes.io/revision: 8 > > Selector: app=myhttp > > Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
[GitHub] [apisix-dashboard] juzhiyuan commented on pull request #1836: build: using curl command instead of wget
juzhiyuan commented on pull request #1836: URL: https://github.com/apache/apisix-dashboard/pull/1836#issuecomment-831100459 @dmsolr Please check the failuer case -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1834: fix: configuration file link broken
juzhiyuan commented on a change in pull request #1834: URL: https://github.com/apache/apisix-dashboard/pull/1834#discussion_r624939351 ## File path: docs/en/latest/deploy-with-docker.md ## @@ -52,7 +52,7 @@ $ docker build -t apisix-dashboard:$tag . --build-arg APISIX_DASHBOARD_VERSION=m 1. Preparing configuration files -Before starting the container, the configuration file `conf.yaml` needs to be prepared inside the **host** to override the default [configuration file](../api/conf/conf.yaml) inside the container. +Before starting the container, the configuration file `conf.yaml` needs to be prepared inside the **host** to override the default [configuration file](https://github.com/apache/apisix-dashboard/blob/master/api/conf/conf.yaml) inside the container. Review comment: 樂 For versioned package.. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #327: docs: Update Integration page
juzhiyuan merged pull request #327: URL: https://github.com/apache/apisix-website/pull/327 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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: docs: update integration page (#327)
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 33e60c2 docs: update integration page (#327) 33e60c2 is described below commit 33e60c2deb0cd107c7a9bd397cb8f7ce109a4d0f Author: Kishani Kandasamy <53715187+kishanikandas...@users.noreply.github.com> AuthorDate: Mon May 3 13:39:49 2021 +0530 docs: update integration page (#327) --- website/docs/general/integrate-with-project-docs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/general/integrate-with-project-docs.md b/website/docs/general/integrate-with-project-docs.md index 49ecd0d..8f352c9 100644 --- a/website/docs/general/integrate-with-project-docs.md +++ b/website/docs/general/integrate-with-project-docs.md @@ -73,7 +73,7 @@ More information about sidebar can be found at https://v2.docusaurus.io/docs/nex ## Markdown formatting restrictions -- Use relative paths within Markdown files `../xxx/xxx`, not absolute paths `/docs/en/xxx/xxx`. If you want to refer to files outside the docs directory, please use https://github.com/apache/apisix-xxx/blob/master/xxx/xxx.xxx +- Use relative paths within Markdown files `../xxx/xxx`, not absolute paths `/docs/en/xxx/xxx`. If you want to refer to files outside the docs directory, please use `https://github.com/apache/apisix-xxx/blob/master/xxx/xxx.xxx` - You need to use Markdown syntax when introducing images, i.e. ``. Images cannot be introduced using HTML tags, i.e. ``
[GitHub] [apisix-website] juzhiyuan commented on issue #288: bug: hidableSidebar does not behave correctly
juzhiyuan commented on issue #288: URL: https://github.com/apache/apisix-website/issues/288#issuecomment-831097666 I would prefer keeping it the same line if we could, the sudden jump makes me feel not good..   -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
juzhiyuan commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-831095222 Hi @imjoey, do you have other solutions to resolve this issue? Should we file an issue to Yarn or NPM? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-dashboard] branch master updated: feat: add the service page upstream select option (#1633)
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-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new e89665f feat: add the service page upstream select option (#1633)
e89665f is described below
commit e89665fa8f9773dd3c7d95d075588cd80bdd97d9
Author: Cliff Su
AuthorDate: Mon May 3 15:58:01 2021 +0800
feat: add the service page upstream select option (#1633)
---
.../route/can-skip-upstream-when-select-service-id.spec.js| 5 +
web/src/pages/Service/Create.tsx | 11 +--
web/src/pages/Service/components/Step1.tsx| 2 +-
web/src/pages/Upstream/locales/en-US.ts | 2 ++
web/src/pages/Upstream/locales/zh-CN.ts | 2 ++
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
b/web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
index aeb5118..72f9954 100644
---
a/web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
+++
b/web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
@@ -75,7 +75,7 @@ context('Can select service_id skip upstream in route', () =>
{
cy.get(this.domSelector.input).should('be.disabled');
cy.contains(this.data.upstreamName).click();
-cy.contains('None').click();
+cy.contains('None').click({ force: true });
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Submit').click();
@@ -91,9 +91,6 @@ context('Can select service_id skip upstream in route', () =>
{
cy.contains(this.data.routeName).siblings().contains('Configure').click();
cy.get(this.domSelector.serviceSelector).click();
cy.contains('None').click();
-cy.get(this.domSelector.notification).should('contain', 'Please check the
configuration of binding service');
-cy.get(this.domSelector.notificationCloseIcon).click();
-
cy.contains('Next').click();
cy.wait(500);
cy.get('[data-cy=upstream_selector]').click();
diff --git a/web/src/pages/Service/Create.tsx b/web/src/pages/Service/Create.tsx
index ab977a9..04ad579 100644
--- a/web/src/pages/Service/Create.tsx
+++ b/web/src/pages/Service/Create.tsx
@@ -51,10 +51,12 @@ const Page: React.FC = (props) => {
fetchItem(serviceId).then(({ data }) => {
if (data.upstream_id) {
upstreamForm.setFieldsValue({ upstream_id: data.upstream_id })
-}
-if (data.upstream) {
+} else if (data.upstream) {
upstreamForm.setFieldsValue(convertToFormData(data.upstream))
+} else {
+ upstreamForm.setFieldsValue({ upstream_id: 'None' })
}
+
form.setFieldsValue(omit(data, ['upstream_id', 'upstream',
'plugins']));
setPlugins(data.plugins || {});
});
@@ -68,10 +70,7 @@ const Page: React.FC = (props) => {
};
const upstreamFormData = upstreamRef.current?.getData();
-if (!upstreamFormData) {
- return
-}
-if (!upstreamFormData.upstream_id) {
+if (!upstreamFormData?.upstream_id) {
data.upstream = upstreamFormData;
} else {
data.upstream_id = upstreamFormData.upstream_id;
diff --git a/web/src/pages/Service/components/Step1.tsx
b/web/src/pages/Service/components/Step1.tsx
index 3817456..0577e69 100644
--- a/web/src/pages/Service/components/Step1.tsx
+++ b/web/src/pages/Service/components/Step1.tsx
@@ -59,7 +59,7 @@ const Step1: React.FC = ({
[GitHub] [apisix-dashboard] juzhiyuan merged pull request #1633: feat: add the service page upstream select option
juzhiyuan merged pull request #1633: URL: https://github.com/apache/apisix-dashboard/pull/1633 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 closed issue #1616: when creating a `Service`, `Select Upstream` should be optional, not required
juzhiyuan closed issue #1616: URL: https://github.com/apache/apisix-dashboard/issues/1616 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 issue #1711: The name rule is not applied to every name input
juzhiyuan commented on issue #1711: URL: https://github.com/apache/apisix-dashboard/issues/1711#issuecomment-831091790 Hi, @stu01509 I'm back, this issue will be resolved by https://github.com/apache/apisix-dashboard/pull/1799 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 closed issue #1711: The name rule is not applied to every name input
juzhiyuan closed issue #1711: URL: https://github.com/apache/apisix-dashboard/issues/1711 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 merged pull request #1828: fix:When create the upstream, some properties can still be edited on …
juzhiyuan merged pull request #1828: URL: https://github.com/apache/apisix-dashboard/pull/1828 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-dashboard] branch master updated: fix:When create the upstream, some properties can still be edited on … (#1828)
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-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 6b997d1 fix:When create the upstream, some properties can still be
edited on … (#1828)
6b997d1 is described below
commit 6b997d1fddf47ed62561a4599647884c7168b617
Author: jiemoxiaolong
AuthorDate: Mon May 3 15:54:05 2021 +0800
fix:When create the upstream, some properties can still be edited on …
(#1828)
Co-authored-by: guoqqqi <72343596+guoq...@users.noreply.github.com>
---
...create-route-when-not-select-upsteam-id.spec.js | 101 +
...create-service-with-not-select-upstream.spec.js | 69 ++
.../upstream/create_and_delete_upstream.spec.js| 1 +
web/src/components/Upstream/UpstreamForm.tsx | 1 +
4 files changed, 172 insertions(+)
diff --git
a/web/cypress/integration/route/create-route-when-not-select-upsteam-id.spec.js
b/web/cypress/integration/route/create-route-when-not-select-upsteam-id.spec.js
new file mode 100644
index 000..71f3fa2
--- /dev/null
+++
b/web/cypress/integration/route/create-route-when-not-select-upsteam-id.spec.js
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable no-undef */
+
+context('Create Route without Upstream', () => {
+ beforeEach(() => {
+cy.login();
+
+cy.fixture('selector.json').as('domSelector');
+cy.fixture('data.json').as('data');
+ });
+
+
+ it('should create route wittout upstream ', function () {
+cy.visit('/');
+cy.get('[role=menu]').should('be.visible').within(() => {
+ cy.contains('Route').click();
+});
+cy.contains('Create').click();
+
+cy.contains('Next').click().click();
+cy.get(this.domSelector.name).type(this.data.routeName);
+cy.contains('Next').click();
+
+cy.get(this.domSelector.nodes_0_host).clear().type(this.data.ip1);
+cy.get(this.domSelector.nodes_0_port).type(this.data.port);
+cy.get(this.domSelector.nodes_0_weight).type(this.data.weight);
+cy.contains('Next').click();
+cy.contains('Next').click();
+cy.get(this.domSelector.input).should('be.disabled');
+cy.contains('Submit').click();
+cy.contains(this.data.submitSuccess).should('be.visible');
+cy.contains('Goto List').click();
+cy.url().should('contains', 'routes/list');
+ });
+
+ it('should edit this route ', function () {
+cy.visit('/');
+cy.contains('Route').click();
+cy.get(this.domSelector.nameSelector).type(this.data.routeName);
+
+cy.contains('Search').click();
+cy.contains(this.data.routeName).siblings().contains('Configure').click();
+
+cy.get(this.domSelector.name).should('value', this.data.routeName);
+cy.contains('Next').click({
+ force: true
+});
+
+// check if the changes have been saved
+cy.get(this.domSelector.nodes_0_host).should('value', this.data.ip1);
+cy.get(this.domSelector.nodes_0_host).clear().type(this.data.ip2);
+cy.get(this.domSelector.nodes_0_port).type(this.data.port);
+cy.get(this.domSelector.nodes_0_weight).type(this.data.weight);
+cy.contains('Next').click();
+cy.contains('Next').click();
+cy.get(this.domSelector.input).should('be.disabled');
+cy.contains('Submit').click();
+cy.contains(this.data.submitSuccess).should('be.visible');
+cy.contains('Goto List').click();
+cy.url().should('contains', 'routes/list');
+
+// check if the changes have been saved
+cy.get(this.domSelector.nameSelector).type(this.data.routeName);
+cy.contains('Search').click();
+
+cy.contains(this.data.routeName).siblings().contains('Configure').click();
+// ensure it has already changed to edit page
+cy.get(this.domSelector.name).should('value', this.data.routeName);
+cy.contains('Next').click({
+ force: true
+});
+cy.get(this.domSelector.nodes_0_host).should('value', this.data.ip2);
+ });
+
+ it('should delete this test route', function () {
+cy.visit('/routes/list');
+cy.get(this.domSelector.nameSelector).type(this.data.routeName);
+
[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1828: fix:When create the upstream, some properties can still be edited on …
juzhiyuan commented on a change in pull request #1828:
URL: https://github.com/apache/apisix-dashboard/pull/1828#discussion_r624930705
##
File path:
web/cypress/integration/service/create-service-with-not-select-upstream.spec.js
##
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable no-undef */
+
+context('Edit Service with not select Upstream', () => {
+ beforeEach(() => {
+cy.login();
+
+cy.fixture('selector.json').as('domSelector');
+cy.fixture('data.json').as('data');
+ });
+
+ it('should create a test service', function () {
+cy.visit('/');
+cy.contains('Service').click();
+cy.contains('Create').click();
+cy.get(this.domSelector.name).type(this.data.serviceName);
+cy.get(this.domSelector.description).type(this.data.description);
+cy.get(this.domSelector.nodes_0_host).click();
+cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
+cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+cy.get(this.domSelector.nodes_0_weight).clear().type(1);
+cy.contains('Next').click();
+cy.contains('Next').click();
+cy.get(this.domSelector.nodes_0_host).should('be.disabled','true');
+cy.get(this.domSelector.nodes_0_port).should('be.disabled','true');
+cy.get(this.domSelector.nodes_0_weight).should('be.disabled','true');
+cy.get('#timeout_connect').should('be.disabled','true');
+cy.get('#timeout_send').should('be.disabled','true');
+cy.get('#timeout_read').should('be.disabled','true');
+cy.get('#custom_checks_active').should('be.disabled','true');
+cy.get('#custom_checks_passive').should('be.disabled','true');
+cy.contains('Submit').click();
+cy.get(this.domSelector.notification).should('contain',
this.data.createServiceSuccess);
+ });
+
+ it('should edit the service', function () {
+cy.visit('/service/list');
+
+cy.get(this.domSelector.nameSearch).type(this.data.serviceName);
+cy.contains('Search').click();
+
cy.contains(this.data.serviceName).siblings().contains('Configure').click();
+cy.wait(500);
+
cy.get(this.domSelector.nodes_0_host).should('not.be.disabled').clear().type(this.data.ip2);
+cy.get(this.domSelector.nodes_0_port).type(this.data.port);
+cy.get(this.domSelector.nodes_0_weight).type(this.data.weight);
+cy.contains('Next').click();
+cy.contains('Next').click();
+cy.get(this.domSelector.nodes_0_host).should('be.disabled','true');
+cy.get(this.domSelector.nodes_0_port).should('be.disabled','true');
+cy.get(this.domSelector.nodes_0_weight).should('be.disabled','true');
+cy.get('#timeout_connect').should('be.disabled','true');
+cy.get('#timeout_send').should('be.disabled','true');
+cy.get('#timeout_read').should('be.disabled','true');
+cy.get('#custom_checks_active').should('be.disabled','true');
+cy.get('#custom_checks_passive').should('be.disabled','true');
Review comment:
@guoqqqi If this suggestion or comment is resolved, please click
`Resolve conversition`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub 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 closed issue #4161: bug: sls-logger 没有日志了
juzhiyuan closed issue #4161: URL: https://github.com/apache/apisix/issues/4161 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 #4161: bug: sls-logger 没有日志了
juzhiyuan commented on issue #4161: URL: https://github.com/apache/apisix/issues/4161#issuecomment-831089728 fine, it seems that those 2 issues are resolved, feel free to reopen this one if needed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation (Chinese)
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831087183 For docs in English, I would prefer submitting a new PR ✌️ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #4155: docs: improve plugins' documentation
juzhiyuan commented on pull request #4155: URL: https://github.com/apache/apisix/pull/4155#issuecomment-831085744 > I mean you should change `Access-Controll-Max-Age` to `Access-Control-Max-Age` 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] KishaniKandasamy opened a new pull request #4175: docs: fix broken links and ids in plugins
KishaniKandasamy opened a new pull request #4175: URL: https://github.com/apache/apisix/pull/4175 ### What this PR does / why we need it: fix: [#325](https://github.com/apache/apisix-website/issues/325) ### 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
