[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1502: feat: rewrite e2e test(upstream_test) with ginkgo
nic-chen commented on a change in pull request #1502:
URL: https://github.com/apache/apisix-dashboard/pull/1502#discussion_r582612763
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,606 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+"uri": "/hello",
+"upstream_id": "not-exists"
+}`,
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ })
+ })
+
+ ginkgo.It("create upstream", func() {
Review comment:
```suggestion
ginkgo.It("create upstream success", func() {
```
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,606 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
Review comment:
```suggestion
ginkgo.It("test upstream create failed", func() {
```
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,606 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "time"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+"uri": "/hello",
+"upstream_id": "not-exists"
[GitHub] [apisix-dashboard] nic-chen commented on issue #1512: Plugin template configuration
nic-chen commented on issue #1512: URL: https://github.com/apache/apisix-dashboard/issues/1512#issuecomment-785693420 > May need to update Create and update routing interface, need @nic-chen to confirm need to update entity and schema for route. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen opened a new pull request #1513: feat: support configure enabled plugin list
nic-chen opened a new pull request #1513: URL: https://github.com/apache/apisix-dashboard/pull/1513 Please answer these questions before submitting a pull request - Why submit this pull request? - [ ] Bugfix - [x] New feature provided - [ ] Improve performance - [ ] Backport patches - Related issues close #1508 ___ ### New feature or improvement - Describe the details and related test reports. 1. All plugins are included in schema.json 2. Add a new configuration item plugins in conf.yaml to control which plugins are displayed in the dashboard. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-ingress-controller] branch master updated: docs: added meta info (#269)
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-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c30636c docs: added meta info (#269) c30636c is described below commit c30636c4b7c86f9540eb6aeb47a91e17aeb50e0a Author: 琚致远 AuthorDate: Thu Feb 25 15:33:59 2021 +0800 docs: added meta info (#269) --- .markdownlint.yml | 2 + docs/en/latest/CRD-specification.md| 208 +++-- docs/en/latest/FAQ.md | 7 +- docs/en/latest/config.json | 49 - docs/en/latest/contribute.md | 21 ++- docs/en/latest/deployments/ack.md | 17 +- docs/en/latest/deployments/aws.md | 17 +- docs/en/latest/deployments/azure.md| 21 ++- docs/en/latest/deployments/gke.md | 17 +- docs/en/latest/deployments/k3s-rke.md | 19 +- docs/en/latest/deployments/kubesphere.md | 15 +- docs/en/latest/deployments/minikube.md | 15 +- docs/en/latest/deployments/tke.md | 17 +- docs/en/latest/design.md | 16 +- docs/en/latest/development.md | 23 ++- docs/en/latest/samples/index.md| 11 +- .../proxy-the-httpbin-service-with-ingress.md | 13 +- .../en/latest/samples/proxy-the-httpbin-service.md | 27 +-- docs/en/latest/usage.md| 31 +-- 19 files changed, 341 insertions(+), 205 deletions(-) diff --git a/.markdownlint.yml b/.markdownlint.yml index e5787a4..79e7228 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -30,6 +30,8 @@ MD033: false # MD036/no-emphasis-as-heading/no-emphasis-as-header Emphasis used instead of a heading MD036: false +MD041: false + # MD024 no-duplicate-heading: siblings_only: true diff --git a/docs/en/latest/CRD-specification.md b/docs/en/latest/CRD-specification.md index c63450a..2ea3f1f 100644 --- a/docs/en/latest/CRD-specification.md +++ b/docs/en/latest/CRD-specification.md @@ -17,16 +17,22 @@ # --> -# CRD specification +--- + +id: crd-specification +title: CRD specification + +--- In order to control the behavior of the proxy ([Apache APISIX](https://github.com/apache/apisix)), the following CRDs should be defined. ## CRD Types +- [CRD Types](#crd-types) - [ApisixRoute](#apisixroute) - [ApisixUpstream](#apisixupstream) - [Configuring Load Balancer](#configuring-load-balancer) - - [Configuring Health Check](#configuring-load-balancer) + - [Configuring Health Check](#configuring-health-check) - [Configuring Retry and Timeout](#configuring-retry-and-timeout) - [Port Level Settings](#port-level-settings) - [Configuration References](#configuration-references) @@ -48,37 +54,37 @@ metadata: namespace: cloud spec: rules: - - host: test.apisix.apache.org -http: - paths: - - backend: - serviceName: httpserver - servicePort: 8080 -path: /hello* -plugins: - - name: limit-count -enable: true -config: - count: 2 - time_window: 60 - rejected_code: 503 - key: remote_addr +- host: test.apisix.apache.org + http: +paths: + - backend: + serviceName: httpserver + servicePort: 8080 +path: /hello* +plugins: + - name: limit-count +enable: true +config: + count: 2 + time_window: 60 + rejected_code: 503 + key: remote_addr ``` -| Field | Type|Description | -|---|--|| -| rules | array| ApisixRoute's request matching rules. | -| host | string | The requested host. | -| http | object | Route rules are applied to the scope of layer 7 traffic. | -| paths | array| Path-based `route` rule matching. | -| backend | object | Backend service information configuration. | -| serviceName | string | The name of backend service. `namespace + serviceName + servicePort` form an unique identifier to match the back-end service. | -| servicePort | int | The port of backend service. `namespace + serviceName + servicePort` form an unique identifier to match the back-end service. | -| path | string | The URI matched by the route. Supports exact match and prefix match. Example，exact match: `/hello`, prefix match: `/hello*`.
[GitHub] [apisix-ingress-controller] juzhiyuan merged pull request #269: docs: added meta info
juzhiyuan merged pull request #269: URL: https://github.com/apache/apisix-ingress-controller/pull/269 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 feat-sync-docs updated (200daa9 -> a1b7b70)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from 200daa9 chore: remove unused files add a1b7b70 docs: added ignore docs No new revisions were added by this update. Summary of changes: website/docs/apisix-dashboard/IGNORE_DOC.md | 1 + website/docs/apisix-ingress-controller/IGNORE_DOC.md | 1 + website/docs/apisix/IGNORE_DOC.md| 1 + 3 files changed, 3 insertions(+) create mode 100644 website/docs/apisix-dashboard/IGNORE_DOC.md create mode 100644 website/docs/apisix-ingress-controller/IGNORE_DOC.md create mode 100644 website/docs/apisix/IGNORE_DOC.md
[apisix-ingress-controller] branch docs-added-meta updated (4442d5d -> dc26f53)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch docs-added-meta in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git. from 4442d5d docs: added meta info add dc26f53 CI: ignore MD041 No new revisions were added by this update. Summary of changes: .markdownlint.yml | 2 ++ 1 file changed, 2 insertions(+)
[GitHub] [apisix] cverdela opened a new issue #3670: request help:
cverdela opened a new issue #3670: URL: https://github.com/apache/apisix/issues/3670 ### Issue description wolf-rbac is an authentication and authorization (rbac) plugin I used it for rbac，but QPS down to 300/s how to do for rbac without losing performance ### Environment * apisix version (cmd: `apisix version`): docker 2.0 * OS (cmd: `uname -a`): centos docker * OpenResty / Nginx version (cmd: `nginx -V` or `openresty -V`):openresty/1.17.8.2 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] juzhiyuan opened a new pull request #269: docs: added meta info
juzhiyuan opened a new pull request #269: URL: https://github.com/apache/apisix-ingress-controller/pull/269 - [x] added meta info for website This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-ingress-controller] 01/01: docs: added meta info
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch docs-added-meta in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git commit 4442d5d3af01163b2b95f00c01b1293e19ec6696 Author: juzhiyuan AuthorDate: Thu Feb 25 15:22:36 2021 +0800 docs: added meta info --- docs/en/latest/CRD-specification.md| 208 +++-- docs/en/latest/FAQ.md | 7 +- docs/en/latest/config.json | 49 - docs/en/latest/contribute.md | 21 ++- docs/en/latest/deployments/ack.md | 17 +- docs/en/latest/deployments/aws.md | 17 +- docs/en/latest/deployments/azure.md| 21 ++- docs/en/latest/deployments/gke.md | 17 +- docs/en/latest/deployments/k3s-rke.md | 19 +- docs/en/latest/deployments/kubesphere.md | 15 +- docs/en/latest/deployments/minikube.md | 15 +- docs/en/latest/deployments/tke.md | 17 +- docs/en/latest/design.md | 16 +- docs/en/latest/development.md | 23 ++- docs/en/latest/samples/index.md| 11 +- .../proxy-the-httpbin-service-with-ingress.md | 13 +- .../en/latest/samples/proxy-the-httpbin-service.md | 27 +-- docs/en/latest/usage.md| 31 +-- 18 files changed, 339 insertions(+), 205 deletions(-) diff --git a/docs/en/latest/CRD-specification.md b/docs/en/latest/CRD-specification.md index c63450a..2ea3f1f 100644 --- a/docs/en/latest/CRD-specification.md +++ b/docs/en/latest/CRD-specification.md @@ -17,16 +17,22 @@ # --> -# CRD specification +--- + +id: crd-specification +title: CRD specification + +--- In order to control the behavior of the proxy ([Apache APISIX](https://github.com/apache/apisix)), the following CRDs should be defined. ## CRD Types +- [CRD Types](#crd-types) - [ApisixRoute](#apisixroute) - [ApisixUpstream](#apisixupstream) - [Configuring Load Balancer](#configuring-load-balancer) - - [Configuring Health Check](#configuring-load-balancer) + - [Configuring Health Check](#configuring-health-check) - [Configuring Retry and Timeout](#configuring-retry-and-timeout) - [Port Level Settings](#port-level-settings) - [Configuration References](#configuration-references) @@ -48,37 +54,37 @@ metadata: namespace: cloud spec: rules: - - host: test.apisix.apache.org -http: - paths: - - backend: - serviceName: httpserver - servicePort: 8080 -path: /hello* -plugins: - - name: limit-count -enable: true -config: - count: 2 - time_window: 60 - rejected_code: 503 - key: remote_addr +- host: test.apisix.apache.org + http: +paths: + - backend: + serviceName: httpserver + servicePort: 8080 +path: /hello* +plugins: + - name: limit-count +enable: true +config: + count: 2 + time_window: 60 + rejected_code: 503 + key: remote_addr ``` -| Field | Type|Description | -|---|--|| -| rules | array| ApisixRoute's request matching rules. | -| host | string | The requested host. | -| http | object | Route rules are applied to the scope of layer 7 traffic. | -| paths | array| Path-based `route` rule matching. | -| backend | object | Backend service information configuration. | -| serviceName | string | The name of backend service. `namespace + serviceName + servicePort` form an unique identifier to match the back-end service. | -| servicePort | int | The port of backend service. `namespace + serviceName + servicePort` form an unique identifier to match the back-end service. | -| path | string | The URI matched by the route. Supports exact match and prefix match. Example，exact match: `/hello`, prefix match: `/hello*`. | -| plugins | array| Custom plugin collection (Plugins defined in the `route` level). For more plugin information, please refer to the [Apache APISIX plugin docs](https://github.com/apache/apisix/tree/master/doc/plugins).| -| name | string | The name of the plugin. For more information about the example plugin, please check the [limit-count docs](https://github.com/apache/apisix/blob/master/doc/plugins/limit-count.md#Attributes). | -| enable| boolean | Whether
[apisix-ingress-controller] branch docs-added-meta created (now 4442d5d)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch docs-added-meta in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git. at 4442d5d docs: added meta info This branch includes the following new commits: new 4442d5d docs: added meta info The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [apisix-dashboard] LiteSun commented on issue #1512: Plugin template configuration
LiteSun commented on issue #1512: URL: https://github.com/apache/apisix-dashboard/issues/1512#issuecomment-785677739 > will pugin support `tag`? > In this way, the management and grouping of plug-ins can be completed, which is more flexible Good catch! Does apisix plugin config support tag? Need @spacewander to confirm, if apisix supports it, I will update the tag to the solution. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] starsz closed issue #3669: feat: support environment variable to override the config
starsz closed issue #3669: URL: https://github.com/apache/apisix/issues/3669 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] starsz commented on issue #3669: feat: support environment variable to override the config
starsz commented on issue #3669: URL: https://github.com/apache/apisix/issues/3669#issuecomment-785676107 Now the conf.yaml support the environment variable. https://github.com/apache/apisix/blob/de9ea132845202bd79624ddb780096882d50288c/conf/config.yaml#L24 So I think I can close this issue. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-website] branch feat-sync-docs updated (20f8e6e -> 200daa9)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from 20f8e6e docs: remove test add 200daa9 chore: remove unused files No new revisions were added by this update. Summary of changes: website/docs/apisix-dashboard/introduction.md | 6 -- website/docs/apisix-dashboard/sidebars.json| 4 +--- website/docs/apisix-ingress-controller/introduction.md | 6 -- website/docs/apisix-ingress-controller/sidebars.json | 4 +--- website/docs/apisix/introduction.md| 6 -- website/docs/apisix/sidebars.json | 4 +--- website/docusaurus.config.js | 6 +++--- 7 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 website/docs/apisix-dashboard/introduction.md delete mode 100644 website/docs/apisix-ingress-controller/introduction.md delete mode 100644 website/docs/apisix/introduction.md
[apisix-website] branch feat-sync-docs updated (eda04d9 -> 20f8e6e)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from eda04d9 fix: sync docs js add 20f8e6e docs: remove test No new revisions were added by this update. Summary of changes: website/src/pages/docs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [apisix-dashboard] moonming commented on issue #1512: Plugin template configuration
moonming commented on issue #1512: URL: https://github.com/apache/apisix-dashboard/issues/1512#issuecomment-785662803 will pugin support `tag`? In this way, the management and grouping of plug-ins can be completed, which is more flexible This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 feat-sync-docs updated (55c0edb -> eda04d9)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from 55c0edb fix: use node env add eda04d9 fix: sync docs js No new revisions were added by this update. Summary of changes: sync-docs.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[GitHub] [apisix] starsz opened a new issue #3669: feat: support environment variable to override the config
starsz opened a new issue #3669: URL: https://github.com/apache/apisix/issues/3669 # Feature request ## Please describe your feature We can support the environment variable to override the config. In some situations use the environment variable would be more convenient than config.yaml. ## Describe the solution you'd like 1. read all environment variable 2. if the variable is started with `APISIX_` then add it to the table 3. merge the conf from YAML and environment, the environment's priority is higher than YAML. 4. use the conf that merged to do the next things. ## Additional context We need to print the log that we used environment. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] LiteSun opened a new issue #1512: Plugin template configuration
LiteSun opened a new issue #1512:
URL: https://github.com/apache/apisix-dashboard/issues/1512
## Background and purpose
To allow users to configure plugin templates in advance and bind the
corresponding plugin templates when creating routes to achieve the fast
configuration of routing plugin.
## Design options
### Front-end
- Plugin template configuration portal:
Add the Plugin Template Config button to the top of the route list, and
enter the Plugin Template list page after clicking the button.
- New plugin template configuration list page
The list page is consistent with the style of other list pages and contains
CRUD.
- Add a new plugin template configuration step page
After clicking Create or Edit in the plugin template configuration List
page, you will enter the plugin template configuration Steps page.
The steps page is divided into two pages:
- Basic configuration information (e.g., desc) and plugin template
configuration, which interacts with the Plugin Marketplace page.
- Preview page
- Update the Create Route configuration route page to include the plugin
template selector, and render the corresponding plugin information after
selecting the corresponding plugin template.
Policy is consistent with apisix:
- If the route is already configured with `plugins`, then the plugin
configuration inside the Plugin config will be merged in.
- The same plugins will overwrite the original `plugins` plugins
Backend
Required interfaces:
- Plugin configuration list
- Plugin list search
- Create plugin configuration
- Update Plugin Configuration
- Delete plugin configuration
- May need to update Create and update routing interface, need @nic-chen to
confirm
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub 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 feat-sync-docs updated (fa3f2fb -> 55c0edb)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from fa3f2fb fix: use node env add 55c0edb fix: use node env No new revisions were added by this update. Summary of changes: sync-docs.js | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
[apisix-dashboard] branch chore-docs updated (8459bbc -> 3c76460)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch chore-docs in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git. from 8459bbc docs: added meta add 3c76460 docs: added meta No new revisions were added by this update. Summary of changes: docs/en/latest/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[apisix-dashboard] branch chore-docs updated (a78f2f8 -> 8459bbc)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch chore-docs in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git. from a78f2f8 fix: link add 8459bbc docs: added meta No new revisions were added by this update. Summary of changes: docs/en/latest/FAQ.md | 7 + docs/en/latest/I18N_USER_GUIDE.md | 7 + docs/en/latest/IMPORT_OPENAPI_USER_GUIDE.md | 41 +-- docs/en/latest/USER_GUIDE.md| 7 + docs/en/latest/api/api.md | 373 ++-- docs/en/latest/back-end-e2e.md | 27 +- docs/en/latest/config.json | 19 +- docs/en/latest/deploy-with-docker.md| 7 + docs/en/latest/deploy-with-rpm.md | 7 + docs/en/latest/deploy.md| 7 + docs/en/latest/develop.md | 7 + docs/en/latest/front-end-e2e.md | 7 + 12 files changed, 305 insertions(+), 211 deletions(-)
[GitHub] [apisix] tzssangglass commented on issue #3663: bug: script does not work
tzssangglass commented on issue #3663: URL: https://github.com/apache/apisix/issues/3663#issuecomment-785645709 According to the script documentation, on the route, script and plugin are mutually exclusive, so if there is script on the route and plugins on the service, and the route is bound to the service, do you need to execute both script and plugins? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1465: feat(be): Online debug function adds support for transfer files
nic-chen commented on a change in pull request #1465:
URL: https://github.com/apache/apisix-dashboard/pull/1465#discussion_r582571180
##
File path: api/test/e2enew/route_online_debug/route_online_debug_test.go
##
@@ -0,0 +1,785 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package route_online_debug
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "path/filepath"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+ "github.com/stretchr/testify/assert"
+ "github.com/tidwall/gjson"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Route_Online_Debug", func() {
+ table.DescribeTable("Route_Online_Debug_Route_Not_Exist",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("hit route that not exist", base.HttpTestCase{
+ Object: base.APISIXExpect(),
+ Method: http.MethodGet,
+ Path: "/hello_",
+ ExpectStatus: http.StatusNotFound,
+ ExpectBody: "{\"error_msg\":\"404 Route Not
Found\"}\n",
+ }),
+ table.Entry("online debug route with query params",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPost,
+ Path: "/apisix/admin/debug-request-forwarding",
+ Headers: map[string]string{
+ "Authorization":
base.GetToken(),
+ "online_debug_url":
base.APISIXInternalUrl + `/hello_`,
+ "online_debug_request_protocol": "http",
+ "online_debug_method": "GET",
+ "Content-Type":
"multipart/form-data",
+ "online_debug_header_params":
`{"test":["test1"]}`,
+ },
+ ExpectStatus: http.StatusOK,
+ ExpectBody: `{"code":404,"message":"404 Not
Found","data":{"error_msg":"404 Route Not Found"}}`,
+ Sleep:base.SleepTime,
+ }),
+ )
+
+ table.DescribeTable("Route_Online_Debug_Route_With_Query_Params",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("hit route that not exist", base.HttpTestCase{
+ Object: base.APISIXExpect(),
+ Method: http.MethodGet,
+ Path: "/hello",
+ ExpectStatus: http.StatusNotFound,
+ ExpectBody: "{\"error_msg\":\"404 Route Not
Found\"}\n",
+ }),
+ table.Entry("create route with query params", base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+ "uri": "/hello",
+ "methods": ["GET"],
+ "vars": [
+ ["arg_name","==","aaa"]
+ ],
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": [{
+ "host": "172.16.238.20",
+ "port": 1980,
+ "weight": 1
+ }]
+ }
+ }`,
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ }),
+ table.Entry("online debug route with query params",
base.HttpTestCase{
+ Object:
[GitHub] [apisix-docker] Yiyiyimu commented on a change in pull request #137: feat: support build apisix image from local code
Yiyiyimu commented on a change in pull request #137: URL: https://github.com/apache/apisix-docker/pull/137#discussion_r582560334 ## File path: .github/workflows/apisix-alpine-local-docker-test.yaml ## @@ -0,0 +1,43 @@ +name: APISIX Alpine local docker Test + +on: + push: +branches: + - master + pull_request: +branches: + - master + +jobs: + build: +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: Build and run +run: | + git clone http://github.com/apache/apisix Review comment: > We need to specify APISIX_VERSION when git clone. Using master branch is enough, it's just for test. > Doesn't the APISIX repository exist in the CI action env? No in this repo, we only have apisix-docker in CI This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1511: chore: improve docs structure
codecov-io edited a comment on pull request #1511: URL: https://github.com/apache/apisix-dashboard/pull/1511#issuecomment-785640792 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=h1) Report > Merging [#1511](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=desc) (a78f2f8) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b6cb345297ef4f6bb5ab0bafc99f3c8b3b1f9c4e?el=desc) (b6cb345) will **decrease** coverage by `8.94%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) ```diff @@Coverage Diff @@ ## master#1511 +/- ## == - Coverage 68.67% 59.73% -8.95% == Files 48 48 Lines3042 3042 == - Hits 2089 1817 -272 - Misses713 984 +271 - Partials 240 241 +1 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) | Coverage Δ | | |---|---|---| | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `18.75% <0.00%> (-81.25%)` | :arrow_down: | | [...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==) | `7.14% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `30.24% <0.00%> (-34.68%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `25.00% <0.00%> (-25.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `45.91% <0.00%> (-24.49%)` | :arrow_down: | | [api/internal/utils/json\_patch.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2pzb25fcGF0Y2guZ28=) | `34.48% <0.00%> (-24.14%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `31.93% <0.00%> (-23.53%)` | :arrow_down: | | [api/internal/log/log.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2xvZy9sb2cuZ28=) | `30.00% <0.00%> (-20.00%)` | :arrow_down: | | [api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=) | `66.12% <0.00%> (-17.75%)` | :arrow_down: | | [api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv) | `54.11% <0.00%> (-11.77%)` | :arrow_down: | | ... and [10 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=footer). Last update [b6cb345...a78f2f8](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on issue #1039: Build plugin form according to its jsonschema
nic-chen commented on issue #1039: URL: https://github.com/apache/apisix-dashboard/issues/1039#issuecomment-785644028 > Thanks @nic-chen, and your concern is really a problem indeed. > We originally envisioned automatically generating templates through schema, and we got a scheme to generate template stochasticly, but it can not support to generate template refer to the usage scenario. It's not very friendly for plugin with options. > > It would be better to find a way to generate template reder to the different usage scenario, let me try to find it. Look forward to it, and thanks for that. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1511: chore: improve docs structure
codecov-io edited a comment on pull request #1511: URL: https://github.com/apache/apisix-dashboard/pull/1511#issuecomment-785640792 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=h1) Report > Merging [#1511](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=desc) (b445c7f) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b6cb345297ef4f6bb5ab0bafc99f3c8b3b1f9c4e?el=desc) (b6cb345) will **decrease** coverage by `8.81%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) ```diff @@Coverage Diff @@ ## master#1511 +/- ## == - Coverage 68.67% 59.86% -8.82% == Files 48 48 Lines3042 3042 == - Hits 2089 1821 -268 - Misses713 979 +266 - Partials 240 242 +2 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) | Coverage Δ | | |---|---|---| | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `18.75% <0.00%> (-81.25%)` | :arrow_down: | | [...l/handler/route\_online\_debug/route\_online\_debug.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvcm91dGVfb25saW5lX2RlYnVnL3JvdXRlX29ubGluZV9kZWJ1Zy5nbw==) | `7.14% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `30.24% <0.00%> (-34.68%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `25.00% <0.00%> (-25.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `45.91% <0.00%> (-24.49%)` | :arrow_down: | | [api/internal/utils/json\_patch.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2pzb25fcGF0Y2guZ28=) | `34.48% <0.00%> (-24.14%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `31.93% <0.00%> (-23.53%)` | :arrow_down: | | [api/internal/log/log.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2xvZy9sb2cuZ28=) | `30.00% <0.00%> (-20.00%)` | :arrow_down: | | [api/internal/handler/global\_rule/global\_rule.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZ2xvYmFsX3J1bGUvZ2xvYmFsX3J1bGUuZ28=) | `66.12% <0.00%> (-17.75%)` | :arrow_down: | | [api/internal/utils/utils.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3V0aWxzLmdv) | `54.11% <0.00%> (-11.77%)` | :arrow_down: | | ... and [9 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=footer). Last update [b6cb345...a78f2f8](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io edited a comment on pull request #1511: chore: improve docs structure
codecov-io edited a comment on pull request #1511: URL: https://github.com/apache/apisix-dashboard/pull/1511#issuecomment-785640792 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=h1) Report > Merging [#1511](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=desc) (a78f2f8) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b6cb345297ef4f6bb5ab0bafc99f3c8b3b1f9c4e?el=desc) (b6cb345) will **decrease** coverage by `17.03%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) ```diff @@ Coverage Diff @@ ## master#1511 +/- ## === - Coverage 68.67% 51.63% -17.04% === Files 48 39-9 Lines3042 2597 -445 === - Hits 2089 1341 -748 - Misses713 1082 +369 + Partials 240 174 -66 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) | Coverage Δ | | |---|---|---| | [api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `0.00% <0.00%> (-70.41%)` | :arrow_down: | | [api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv) | `0.00% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `0.00% <0.00%> (-55.47%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `0.00% <0.00%> (-50.00%)` | :arrow_down: | | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `27.41% <0.00%> (-37.50%)` | :arrow_down: | | [api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=) | `57.14% <0.00%> (-33.34%)` | :arrow_down: | | [api/internal/utils/closer.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2Nsb3Nlci5nbw==) | `0.00% <0.00%> (-33.34%)` | :arrow_down: | | ... and [29 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=footer). Last update [b6cb345...a78f2f8](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-io commented on pull request #1511: chore: improve docs structure
codecov-io commented on pull request #1511: URL: https://github.com/apache/apisix-dashboard/pull/1511#issuecomment-785640792 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=h1) Report > Merging [#1511](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=desc) (b445c7f) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/b6cb345297ef4f6bb5ab0bafc99f3c8b3b1f9c4e?el=desc) (b6cb345) will **decrease** coverage by `17.07%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) ```diff @@ Coverage Diff @@ ## master#1511 +/- ## === - Coverage 68.67% 51.59% -17.08% === Files 48 39-9 Lines3042 2597 -445 === - Hits 2089 1340 -749 - Misses713 1083 +370 + Partials 240 174 -66 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=tree) | Coverage Δ | | |---|---|---| | [api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `0.00% <0.00%> (-70.41%)` | :arrow_down: | | [api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv) | `0.00% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `0.00% <0.00%> (-55.47%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `0.00% <0.00%> (-50.00%)` | :arrow_down: | | [api/internal/handler/data\_loader/route\_import.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvZGF0YV9sb2FkZXIvcm91dGVfaW1wb3J0Lmdv) | `27.41% <0.00%> (-37.50%)` | :arrow_down: | | [api/internal/handler/server\_info/server\_info.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL2hhbmRsZXIvc2VydmVyX2luZm8vc2VydmVyX2luZm8uZ28=) | `57.14% <0.00%> (-33.34%)` | :arrow_down: | | [api/internal/utils/closer.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree#diff-YXBpL2ludGVybmFsL3V0aWxzL2Nsb3Nlci5nbw==) | `0.00% <0.00%> (-33.34%)` | :arrow_down: | | ... and [29 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1511/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=footer). Last update [b6cb345...a78f2f8](https://codecov.io/gh/apache/apisix-dashboard/pull/1511?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan opened a new pull request #1511: chore: improve docs structure
juzhiyuan opened a new pull request #1511: URL: https://github.com/apache/apisix-dashboard/pull/1511 refactor docs structure This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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] 01/01: chore: improve docs structure
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch chore-docs
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit b445c7f7345f42f5934da933c33b6774ccc70971
Author: juzhiyuan
AuthorDate: Thu Feb 25 14:06:35 2021 +0800
chore: improve docs structure
---
README.md | 14 +--
docs/{ => assets}/images/architecture.png | Bin
docs/{ => assets}/images/manager-api.png | Bin
docs/{ => assets}/images/metrics-cn.png| Bin
docs/{ => assets}/images/metrics-en.png| Bin
.../images/route-create-done-list-cn.png | Bin
.../images/route-create-done-list-en.png | Bin
docs/{ => assets}/images/route-create-step1-cn.png | Bin
docs/{ => assets}/images/route-create-step1-en.png | Bin
docs/{ => assets}/images/route-create-step2-cn.png | Bin
docs/{ => assets}/images/route-create-step2-en.png | Bin
docs/{ => assets}/images/route-create-step3-cn.png | Bin
docs/{ => assets}/images/route-create-step3-en.png | Bin
docs/{ => assets}/images/route-create-step4-cn.png | Bin
docs/{ => assets}/images/route-create-step4-en.png | Bin
.../{ => assets}/images/route-debug-basic-auth.png | Bin
.../images/route-debug-body-params.png | Bin
.../images/route-debug-header-params.png | Bin
docs/{ => assets}/images/route-debug-offline.png | Bin
docs/{ => assets}/images/route-debug-published.png | Bin
.../images/route-debug-query-params.png| Bin
docs/{ => assets}/images/route-list-en.png | Bin
docs/{ => assets}/images/setting-cn.png| Bin
docs/{ => assets}/images/setting-en.png| Bin
docs/{ => assets}/images/ssl-list-cn.png | Bin
docs/{ => assets}/images/ssl-list-en.png | Bin
docs/{ => en/latest}/FAQ.md| 8 +++---
docs/{ => en/latest}/I18N_USER_GUIDE.md| 0
docs/{ => en/latest}/IMPORT_OPENAPI_USER_GUIDE.md | 0
docs/{ => en/latest}/USER_GUIDE.md | 28 ++---
docs/{ => en/latest}/api/api.md| 0
docs/{ => en/latest}/back-end-e2e.md | 0
docs/en/latest/config.json | 1 +
docs/{ => en/latest}/deploy-with-docker.md | 0
docs/{ => en/latest}/deploy-with-rpm.md| 0
docs/{ => en/latest}/deploy.md | 0
docs/{ => en/latest}/develop.md| 0
docs/{ => en/latest}/front-end-e2e.md | 0
38 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index c97ffc0..ba5891d 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ This project includes `Manager API`, which will gradually
replace `Admin API` in
Note: Currently the Dashboard does not have complete coverage of Apache APISIX
features, [visit here](https://github.com/apache/apisix-dashboard/milestones)
to view the milestones.
-
+
## Demo
@@ -78,19 +78,19 @@ Password: admin
Support the following ways currently.
-- [Source Codes](./docs/deploy.md)
-- [Docker](./docs/deploy-with-docker.md)
-- [RPM package（only for CentOS 7）](./docs/deploy-with-rpm.md)
+- [Source Codes](./docs/en/latest/deploy.md)
+- [Docker](./docs/en/latest/deploy-with-docker.md)
+- [RPM package（only for CentOS 7）](./docs/en/latest/deploy-with-rpm.md)
## Development
Pull requests are encouraged and always welcome. [Pick an
issue](https://github.com/apache/apisix-dashboard/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
and help us out!
-Please refer to the [Development Guide](./docs/develop.md).
+Please refer to the [Development Guide](./docs/en/latest/develop.md).
## User Guide
-Please refer to the [User Guide](./docs/USER_GUIDE.md).
+Please refer to the [User Guide](./docs/en/latest/USER_GUIDE.md).
## Contributing
@@ -98,7 +98,7 @@ Please refer to the [Contribution Guide](./CONTRIBUTING.md)
for a more detailed
## FAQ
-Please refer to the [FAQ](./docs/FAQ.md) for more known issues.
+Please refer to the [FAQ](./docs/en/latest/FAQ.md) for more known issues.
## License
diff --git a/docs/images/architecture.png b/docs/assets/images/architecture.png
similarity index 100%
rename from docs/images/architecture.png
rename to docs/assets/images/architecture.png
diff --git a/docs/images/manager-api.png b/docs/assets/images/manager-api.png
similarity index 100%
rename from docs/images/manager-api.png
rename to docs/assets/images/manager-api.png
diff --git a/docs/images/metrics-cn.png b/docs/assets/images/metrics-cn.png
similarity index 100%
rename from docs/images/metrics-cn.png
rename to docs/assets/images/metrics-cn.png
diff --git a/docs/images/metrics-en.png b/docs/assets/images/metrics-en.png
similarity index 100%
rename from
[GitHub] [apisix-dashboard] LiteSun merged pull request #1505: feat: add rawDataEditor for route, consumer, upstream and service
LiteSun merged pull request #1505: URL: https://github.com/apache/apisix-dashboard/pull/1505 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 (190c84d -> b6cb345)
This is an automated email from the ASF dual-hosted git repository.
sunyi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.
from 190c84d feat: rewrite e2e test(version_test) with ginkgo (#1501)
add b6cb345 feat: add rawDataEditor for route, consumer, upstream and
service (#1505)
No new revisions were added by this update.
Summary of changes:
web/package.json | 1 +
web/src/components/RawDataEditor/RawDataEditor.tsx | 105 +
.../index.ts => RawDataEditor/index.tsx} | 3 +-
.../{ActionBar => RawDataEditor}/locales/en-US.ts | 4 +-
.../RawDataEditor}/locales/zh-CN.ts| 4 +-
web/src/locales/en-US.ts | 2 +
web/src/locales/en-US/component.ts | 1 +
web/src/locales/zh-CN.ts | 2 +
web/src/locales/zh-CN/component.ts | 1 +
web/src/pages/Consumer/List.tsx| 18 +++-
web/src/pages/Route/List.tsx | 21 -
web/src/pages/Service/List.tsx | 19 +++-
web/src/pages/Upstream/List.tsx| 19 +++-
13 files changed, 187 insertions(+), 13 deletions(-)
create mode 100644 web/src/components/RawDataEditor/RawDataEditor.tsx
copy web/src/components/{PluginOrchestration/components/index.ts =>
RawDataEditor/index.tsx} (93%)
copy web/src/components/{ActionBar => RawDataEditor}/locales/en-US.ts (86%)
copy web/src/{pages/Plugin => components/RawDataEditor}/locales/zh-CN.ts (87%)
[apisix-website] branch feat-sync-docs updated (fbae563 -> fa3f2fb)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from fbae563 fix: script running position add fa3f2fb fix: use node env No new revisions were added by this update. Summary of changes: .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+)
[GitHub] [apisix-dashboard] liuxiran commented on issue #1039: Build plugin form according to its jsonschema
liuxiran commented on issue #1039: URL: https://github.com/apache/apisix-dashboard/issues/1039#issuecomment-785629052 > @liuxiran > Thanks for the explanation. > Maintaining a separate template is troublesome, and after the plugin schema is updated in APISIX, it may be easier to miss here and cannot keep up with the update of the plugin schema. Thanks @nic-chen, and your concern is really a problem indeed. We originally envisioned automatically generating templates through schema, and we got a scheme to generate template stochasticly, but it can not support to generate template refer to the usage scenario. It's not very friendly for plugin with options. It would be better to find a way to generate template reder to the different usage scenario, let me try to find 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-docker] Yiyiyimu commented on a change in pull request #137: feat: support build apisix image from local code
Yiyiyimu commented on a change in pull request #137:
URL: https://github.com/apache/apisix-docker/pull/137#discussion_r582559814
##
File path: Makefile
##
@@ -28,6 +28,10 @@ build-on-centos:
build-on-alpine:
docker build -t $(IMAGE_NAME):$(APISIX_VERSION)-alpine -f
./alpine/Dockerfile .
+### build-on-alpine: Build apaceh/apisix:xx-alpine image
+build-on-alpine-local:
+ docker build -t $(IMAGE_NAME):alpine-local --build-arg
APISIX_VERSION=${APISIX_PATH} -f ./alpine-local/Dockerfile .
Review comment:
It's actually a typo 藍 The arg name should be `APISIX_PATH`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-docker] Yiyiyimu commented on a change in pull request #137: feat: support build apisix image from local code
Yiyiyimu commented on a change in pull request #137:
URL: https://github.com/apache/apisix-docker/pull/137#discussion_r582559814
##
File path: Makefile
##
@@ -28,6 +28,10 @@ build-on-centos:
build-on-alpine:
docker build -t $(IMAGE_NAME):$(APISIX_VERSION)-alpine -f
./alpine/Dockerfile .
+### build-on-alpine: Build apaceh/apisix:xx-alpine image
+build-on-alpine-local:
+ docker build -t $(IMAGE_NAME):alpine-local --build-arg
APISIX_VERSION=${APISIX_PATH} -f ./alpine-local/Dockerfile .
Review comment:
It's actually a typo... The arg name should be `APISIX_PATH`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] starsz commented on a change in pull request #1465: feat(be): Online debug function adds support for transfer files
starsz commented on a change in pull request #1465:
URL: https://github.com/apache/apisix-dashboard/pull/1465#discussion_r582559727
##
File path: api/test/e2enew/base/http.go
##
@@ -92,3 +104,44 @@ func BatchTestServerPort(times int) map[string]int {
return res
}
+
+func GetReader(reqParams map[string]string, contentType string, files
[]UploadFile) (io.Reader, string, error) {
+ if strings.Index(contentType, "json") > -1 {
+ bytesData, _ := json.Marshal(reqParams)
+ return bytes.NewReader(bytesData), contentType, nil
+ }
+ if files != nil {
+ body := {}
+ writer := multipart.NewWriter(body)
+ for _, uploadFile := range files {
+ file, err := os.Open(uploadFile.Filepath)
+ if err != nil {
+ return nil, "", err
+ }
+ part, err := writer.CreateFormFile(uploadFile.Name,
filepath.Base(uploadFile.Filepath))
+ if err != nil {
+ return nil, "", err
+ }
+ _, err = io.Copy(part, file)
+ defer file.Close()
+ }
+ for k, v := range reqParams {
+ if err := writer.WriteField(k, v); err != nil {
+ return nil, "", err
+ }
+ }
+ if err := writer.Close(); err != nil {
+ return nil, "", err
+ }
+ return body, writer.FormDataContentType(), nil
+ }
+
+ urlValues := url.Values{}
+ for key, val := range reqParams {
+ urlValues.Set(key, val)
+ }
+
+ reqBody := urlValues.Encode()
+
+ return strings.NewReader(reqBody), contentType, nil
Review comment:
@liuxiran Thanks for the explanation.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub 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 feat-sync-docs updated (4b88942 -> fbae563)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from 4b88942 temp: trigger CI add fbae563 fix: script running position No new revisions were added by this update. Summary of changes: .github/workflows/deploy.yml | 2 +- scripts/sync-docs.js => sync-docs.js | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/sync-docs.js => sync-docs.js (100%)
[apisix-website] branch feat-sync-docs updated (ffd94c7 -> 4b88942)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. from ffd94c7 feat: sync docs & deploy add 4b88942 temp: trigger CI No new revisions were added by this update. Summary of changes: .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[GitHub] [apisix-website] juzhiyuan opened a new pull request #205: feat: sync docs & deploy
juzhiyuan opened a new pull request #205: URL: https://github.com/apache/apisix-website/pull/205 sync docs first then deploy This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 feat-sync-docs created (now ffd94c7)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch feat-sync-docs in repository https://gitbox.apache.org/repos/asf/apisix-website.git. at ffd94c7 feat: sync docs & deploy This branch includes the following new commits: new ffd94c7 feat: sync docs & deploy The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[apisix-website] 01/01: feat: sync docs & deploy
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch feat-sync-docs
in repository https://gitbox.apache.org/repos/asf/apisix-website.git
commit ffd94c7fb95a99d4d8f3822890b953978056aef7
Author: juzhiyuan
AuthorDate: Thu Feb 25 13:36:14 2021 +0800
feat: sync docs & deploy
---
.github/workflows/deploy.yml| 4
.github/workflows/updateDocs.yaml | 30 --
pullDocs.js => scripts/sync-docs.js | 2 +-
3 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7f3ec3f..b2b5131 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,6 +23,10 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can
access it
- uses: actions/checkout@v2
+ - name: Pull Docs
+run: |
+ node scripts/sync-docs.js && git status
+
- name: Build
run: |
cd website && yarn && yarn build
diff --git a/.github/workflows/updateDocs.yaml
b/.github/workflows/updateDocs.yaml
deleted file mode 100644
index 924174a..000
--- a/.github/workflows/updateDocs.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Sync Docs from projects
-
-on:
- push:
-branches: [master]
- schedule:
-# Run everyday at 6:00 AM (See
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
-- cron: "0 6 * * *"
-
-jobs:
- pull-docs:
-runs-on: ubuntu-latest
-
-steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-node@v2
-with:
- node-version: "12"
-
- - name: Pull Docs
-run: |
- node pullDocs.js && git status
-
- - name: Add & Commit
-run: |
- git config user.name github-actions
- git config user.email github-acti...@github.com
- git add .
- git commit -m "docs: update docs (by GitHub Action)"
- git push
diff --git a/pullDocs.js b/scripts/sync-docs.js
similarity index 98%
rename from pullDocs.js
rename to scripts/sync-docs.js
index 8a055a7..4d4ace9 100644
--- a/pullDocs.js
+++ b/scripts/sync-docs.js
@@ -1,4 +1,4 @@
-console.log("Start pullDocs.js");
+console.log("Start sync-docs.js");
const childProcess = require("child_process");
const fs = require("fs");
[GitHub] [apisix-website] juzhiyuan closed pull request #204: Update updateDocs.yaml
juzhiyuan closed pull request #204: URL: https://github.com/apache/apisix-website/pull/204 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] juzhiyuan opened a new pull request #204: Update updateDocs.yaml
juzhiyuan opened a new pull request #204: URL: https://github.com/apache/apisix-website/pull/204 fix pull docs This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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 juzhiyuan-patch-1 created (now 1624b5c)
This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a change to branch juzhiyuan-patch-1 in repository https://gitbox.apache.org/repos/asf/apisix-website.git. at 1624b5c Update updateDocs.yaml This branch includes the following new commits: new 1624b5c Update updateDocs.yaml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[apisix-website] 01/01: Update updateDocs.yaml
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-website.git
commit 1624b5cc71099323c1d74d9a8e7244c1e7294517
Author: 琚致远
AuthorDate: Thu Feb 25 13:28:27 2021 +0800
Update updateDocs.yaml
---
.github/workflows/updateDocs.yaml | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/updateDocs.yaml
b/.github/workflows/updateDocs.yaml
index 924174a..7801876 100644
--- a/.github/workflows/updateDocs.yaml
+++ b/.github/workflows/updateDocs.yaml
@@ -3,6 +3,8 @@ name: Sync Docs from projects
on:
push:
branches: [master]
+ pull_request:
+branches: [master]
schedule:
# Run everyday at 6:00 AM (See
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
- cron: "0 6 * * *"
@@ -21,10 +23,10 @@ jobs:
run: |
node pullDocs.js && git status
- - name: Add & Commit
-run: |
- git config user.name github-actions
- git config user.email github-acti...@github.com
- git add .
- git commit -m "docs: update docs (by GitHub Action)"
- git push
+ - name: Deploy
+uses: peaceiris/actions-gh-pages@v3
+#if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: .
+ publish_branch: master
[GitHub] [apisix] idbeta commented on pull request #3667: test: add fuzzing case for the route with vars
idbeta commented on pull request #3667: URL: https://github.com/apache/apisix/pull/3667#issuecomment-785621939 ping @spacewander can you check the CI fail? It seems that the case is unstable. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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: fix: Sync Docs action issue and other issues (#203)
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 55b53c5 fix: Sync Docs action issue and other issues (#203)
55b53c5 is described below
commit 55b53c5d0a5e91823b230458a58767aab2f40bdf
Author: qier222
AuthorDate: Thu Feb 25 13:19:47 2021 +0800
fix: Sync Docs action issue and other issues (#203)
---
.github/workflows/updateDocs.yaml | 9 +-
website/docusaurus.config.js | 7 +-
.../current.json | 10 --
.../current.json | 10 --
.../version-2.3.json | 10 --
.../current.json | 0
.../current.json | 10 ++
.../current.json | 0
.../zh/docusaurus-plugin-content-docs/current.json | 10 ++
.../docusaurus-theme-classic/footer.json | 2 +-
.../docusaurus-theme-classic/navbar.json | 2 +-
website/src/theme/DocPage/index.js | 149 +
website/src/theme/DocPage/styles.module.css| 4 +-
website/src/theme/DocSidebar/styles.module.css | 22 +--
14 files changed, 139 insertions(+), 106 deletions(-)
diff --git a/.github/workflows/updateDocs.yaml
b/.github/workflows/updateDocs.yaml
index 1fcf32d..924174a 100644
--- a/.github/workflows/updateDocs.yaml
+++ b/.github/workflows/updateDocs.yaml
@@ -22,6 +22,9 @@ jobs:
node pullDocs.js && git status
- name: Add & Commit
-uses: EndBug/add-and-commit@v7.0.0
-with:
- message: "docs: update docs (by GitHub Action)"
+run: |
+ git config user.name github-actions
+ git config user.email github-acti...@github.com
+ git add .
+ git commit -m "docs: update docs (by GitHub Action)"
+ git push
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 4660397..01af217 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -72,6 +72,7 @@ module.exports = {
},
onBrokenLinks: "log",
onBrokenMarkdownLinks: "log",
+ noIndex: true,
presets: [
[
"@docusaurus/preset-classic",
@@ -149,15 +150,15 @@ module.exports = {
},
{
label: "APISIX™️",
- to: "/docs/apisix/test",
+ to: "/docs/apisix/introduction",
},
{
label: "APISIX™️ Dashboard",
- to: "/docs/dashboard/test",
+ to: "/docs/dashboard/introduction",
},
{
label: "APISIX™️ Ingress Controller",
- to: "/docs/ingress-controller/test",
+ to: "/docs/ingress-controller/install",
},
],
},
diff --git
a/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-dashboard/current.json
b/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-dashboard/current.json
deleted file mode 100644
index 725a1bb..000
---
a/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-dashboard/current.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "version.label": {
-"message": "Next",
-"description": "The label for version current"
- },
- "sidebar.docs.category.APISIX™️ Dashboard": {
-"message": "APISIX™️ Dashboard",
-"description": "The label for category APISIX™️ Dashboard in sidebar docs"
- }
-}
diff --git
a/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-ingress-controller/current.json
b/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-ingress-controller/current.json
deleted file mode 100644
index 725a1bb..000
---
a/website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-ingress-controller/current.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "version.label": {
-"message": "Next",
-"description": "The label for version current"
- },
- "sidebar.docs.category.APISIX™️ Dashboard": {
-"message": "APISIX™️ Dashboard",
-"description": "The label for category APISIX™️ Dashboard in sidebar docs"
- }
-}
diff --git a/website/i18n/zh-cn/docusaurus-plugin-content-docs/version-2.3.json
b/website/i18n/zh-cn/docusaurus-plugin-content-docs/version-2.3.json
deleted file mode 100644
index 80ddd0e..000
--- a/website/i18n/zh-cn/docusaurus-plugin-content-docs/version-2.3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "version.label": {
-"message": "2.3",
-"description": "The label for version 2.3"
- },
- "sidebar.docs.category.APISIX™️": {
-"message": "APISIX™️",
-"description": "The label for category APISIX™️ in sidebar docs"
- }
-}
\ No newline at end of file
diff --git
[GitHub] [apisix-website] juzhiyuan merged pull request #203: fix: Sync Docs action issue and other issues
juzhiyuan merged pull request #203: URL: https://github.com/apache/apisix-website/pull/203 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-docker] tokers commented on a change in pull request #137: feat: support build apisix image from local code
tokers commented on a change in pull request #137: URL: https://github.com/apache/apisix-docker/pull/137#discussion_r582552183 ## File path: .github/workflows/apisix-alpine-local-docker-test.yaml ## @@ -0,0 +1,43 @@ +name: APISIX Alpine local docker Test + +on: + push: +branches: + - master + pull_request: +branches: + - master + +jobs: + build: +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: Build and run +run: | + git clone http://github.com/apache/apisix Review comment: > To mock building from local Doesn't the APISIX repository exist in the CI action env? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #1501: feat: rewrite e2e test(version_test) with ginkgo
juzhiyuan merged pull request #1501: URL: https://github.com/apache/apisix-dashboard/pull/1501 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-dashboard] branch master updated: feat: rewrite e2e test(version_test) with ginkgo (#1501)
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 190c84d feat: rewrite e2e test(version_test) with ginkgo (#1501)
190c84d is described below
commit 190c84d85d379ecebb09af369bdda40ea43e6049
Author: JinChen <36916582+jayc...@users.noreply.github.com>
AuthorDate: Thu Feb 25 13:16:45 2021 +0800
feat: rewrite e2e test(version_test) with ginkgo (#1501)
---
api/test/e2enew/version/version_suite_test.go| 27 +
api/test/{e2e => e2enew/version}/version_test.go | 48 ++--
2 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/api/test/e2enew/version/version_suite_test.go
b/api/test/e2enew/version/version_suite_test.go
new file mode 100644
index 000..6293697
--- /dev/null
+++ b/api/test/e2enew/version/version_suite_test.go
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package version
+
+import (
+ "testing"
+
+ "github.com/onsi/ginkgo"
+)
+
+func TestRoute(t *testing.T) {
+ ginkgo.RunSpecs(t, "version suite")
+}
diff --git a/api/test/e2e/version_test.go
b/api/test/e2enew/version/version_test.go
similarity index 71%
rename from api/test/e2e/version_test.go
rename to api/test/e2enew/version/version_test.go
index 39ae0b9..820cd9e 100644
--- a/api/test/e2e/version_test.go
+++ b/api/test/e2enew/version/version_test.go
@@ -14,46 +14,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package e2e
+package version
import (
"net/http"
- "testing"
+
+ "github.com/onsi/ginkgo"
+ "github.com/onsi/ginkgo/extensions/table"
+
+ "e2enew/base"
)
-func TestVersion(t *testing.T) {
- tests := []HttpTestCase{
- {
- Desc: "get version",
- Object: ManagerApiExpect(t),
+var _ = ginkgo.Describe("Version", func() {
+ table.DescribeTable("version test",
+ func(tc base.HttpTestCase) {
+ base.RunTestCase(tc)
+ },
+ table.Entry("get version", base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Method: http.MethodGet,
Path: "/apisix/admin/tool/version",
ExpectStatus: http.StatusOK,
ExpectBody: []string{"commit_hash", "\"version\""},
- },
- }
-
- for _, tc := range tests {
- testCaseCheck(tc, t)
- }
-}
-
-func TestVersionMatched(t *testing.T) {
- tests := []HttpTestCase{
- {
- Desc: "check version matched (not matched)",
- Object: ManagerApiExpect(t),
+ }),
+ table.Entry("check version matched (not matched)",
base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
Method: http.MethodGet,
Path: "/apisix/admin/tool/version_match",
- Headers: map[string]string{"Authorization": token},
+ Headers: map[string]string{"Authorization":
base.GetToken()},
ExpectStatus: http.StatusOK,
ExpectBody: []string{"\"code\":201",
"\"message\":\"The manager-api and apache
apisix are mismatched.\"",
"\"matched\":false", "apisix_server1",
"apisix_server2"},
- },
- }
-
- for _, tc := range tests {
- testCaseCheck(tc, t)
- }
-}
+ }),
+ )
+})
[GitHub] [apisix] tokers commented on a change in pull request #3660: chore: update makefile install to install everything in conf
tokers commented on a change in pull request #3660: URL: https://github.com/apache/apisix/pull/3660#discussion_r582551397 ## File path: Makefile ## @@ -143,9 +143,7 @@ install: default $(INSTALL) -d /usr/local/apisix/ $(INSTALL) -d /usr/local/apisix/logs/ $(INSTALL) -d /usr/local/apisix/conf/cert - $(INSTALL) conf/mime.types /usr/local/apisix/conf/mime.types - $(INSTALL) conf/config.yaml /usr/local/apisix/conf/config.yaml - $(INSTALL) conf/config-default.yaml /usr/local/apisix/conf/config-default.yaml + $(INSTALL) conf/* /usr/local/apisix/conf/ Review comment: OK, got it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] tokers commented on a change in pull request #262: feat: ApisixRoute v2alpha1
tokers commented on a change in pull request #262:
URL:
https://github.com/apache/apisix-ingress-controller/pull/262#discussion_r582551116
##
File path: pkg/ingress/controller/controller.go
##
@@ -338,17 +340,6 @@ type Api6Controller struct {
Stop <-chan struct{}
}
-func (api6 *Api6Controller) ApisixRoute(controller *Controller) {
Review comment:
Sorry I forgot to set this PR to draft, the v1 ApisixRoute will be kept
of course.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-ingress-controller] tokers merged pull request #258: chore: migrate chart to repo apisix-helm-charts
tokers merged pull request #258: URL: https://github.com/apache/apisix-ingress-controller/pull/258 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-ingress-controller] branch master updated: chore: migrate chart to repo apisix-helm-charts (#258)
This is an automated email from the ASF dual-hosted git repository. tokers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 6d926db chore: migrate chart to repo apisix-helm-charts (#258) 6d926db is described below commit 6d926dba38cd86fef326e7b60fbdec2e9614503c Author: Jun AuthorDate: Thu Feb 25 13:13:23 2021 +0800 chore: migrate chart to repo apisix-helm-charts (#258) --- charts/apisix-ingress-controller/.helmignore | 23 --- charts/apisix-ingress-controller/Chart.yaml| 28 charts/apisix-ingress-controller/README.md | 42 -- .../crds/customresourcedefinitions.yaml| 70 - .../apisix-ingress-controller/templates/NOTES.txt | 5 - .../templates/_helpers.tpl | 80 -- .../templates/configmap.yaml | 41 - .../templates/deployment.yaml | 91 .../apisix-ingress-controller/templates/hpa.yaml | 44 -- .../apisix-ingress-controller/templates/rbac.yaml | 165 - .../templates/service-account.yaml | 22 --- .../templates/service.yaml | 31 charts/apisix-ingress-controller/values.yaml | 72 - docs/en/latest/deployments/ack.md | 7 +- docs/en/latest/deployments/aws.md | 7 +- docs/en/latest/deployments/azure.md| 7 +- docs/en/latest/deployments/gke.md | 7 +- docs/en/latest/deployments/k3s-rke.md | 7 +- docs/en/latest/deployments/kubesphere.md | 7 +- docs/en/latest/deployments/minikube.md | 7 +- docs/en/latest/deployments/tke.md | 7 +- 21 files changed, 24 insertions(+), 746 deletions(-) diff --git a/charts/apisix-ingress-controller/.helmignore b/charts/apisix-ingress-controller/.helmignore deleted file mode 100644 index 0e8a0eb..000 --- a/charts/apisix-ingress-controller/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/apisix-ingress-controller/Chart.yaml b/charts/apisix-ingress-controller/Chart.yaml deleted file mode 100644 index 80fa853..000 --- a/charts/apisix-ingress-controller/Chart.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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. -# -apiVersion: v2 -name: apisix-ingress-controller -description: Apache APISIX Ingress Controller for Kubernetes -icon: https://apache.org/logos/res/apisix/apisix.png -keywords: - - ingress - - apisix - - nginx - - crd -type: application -version: 0.1.0 -appVersion: 0.2.0 diff --git a/charts/apisix-ingress-controller/README.md b/charts/apisix-ingress-controller/README.md deleted file mode 100644 index 741e625..000 --- a/charts/apisix-ingress-controller/README.md +++ /dev/null @@ -1,42 +0,0 @@ - - -# Apache APISIX Ingress Controller Helm Chart - -## Prerequisites - -- Kubernetes 1.12+ -- [Apache APISIX](https://github.com/apache/apisix#configure-and-installation) -- [Helm v3.0+](https://helm.sh/docs/intro/quickstart/#install-helm) - -## Install - -To install the chart with release name `apisix-ingress-controller`: - -```bash -helm install apisix-ingress-controller --namespace ingress-apisix . -``` - -## Uninstall - -To uninstall/delete the `apisix-ingress-controller` release: - -```bash -helm uninstall apisix-ingress-controller --namespace ingress-apisix -``` diff --git a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml b/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml deleted file mode 100644 index 58544a0..000 --- a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml +++ /dev/null @@ -1,70 +0,0 @@ -# -# Licensed to the Apache
[GitHub] [apisix-ingress-controller] tokers merged pull request #268: docs: move install.md location to top level directory
tokers merged pull request #268: URL: https://github.com/apache/apisix-ingress-controller/pull/268 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] tokers closed issue #257: Change the location of install.md
tokers closed issue #257: URL: https://github.com/apache/apisix-ingress-controller/issues/257 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-ingress-controller] branch master updated: docs: move install.md location to top level directory (#268)
This is an automated email from the ASF dual-hosted git repository. tokers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new df5f894 docs: move install.md location to top level directory (#268) df5f894 is described below commit df5f8949eebbb97c5e88de97624c865766957188 Author: Cliff Su AuthorDate: Thu Feb 25 13:12:58 2021 +0800 docs: move install.md location to top level directory (#268) --- README.md | 2 +- docs/en/latest/install.md => install.md | 16 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 72d50ee..0651d1c 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Get more [implementation details](./docs/en/latest/design.md). ## Get started -* [How to install](./docs/en/latest/install.md) +* [How to install](./install.md) ## Todos diff --git a/docs/en/latest/install.md b/install.md similarity index 65% rename from docs/en/latest/install.md rename to install.md index b920874..97173e4 100644 --- a/docs/en/latest/install.md +++ b/install.md @@ -21,13 +21,13 @@ This is an index page about installing Ingress APISIX in several environments. Click the following links on demands. -* [Install Ingress APISIX on Azure AKS](deployments/azure.md) -* [Install Ingress APISIX on AWS EKS](deployments/aws.md) -* [Install Ingress APISIX on ACK](deployments/ack.md) -* [Install Ingress APISIX on Google Cloud GKE](deployments/gke.md) -* [Install Ingress APISIX on Minikube](deployments/minikube.md) -* [Install Ingress APISIX on KubeSphere](deployments/kubesphere.md) -* [Install Ingress APISIX on K3S and RKE](deployments/k3s-rke.md) +* [Install Ingress APISIX on Azure AKS](./docs/en/latest/deployments/azure.md) +* [Install Ingress APISIX on AWS EKS](./docs/en/latest/deployments/aws.md) +* [Install Ingress APISIX on ACK](./docs/en/latest/deployments/ack.md) +* [Install Ingress APISIX on Google Cloud GKE](./docs/en/latest/deployments/gke.md) +* [Install Ingress APISIX on Minikube](./docs/en/latest/deployments/minikube.md) +* [Install Ingress APISIX on KubeSphere](./docs/en/latest/deployments/kubesphere.md) +* [Install Ingress APISIX on K3S and RKE](./docs/en/latest/deployments/k3s-rke.md) ## Kustomize Support @@ -42,4 +42,4 @@ Parameters are hardcoded so if the default values are not good for you, just twe ## Verify Installation -There are a lot of use examples (See [samples](./samples/index.md) for more details), try to follow the operations there to verify the installation. +There are a lot of use examples (See [samples](./docs/en/latest/samples/index.md) for more details), try to follow the operations there to verify the installation.
[GitHub] [apisix-helm-chart] tokers commented on issue #6: Discuss: Add APISIX-helm-chart to the Charts repo.
tokers commented on issue #6: URL: https://github.com/apache/apisix-helm-chart/issues/6#issuecomment-785616456 @gxthrj Currently only apisix-ingress-controller doesn't be added, others were already added. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on pull request #3661: docs: modify the docs directory
juzhiyuan commented on pull request #3661: URL: https://github.com/apache/apisix/pull/3661#issuecomment-785616142 https://github.com/apache/apisix/pull/3661/checks?check_run_id=1975897061#step:14:733 cc @spacewander to take a look at this CI This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #3666: test: make key-auth-upstream-domain-node stable
spacewander merged pull request #3666: URL: https://github.com/apache/apisix/pull/3666 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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: test: make key-auth-upstream-domain-node stable (#3666)
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 de9ea13 test: make key-auth-upstream-domain-node stable (#3666)
de9ea13 is described below
commit de9ea132845202bd79624ddb780096882d50288c
Author: 罗泽轩
AuthorDate: Thu Feb 25 13:07:18 2021 +0800
test: make key-auth-upstream-domain-node stable (#3666)
---
t/plugin/key-auth-upstream-domain-node.t | 31 +--
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/t/plugin/key-auth-upstream-domain-node.t
b/t/plugin/key-auth-upstream-domain-node.t
index 2cc50da..3211c9e 100644
--- a/t/plugin/key-auth-upstream-domain-node.t
+++ b/t/plugin/key-auth-upstream-domain-node.t
@@ -14,6 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+BEGIN {
+$ENV{CUSTOM_DNS_SERVER} = "127.0.0.1:1053";
+}
+
use t::APISIX 'no_plan';
repeat_each(1);
@@ -80,7 +84,7 @@ passed
-=== TEST 3: create route with plugin `limit-req`(upstream node contains domain)
+=== TEST 3: create route with plugin `limit-count`(upstream node contains
domain)
--- config
location /t {
content_by_lua_block {
@@ -89,16 +93,16 @@ passed
ngx.HTTP_PUT,
[[{
"plugins": {
-"limit-req": {
-"rate": 1,
-"burst": 0,
+"limit-count": {
+"count": 1,
+"time_window": 5,
"rejected_code": 503,
"key": "remote_addr"
}
},
"upstream": {
"nodes": {
-"www.apiseven.com:80": 1
+"ttl.test.local:1980": 1
},
"pass_host": "node",
"type": "roundrobin"
@@ -142,18 +146,18 @@ location /t {
headers
)
ngx.say("return: ", code)
+ngx.sleep(1)
end
}
}
--- request
GET /t
--- response_body
-return: 302
+return: 404
return: 503
return: 503
--- no_error_log
[error]
timeout: 5
@@ -166,7 +170,7 @@ return: 503
ngx.HTTP_PUT,
[[{
"nodes": {
-"www.apiseven.com:80": 1
+"ttl.test.local:1980": 1
},
"pass_host": "node",
"type": "roundrobin"
@@ -188,7 +192,7 @@ passed
-=== TEST 6: create route with plugin `limit-req`, and bind upstream via id
+=== TEST 6: create route with plugin `limit-count`, and bind upstream via id
--- config
location /t {
content_by_lua_block {
@@ -197,9 +201,9 @@ passed
ngx.HTTP_PUT,
[[{
"plugins": {
-"limit-req": {
-"rate": 1,
-"burst": 0,
+"limit-count": {
+"count": 1,
+"time_window": 5,
"rejected_code": 503,
"key": "remote_addr"
}
@@ -250,9 +254,8 @@ location /t {
--- request
GET /t
--- response_body
-return: 302
+return: 404
return: 503
return: 503
--- no_error_log
[error]
timeout: 5
[apisix] branch master updated (e146893 -> 7bef1b1)
This is an automated email from the ASF dual-hosted git repository. membphis pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git. from e146893 docs: plugin-develop.md adds ctx and conf descriptions (#3650) add 7bef1b1 feat: don't log uninitialized access log variable when the HTTP request is malformed (#3641) No new revisions were added by this update. Summary of changes: .travis/apisix_cli_test/test_main.sh | 20 +++- apisix/cli/ngx_tpl.lua | 1 + 2 files changed, 20 insertions(+), 1 deletion(-)
[GitHub] [apisix] membphis merged pull request #3641: feat: don't log uninitialized access log variable when the HTTP reque…
membphis merged pull request #3641: URL: https://github.com/apache/apisix/pull/3641 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #3627: docs: add Slack to the communication channels
membphis commented on pull request #3627: URL: https://github.com/apache/apisix/pull/3627#issuecomment-785611751 need to merge the master branch This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #3624: feat: add pre-commit framework
membphis commented on pull request #3624: URL: https://github.com/apache/apisix/pull/3624#issuecomment-785611402 need to resolve the Conflicting files This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on pull request #1501: feat: rewrite e2e test(version_test) with ginkgo
Jaycean commented on pull request #1501: URL: https://github.com/apache/apisix-dashboard/pull/1501#issuecomment-785611294 @starsz @imjoey PTAL. Thks. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #3622: docs: fix markdown links
membphis commented on pull request #3622: URL: https://github.com/apache/apisix/pull/3622#issuecomment-785610985 need to merge the master branch This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1502: feat: rewrite e2e test(upstream_test) with ginkgo
Jaycean commented on a change in pull request #1502:
URL: https://github.com/apache/apisix-dashboard/pull/1502#discussion_r582544537
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,591 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+"uri": "/hello",
+"upstream_id": "not-exists"
+}`,
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ })
+ })
+
+ ginkgo.It("create upstream", func() {
+ t := ginkgo.GinkgoT()
+ createUpstreamBody := make(map[string]interface{})
+ createUpstreamBody["name"] = "upstream1"
+ createUpstreamBody["nodes"] = []map[string]interface{}{
+ {
+ "host": base.UpstreamIp,
+ "port": 1980,
+ "weight": 1,
+ },
+ }
+ createUpstreamBody["type"] = "roundrobin"
+ _createUpstreamBody, err := json.Marshal(createUpstreamBody)
+ assert.Nil(t, err)
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/upstreams/1",
+ Body: string(_createUpstreamBody),
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ })
+ })
+ ginkgo.It("check upstream exists by name", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ ExpectBody: "Upstream name is reduplicate",
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("upstream name list", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/names/upstreams",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ ExpectBody: `"name":"upstream1"`,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("check upstream exists by name (exclude it self)", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1=1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("create route using the upstream just created", func()
[GitHub] [apisix-helm-chart] gxthrj commented on issue #6: Discuss: Add APISIX-helm-chart to the Charts repo.
gxthrj commented on issue #6: URL: https://github.com/apache/apisix-helm-chart/issues/6#issuecomment-785609090 @tokers Need to update the helm chart repo which we are using. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1502: feat: rewrite e2e test(upstream_test) with ginkgo
nic-chen commented on a change in pull request #1502:
URL: https://github.com/apache/apisix-dashboard/pull/1502#discussion_r582540633
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,591 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+"uri": "/hello",
+"upstream_id": "not-exists"
+}`,
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ })
+ })
+
+ ginkgo.It("create upstream", func() {
+ t := ginkgo.GinkgoT()
+ createUpstreamBody := make(map[string]interface{})
+ createUpstreamBody["name"] = "upstream1"
+ createUpstreamBody["nodes"] = []map[string]interface{}{
+ {
+ "host": base.UpstreamIp,
+ "port": 1980,
+ "weight": 1,
+ },
+ }
+ createUpstreamBody["type"] = "roundrobin"
+ _createUpstreamBody, err := json.Marshal(createUpstreamBody)
+ assert.Nil(t, err)
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/upstreams/1",
+ Body: string(_createUpstreamBody),
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ })
+ })
+ ginkgo.It("check upstream exists by name", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ ExpectBody: "Upstream name is reduplicate",
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("upstream name list", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/names/upstreams",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ ExpectBody: `"name":"upstream1"`,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("check upstream exists by name (exclude it self)", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1=1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("create route using the upstream just created", func()
[GitHub] [apisix-helm-chart] gxthrj edited a comment on pull request #26: chore: fix the template of deployment.yaml and add hints for affinity setting in values.yaml
gxthrj edited a comment on pull request #26: URL: https://github.com/apache/apisix-helm-chart/pull/26#issuecomment-785604960 Any updates ? @TkClark Please check the review comments in the README section. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1498: ci: add ci check for gofmt
nic-chen commented on a change in pull request #1498: URL: https://github.com/apache/apisix-dashboard/pull/1498#discussion_r582539035 ## File path: .github/workflows/go-lint.yml ## @@ -10,9 +10,26 @@ on: jobs: golangci: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: run lint run: make go-lint + + gofmt: +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: setup go +uses: actions/setup-go@v1 +with: + go-version: '1.13' + - name: check gofmt +working-directory: ./ +run: | + diffs=`gofmt -l .` Review comment: oh, no, I try this, it display too much info, it's unnecessary to show the detail in the ci. @starsz you could try for 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-helm-chart] gxthrj commented on pull request #26: chore: fix the template of deployment.yaml and add hints for affinity setting in values.yaml
gxthrj commented on pull request #26: URL: https://github.com/apache/apisix-helm-chart/pull/26#issuecomment-785604960 Any updates ? @TkClark This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] liuxiran commented on a change in pull request #1465: feat(be): Online debug function adds support for transfer files
liuxiran commented on a change in pull request #1465:
URL: https://github.com/apache/apisix-dashboard/pull/1465#discussion_r582538635
##
File path: api/test/e2enew/base/http.go
##
@@ -92,3 +104,44 @@ func BatchTestServerPort(times int) map[string]int {
return res
}
+
+func GetReader(reqParams map[string]string, contentType string, files
[]UploadFile) (io.Reader, string, error) {
+ if strings.Index(contentType, "json") > -1 {
+ bytesData, _ := json.Marshal(reqParams)
+ return bytes.NewReader(bytesData), contentType, nil
+ }
+ if files != nil {
+ body := {}
+ writer := multipart.NewWriter(body)
+ for _, uploadFile := range files {
+ file, err := os.Open(uploadFile.Filepath)
+ if err != nil {
+ return nil, "", err
+ }
+ part, err := writer.CreateFormFile(uploadFile.Name,
filepath.Base(uploadFile.Filepath))
+ if err != nil {
+ return nil, "", err
+ }
+ _, err = io.Copy(part, file)
+ defer file.Close()
+ }
+ for k, v := range reqParams {
+ if err := writer.WriteField(k, v); err != nil {
+ return nil, "", err
+ }
+ }
+ if err := writer.Close(); err != nil {
+ return nil, "", err
+ }
+ return body, writer.FormDataContentType(), nil
+ }
+
+ urlValues := url.Values{}
+ for key, val := range reqParams {
+ urlValues.Set(key, val)
+ }
+
+ reqBody := urlValues.Encode()
+
+ return strings.NewReader(reqBody), contentType, nil
Review comment:
Request params include url, prototal, method, header params and body
params, they used to form the new request rewarding by golang.
Before this pr, we put all request params to the request body, and we use
`json` to transfor data
due to this new feature, the origin request support not only `json`,
`form-data` is accepted. Inorder not to disturb the origin formdata, we put
others params including: url, prototal, method and header params to the request
header, and the reqest body keep the origin body, so that the forwarding
request can use the body directly.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-docker] gxthrj commented on a change in pull request #137: feat: support build apisix image from local code
gxthrj commented on a change in pull request #137:
URL: https://github.com/apache/apisix-docker/pull/137#discussion_r582537401
##
File path: .github/workflows/apisix-alpine-local-docker-test.yaml
##
@@ -0,0 +1,43 @@
+name: APISIX Alpine local docker Test
+
+on:
+ push:
+branches:
+ - master
+ pull_request:
+branches:
+ - master
+
+jobs:
+ build:
+runs-on: ubuntu-latest
+steps:
+ - uses: actions/checkout@v2
+ - name: Build and run
+run: |
+ git clone http://github.com/apache/apisix
+ export APISIX_PATH="./apisix"
Review comment:
May be better to use `./apisix-local`
##
File path: Makefile
##
@@ -28,6 +28,10 @@ build-on-centos:
build-on-alpine:
docker build -t $(IMAGE_NAME):$(APISIX_VERSION)-alpine -f
./alpine/Dockerfile .
+### build-on-alpine: Build apaceh/apisix:xx-alpine image
+build-on-alpine-local:
+ docker build -t $(IMAGE_NAME):alpine-local --build-arg
APISIX_VERSION=${APISIX_PATH} -f ./alpine-local/Dockerfile .
Review comment:
Because you are building the image from a local directory, you don’t
need to specify APISIX_VERSION here.
It is better to specify APISIX_VERSION when `git clone`.
##
File path: .github/workflows/apisix-alpine-local-docker-test.yaml
##
@@ -0,0 +1,43 @@
+name: APISIX Alpine local docker Test
+
+on:
+ push:
+branches:
+ - master
+ pull_request:
+branches:
+ - master
+
+jobs:
+ build:
+runs-on: ubuntu-latest
+steps:
+ - uses: actions/checkout@v2
+ - name: Build and run
+run: |
+ git clone http://github.com/apache/apisix
Review comment:
We need to specify APISIX_VERSION when `git clone`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-website] qier222 opened a new pull request #203: fix: CI issue and other issues
qier222 opened a new pull request #203: URL: https://github.com/apache/apisix-website/pull/203 Fixes: #[Add issue number here] Changes: Screenshots of the change: This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on issue #1450: feat: support exposing schema of route, upstream, service and ssl through Manager API
nic-chen commented on issue #1450: URL: https://github.com/apache/apisix-dashboard/issues/1450#issuecomment-785600752 @membphis updated. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] gxthrj commented on a change in pull request #262: feat: ApisixRoute v2alpha1
gxthrj commented on a change in pull request #262:
URL:
https://github.com/apache/apisix-ingress-controller/pull/262#discussion_r582535841
##
File path: pkg/ingress/controller/controller.go
##
@@ -338,17 +340,6 @@ type Api6Controller struct {
Stop <-chan struct{}
}
-func (api6 *Api6Controller) ApisixRoute(controller *Controller) {
Review comment:
We discussed earlier that we should keep the v1 version for a while,
declare in the document "deprecated", and delete the logic of v1 in version 1.0.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] Jaycean commented on a change in pull request #1502: feat: rewrite e2e test(upstream_test) with ginkgo
Jaycean commented on a change in pull request #1502:
URL: https://github.com/apache/apisix-dashboard/pull/1502#discussion_r582535566
##
File path: api/test/e2enew/upstream/upstream_test.go
##
@@ -0,0 +1,591 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package upstream
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+
+ "e2enew/base"
+)
+
+var _ = ginkgo.Describe("Upstream", func() {
+ ginkgo.It("test upstream create", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/routes/r1",
+ Body: `{
+"uri": "/hello",
+"upstream_id": "not-exists"
+}`,
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ })
+ })
+
+ ginkgo.It("create upstream", func() {
+ t := ginkgo.GinkgoT()
+ createUpstreamBody := make(map[string]interface{})
+ createUpstreamBody["name"] = "upstream1"
+ createUpstreamBody["nodes"] = []map[string]interface{}{
+ {
+ "host": base.UpstreamIp,
+ "port": 1980,
+ "weight": 1,
+ },
+ }
+ createUpstreamBody["type"] = "roundrobin"
+ _createUpstreamBody, err := json.Marshal(createUpstreamBody)
+ assert.Nil(t, err)
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodPut,
+ Path: "/apisix/admin/upstreams/1",
+ Body: string(_createUpstreamBody),
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ })
+ })
+ ginkgo.It("check upstream exists by name", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusBadRequest,
+ ExpectBody: "Upstream name is reduplicate",
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("upstream name list", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/names/upstreams",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ ExpectBody: `"name":"upstream1"`,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("check upstream exists by name (exclude it self)", func() {
+ base.RunTestCase(base.HttpTestCase{
+ Object: base.ManagerApiExpect(),
+ Method: http.MethodGet,
+ Path: "/apisix/admin/notexist/upstreams",
+ Query:"name=upstream1=1",
+ Headers: map[string]string{"Authorization":
base.GetToken()},
+ ExpectStatus: http.StatusOK,
+ Sleep:base.SleepTime,
+ })
+ })
+ ginkgo.It("create route using the upstream just created", func()
[GitHub] [apisix-ingress-controller] gxthrj commented on pull request #262: feat: ApisixRoute v2alpha1
gxthrj commented on pull request #262: URL: https://github.com/apache/apisix-ingress-controller/pull/262#issuecomment-785590961 Conflicting files This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on issue #1487: Support duplicate one existing Route
nic-chen commented on issue #1487: URL: https://github.com/apache/apisix-dashboard/issues/1487#issuecomment-785586397 Is it possible to just copy the data on the page, and the user can modify it before submitting it? Instead of directly cloning the route data first. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1498: ci: add ci check for gofmt
nic-chen commented on a change in pull request #1498: URL: https://github.com/apache/apisix-dashboard/pull/1498#discussion_r582533107 ## File path: .github/workflows/go-lint.yml ## @@ -10,9 +10,26 @@ on: jobs: golangci: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: run lint run: make go-lint + + gofmt: +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: setup go +uses: actions/setup-go@v1 +with: + go-version: '1.13' + - name: check gofmt +working-directory: ./ +run: | + diffs=`gofmt -l .` 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-ingress-controller] gxthrj commented on issue #261: request help: ingress-ui
gxthrj commented on issue #261: URL: https://github.com/apache/apisix-ingress-controller/issues/261#issuecomment-785577766 @zhangxiaohui123456 We mainly support declarative configuration in this version. What kind of interface do you want? Can you give me an 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] idbeta opened a new pull request #3667: test: add fuzzing case for the route with vars
idbeta opened a new pull request #3667: URL: https://github.com/apache/apisix/pull/3667 ### What this PR does / why we need it: relate #3340 fuzzing for the route with vars ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] gxthrj commented on issue #259: request help: Getting route not found issue
gxthrj commented on issue #259: URL: https://github.com/apache/apisix-ingress-controller/issues/259#issuecomment-785572839 @Bhanuji95 Has the problem of not finding the route been resolved? If so, we can close this issue. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] codecov-io commented on pull request #268: docs: move install.md location to top level directory
codecov-io commented on pull request #268: URL: https://github.com/apache/apisix-ingress-controller/pull/268#issuecomment-785569862 # [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=h1) Report > Merging [#268](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=desc) (13cf3b8) into [master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/da009ddebca2442eb77a5273a13de2c8a766cf40?el=desc) (da009dd) will **increase** coverage by `2.24%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=tree) ```diff @@Coverage Diff @@ ## master #268 +/- ## == + Coverage 51.67% 53.92% +2.24% == Files 35 32 -3 Lines2359 2244 -115 == - Hits 1219 1210 -9 + Misses982 877 -105 + Partials 158 157 -1 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=tree) | Coverage Δ | | |---|---|---| | [pkg/ingress/apisix/tls.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2luZ3Jlc3MvYXBpc2l4L3Rscy5nbw==) | `90.90% <0.00%> (-1.10%)` | :arrow_down: | | [pkg/seven/state/builder.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL3NldmVuL3N0YXRlL2J1aWxkZXIuZ28=) | `0.00% <0.00%> (ø)` | | | [pkg/kube/translation/translator.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vdHJhbnNsYXRvci5nbw==) | `53.03% <0.00%> (ø)` | | | [pkg/ingress/apisix/route.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2luZ3Jlc3MvYXBpc2l4L3JvdXRlLmdv) | | | | [pkg/ingress/apisix/annotation.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2luZ3Jlc3MvYXBpc2l4L2Fubm90YXRpb24uZ28=) | | | | [pkg/seven/state/service\_worker.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL3NldmVuL3N0YXRlL3NlcnZpY2Vfd29ya2VyLmdv) | | | | [pkg/ingress/apisix/plugin.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2luZ3Jlc3MvYXBpc2l4L3BsdWdpbi5nbw==) | | | | [test/e2e/e2e.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-dGVzdC9lMmUvZTJlLmdv) | | | | [pkg/kube/translation/apisix\_route.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vYXBpc2l4X3JvdXRlLmdv) | `0.00% <0.00%> (ø)` | | | [pkg/kube/translation/annotations.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vYW5ub3RhdGlvbnMuZ28=) | `0.00% <0.00%> (ø)` | | | ... and [1 more](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=footer). Last update [da009dd...13cf3b8](https://codecov.io/gh/apache/apisix-ingress-controller/pull/268?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] qier222 edited a comment on pull request #202: feat: multiple features for docs
qier222 edited a comment on pull request #202: URL: https://github.com/apache/apisix-website/pull/202#issuecomment-785559570 General English docs /website/docs/general APISIX English docs /website/docs/apisix APISIX English Dashboard docs /website/docs/apisix-dashboard APISIX Ingress Controller English docs /website/docs/apisix-ingress-controller General Chinese docs /website/i18n/zh/docusaurus-plugin-content-docs APISIX Chinese docs /website/i18n/zh/docusaurus-plugin-content-docs-docs-apisix APISIX Chinese Dashboard docs /website/i18n/zh/docusaurus-plugin-content-docs-docs-apisix-dashboard APISIX Ingress Controller Chinese docs /website/i18n/zh/docusaurus-plugin-content-docs-docs-apisix-ingress-controller This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] qier222 edited a comment on pull request #202: feat: multiple features for docs
qier222 edited a comment on pull request #202: URL: https://github.com/apache/apisix-website/pull/202#issuecomment-785559570 General English docs /website/docs/general APISIX English docs /website/docs/apisix APISIX English Dashboard docs /website/docs/apisix-dashboard APISIX Ingress Controller English docs /website/docs/apisix-ingress-controller General Chinese docs /website/i18n/zh-cn/docusaurus-plugin-content-docs APISIX Chinese docs /website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix APISIX Chinese Dashboard docs /website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-dashboard APISIX Ingress Controller Chinese docs /website/i18n/zh-cn/docusaurus-plugin-content-docs-docs-apisix-ingress-controller This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] gxthrj closed issue #264: remove the useless conf.json
gxthrj closed issue #264: URL: https://github.com/apache/apisix-ingress-controller/issues/264 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] gxthrj commented on issue #264: remove the useless conf.json
gxthrj commented on issue #264: URL: https://github.com/apache/apisix-ingress-controller/issues/264#issuecomment-785561933 Close this 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-ingress-controller] stu01509 opened a new pull request #268: docs: move install.md location to top level directory
stu01509 opened a new pull request #268: URL: https://github.com/apache/apisix-ingress-controller/pull/268 Please answer these questions before submitting a pull request - Why submit this pull request? - [ ] Bugfix - [x] New feature provided - [ ] Improve performance - [ ] Backport patches - Related issues #257 ___ ### New feature or improvement - Describe the details and related test reports. Move the **install.md** file to the top-level directory, and modify the **install.md** relative path. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] gxthrj merged pull request #267: chore: remove unless conf.json
gxthrj merged pull request #267: URL: https://github.com/apache/apisix-ingress-controller/pull/267 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix-ingress-controller] branch master updated: chore: remove unless conf.json (#267)
This is an automated email from the ASF dual-hosted git repository.
kvn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new d5ea70b chore: remove unless conf.json (#267)
d5ea70b is described below
commit d5ea70b3d09c907d5a6e1731432770cc6b76d79e
Author: Cliff Su
AuthorDate: Thu Feb 25 12:01:47 2021 +0800
chore: remove unless conf.json (#267)
---
conf.json | 12
1 file changed, 12 deletions(-)
diff --git a/conf.json b/conf.json
deleted file mode 100644
index a624a95..000
--- a/conf.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "conf":{
-"k8sAuth": {
- "file": #k8sAuthFile#
-},
-"syslog":{
- "host": "#syslogAddress#"
-},
-"apisix":{
- "base_url": "#apisixBaseUrl#"
-}
-}
[GitHub] [apisix] Firstsawyou commented on pull request #3666: test: make key-auth-upstream-domain-node stable
Firstsawyou commented on pull request #3666: URL: https://github.com/apache/apisix/pull/3666#issuecomment-785559698 LGTM. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 a change in pull request #3660: chore: update makefile install to install everything in conf
Yiyiyimu commented on a change in pull request #3660: URL: https://github.com/apache/apisix/pull/3660#discussion_r582529217 ## File path: Makefile ## @@ -143,9 +143,8 @@ install: default $(INSTALL) -d /usr/local/apisix/ $(INSTALL) -d /usr/local/apisix/logs/ $(INSTALL) -d /usr/local/apisix/conf/cert - $(INSTALL) conf/mime.types /usr/local/apisix/conf/mime.types - $(INSTALL) conf/config.yaml /usr/local/apisix/conf/config.yaml - $(INSTALL) conf/config-default.yaml /usr/local/apisix/conf/config-default.yaml + $(INSTALL) conf/*.types /usr/local/apisix/conf/ + $(INSTALL) conf/*.yaml /usr/local/apisix/conf/ Review comment: Thanks for the suggestion! Since we need everything under `/conf`, as what we did when creating tarball, I think it's fine to use `*`. Besides, in `make install`, it seems people intend to this kind of style. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
