[GitHub] [apisix-ingress-controller] tokers commented on a change in pull request #419: ci: add golangci-lint
tokers commented on a change in pull request #419: URL: https://github.com/apache/apisix-ingress-controller/pull/419#discussion_r627092152 ## File path: .github/workflows/golangci-lint.yml ## @@ -0,0 +1,21 @@ +name: golangci-lint + +on: + push: +branches: + - master + pull_request: +branches: + - master + +jobs: + golangci: +name: lint +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: golangci-lint +uses: golangci/golangci-lint-action@v2 +with: + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: latest Review comment: You may need to download golangci-lint and run it manually, please refer to apisix-dashboard and see how it works. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] membphis merged pull request #4008: chore: fix capitalization and image alt attributes
membphis merged pull request #4008: URL: https://github.com/apache/apisix/pull/4008 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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: doc: fix capitalization and image alt attributes (#4008)
This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git The following commit(s) were added to refs/heads/master by this push: new 17ae333 doc: fix capitalization and image alt attributes (#4008) 17ae333 is described below commit 17ae333df464c0e811ee538f3df7ef6ee9ef8601 Author: John Bampton AuthorDate: Thu May 6 15:37:35 2021 +1000 doc: fix capitalization and image alt attributes (#4008) Remove unneeded blank line --- CODE_STYLE.md| 2 +- LICENSE | 1 - README.md| 2 +- docs/es/latest/README.md | 2 +- docs/zh/latest/README.md | 2 +- kubernetes/README.md | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CODE_STYLE.md b/CODE_STYLE.md index c20f73b..9543215 100644 --- a/CODE_STYLE.md +++ b/CODE_STYLE.md @@ -21,7 +21,7 @@ title: APISIX Lua Coding Style Guide # --> -## indentation +## Indentation Use 4 spaces as an indent: diff --git a/LICENSE b/LICENSE index 1e50066..0474b54 100644 --- a/LICENSE +++ b/LICENSE @@ -216,4 +216,3 @@ The following components are provided under the Apache License. See project link The text of each license is the standard Apache 2.0 license. ewma.lua file from kubernetes/ingress-nginx: https://github.com/kubernetes/ingress-nginx Apache 2.0 - diff --git a/README.md b/README.md index 8272281..f85b6d7 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ It can also be used as a [k8s ingress controller](https://github.com/apache/apis The technical architecture of Apache APISIX: - + ## Community diff --git a/docs/es/latest/README.md b/docs/es/latest/README.md index bdbedc6..975bc7c 100644 --- a/docs/es/latest/README.md +++ b/docs/es/latest/README.md @@ -36,7 +36,7 @@ También puede usarse como [k8s ingress controller (control de ingreso)](https:/ La arquitectura técnica de Apache APISIX: - + ## Communidad diff --git a/docs/zh/latest/README.md b/docs/zh/latest/README.md index 641dcba..88f2718 100644 --- a/docs/zh/latest/README.md +++ b/docs/zh/latest/README.md @@ -34,7 +34,7 @@ title: Apache APISIX Apache APISIX 的技术架构如下图所示： - + ## 社区 diff --git a/kubernetes/README.md b/kubernetes/README.md index 0afc71c..da88532 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -17,7 +17,7 @@ # --> -### kubernetes +### Kubernetes There are some yaml files for deploying apisix in Kubernetes. @@ -35,7 +35,7 @@ if you do not need to change any config, and use default config in `../conf/conf $ kubectl create configmap apisix-gw-config.yaml --from-file=../conf/config.yaml ``` - when using etcd-operator + When using etcd-operator when using etcd-operator, you need to change `apisix-gw-config-cm.yaml`:
[GitHub] [apisix] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627089487 ## File path: CONTRIBUTING.md ## @@ -51,9 +51,42 @@ Once we've discussed your changes and you've got your code ready, make sure that ## Contribution Guidelines for Documentation +* pre-commit + +A framework for managing and maintaining multi-language pre-commit hooks. +Pre-commit can be [installed](https://pre-commit.com/#installation) with `pip`, `curl`, `brew` or `conda`. +You need to first install pre-commit and then install the pre-commit hooks with `pre-commit install`. +Now pre-commit will run automatically on git commit! Review comment: Having as much information as possible on `pre-commit` is necessary. So far both you and @spacewander don't seem to understand much about `pre-commit`. Perhaps we need a new Markdown file for these 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
[GitHub] [apisix] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627087054 ## File path: CONTRIBUTING.md ## @@ -51,9 +51,42 @@ Once we've discussed your changes and you've got your code ready, make sure that ## Contribution Guidelines for Documentation +* pre-commit + +A framework for managing and maintaining multi-language pre-commit hooks. +Pre-commit can be [installed](https://pre-commit.com/#installation) with `pip`, `curl`, `brew` or `conda`. Review comment: Most people would not install `pre-commit` with `curl` if they had the choice to use `pip`, `brew` or `conda`. I use Homebrew and I update my packages everyday and it makes it so much easier to use and manage. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1838: chore: use data value directly in tests
codecov-commenter edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-833202301 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1838](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (23750f6) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/16dfb4d669b4cb6eecc38a3bee92067938dc5ccb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (16dfb4d) will **increase** coverage by `0.02%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1838 +/- ## == + Coverage 72.07% 72.10% +0.02% == Files 125 125 Lines2944 2947 +3 Branches 710 711 +1 == + Hits 2122 2125 +3 Misses822 822 ``` | Flag | Coverage Δ | | |---|---|---| | frontend-e2e-test | `72.10% <ø> (+0.02%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.99% <0.00%> (+0.25%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [16dfb4d...23750f6](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627083105 ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license Review comment: We are not using bots. I am just using it exactly like Apache Airflow and it's allowed. When run `pre-commit` on the CI the license check would just fail if there was a missing license and the `pre-commit` GitHub Action would fail. When run locally if the license check fails then `pre-commit` would auto insert the missing license. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* ready! Built with commit 23750f6b7c9a3b678005ddf5fe8922824f83f202 https://deploy-preview-1838--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1838: chore: use data value directly in tests
codecov-commenter edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-833202301 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1838](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (1285028) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/16dfb4d669b4cb6eecc38a3bee92067938dc5ccb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (16dfb4d) will **increase** coverage by `0.09%`. > The diff coverage is `n/a`. > :exclamation: Current head 1285028 differs from pull request most recent head 23750f6. Consider uploading reports for the commit 23750f6 to get more accurate results [](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1838 +/- ## == + Coverage 72.07% 72.17% +0.09% == Files 125 125 Lines2944 2947 +3 Branches 710 711 +1 == + Hits 2122 2127 +5 + Misses822 820 -2 ``` | Flag | Coverage Δ | | |---|---|---| | frontend-e2e-test | `72.17% <ø> (+0.09%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.99% <0.00%> (+0.25%)` | :arrow_up: | | [web/src/helpers.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9oZWxwZXJzLnRzeA==) | `72.13% <0.00%> (+3.27%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [16dfb4d...23750f6](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627079184 ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Lua files +exclude: ^\.github/.*$ +files: \.lua$|\.luacov$ +args: + - --comment-style + - "|--|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Markdown files + # files: \.md$ + # exclude: ^\.github/.*$ + # args: + #- --comment-style + #- "" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Other files Review comment: We are going to group all "Other" file types that are common and have the same type of license. So I just grouped some minor file types to start with. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* processing. Building with commit 7b0b4eefffa9bed7bf420b83760b213b5b546ba4 https://app.netlify.com/sites/apisix-dashboard/deploys/609373c6e081cf0007439cc2 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627071814 ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Lua files +exclude: ^\.github/.*$ +files: \.lua$|\.luacov$ +args: + - --comment-style + - "|--|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Markdown files + # files: \.md$ + # exclude: ^\.github/.*$ + # args: + #- --comment-style + #- "" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Other files +exclude: ^\.github/.*$ +files: > + \.conf$|^Makefile$|\.properties$ +args: + - --comment-style + - "|#|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Perl files +exclude: ^\.github/.*$ +files: \.t$|\.pm$ +args: + - --comment-style + - "|#|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Python files +exclude: ^\.github/.*$ +types: [python] +args: + - --comment-style + - "|#|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Shell files +exclude: ^\.github/.*$ +files: \.sh$ +args: + - --comment-style + - "|#|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all XML files + # exclude: ^\.github/.*$ + # files: \.xml$ + # args: + #- --comment-style + #- "" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all YAML files +exclude: ^\.github/.*$ +types: [yaml] +files: \.(yaml|yml)$ +args: + - --comment-style + - "|#|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + - repo: https://github.com/pre-commit/pre-commit-hooks +rev: v3.4.0 +hooks: + - id: check-case-conflict + - id: check-json + - id: check-merge-conflict + - id: check-xml + - id: check-yaml + - id: end-of-file-fixer +exclude: ^license-templates/LICENSE\.txt$ + - id: fix-byte-order-marker + - id: mixed-line-ending + - id: trailing-whitespace +
[GitHub] [apisix] jbampton commented on pull request #3624: feat: add pre-commit framework
jbampton commented on pull request #3624: URL: https://github.com/apache/apisix/pull/3624#issuecomment-833216705 This is not a license checker. This code automates adding the license on `git commit` if it is missing and therefore the existing license checker on build should never fail. `pre-commit` is all about automation. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on pull request #3624: feat: add pre-commit framework
spacewander commented on pull request #3624: URL: https://github.com/apache/apisix/pull/3624#issuecomment-833214517 @jbampton If you want your PR to be accepted, please limit its scope. If you keep adding new things with `force push` which destroys the history, I can't trust you and leave approval (as you may add new things just after I have reviewed 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-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* ready! Built with commit d33f80b0b3dc760cea63decbce87172c8e34b138 https://deploy-preview-1838--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] iamayushdas commented on issue #1774: improve Testcases
iamayushdas commented on issue #1774: URL: https://github.com/apache/apisix-dashboard/issues/1774#issuecomment-833214001 > We could list all files here that need to get updated, and then connect PRs with this issue. oh, i didn't watch this comment, but i have added committed reconfigured tests one by one with suitable commit message, hope its 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] spacewander commented on a change in pull request #3624: feat: add pre-commit framework
spacewander commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627067086 ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license Review comment: @jbampton Please remove the license checker. We already have one. There is no need to add an extra template file. And your PR is incorrect. Please keep a **fixed and limit** scope to your PR. **I can't review a PR that does not have a fixed goal and change rapidly.** ## File path: apisix/balancer/ewma.lua ## @@ -1,3 +1,20 @@ +-- Review comment: This is wrong. This file's LICENSE has been specified in the LICENSE separately. ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license +name: Add license for all Lua files +exclude: ^\.github/.*$ +files: \.lua$|\.luacov$ +args: + - --comment-style + - "|--|" + - --license-filepath + - license-templates/LICENSE.txt + - --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Markdown files + # files: \.md$ + # exclude: ^\.github/.*$ + # args: + #- --comment-style + #- "" + #- --license-filepath + #- license-templates/LICENSE.txt +
[GitHub] [apisix-dashboard] iamayushdas commented on issue #1774: improve Testcases
iamayushdas commented on issue #1774: URL: https://github.com/apache/apisix-dashboard/issues/1774#issuecomment-833213404 > # Feature request > ## Please describe your feature > Hi, this issue aims to improve Frontend's Testcases (Cypress.io). > > ## Describe the solution you'd like > * [ ] use `data value` directly instead of referring > * [ ] do we need to take some codes as repeated codes? > * [ ] check if testcases are standard according to Cypress docs. also add task for adding test statement for closing notification where missing -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] fregie commented on a change in pull request #419: ci: add golangci-lint
fregie commented on a change in pull request #419: URL: https://github.com/apache/apisix-ingress-controller/pull/419#discussion_r627065245 ## File path: .github/workflows/golangci-lint.yml ## @@ -0,0 +1,21 @@ +name: golangci-lint + +on: + push: +branches: + - master + pull_request: +branches: + - master + +jobs: + golangci: +name: lint +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: golangci-lint +uses: golangci/golangci-lint-action@v2 +with: + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: latest Review comment: OK. It seemed that `golangci/golangci-lint-action@v2` is not allowed to run in this repository,any suggestion? Error info: ``` golangci/golangci-lint-action@v2 is not allowed to be used in apache/apisix-ingress-controller. Actions in this workflow must be: within a repository owned by apache, created by GitHub, verified in the GitHub Marketplace or match the following: */*@[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]+, AdoptOpenJDK/install-jdk@*, al-cheb/configure-pagefile-action@*, apache/*, burrunan/gradle-cache-action@*, bytedeco/javacpp-presets/.github/actions/*, chromaui/action@*, codecov/codecov-action@*, conda-incubator/setup-miniconda@*, container-tools/kind-action@*, dawidd6/action-download-artifact@*, gr2m/twitter-together@*, gradle/wrapper-validation-action@*, julia-actions/julia-runtest@*, julia-actions/setup-julia@*, msys2/setup-msys2@*, peaceiris/actions-gh-pages@*, peaceiris/actions-hugo@*, peter-evans/create-pull-request@*, potiuk/cancel-workflow-runs@*, r-lib/actions/*, ruby/setup-ruby@*, scacap/action-surefire-report@*, shivammathur/setup-php@*, shogo82148/actions-setup-perl@ *,... ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] imjoey commented on issue #167: How to migrate data？
imjoey commented on issue #167:
URL: https://github.com/apache/apisix-docker/issues/167#issuecomment-833210209
> > > > > @izayoi-akira please add some details about your snapshot
operations. Indeed this is a right way
> > > >
> > > >
> > > > @tokers how about we introduce the `Terraform` which is for
declarative configurations management. Thus we can export all the existing
resources into several `.tf` files that represent the declarative resources.
Also, we can import it via uploading files onto Dashboard or just run
`terraform apply`. This will give us full-fledged functionality for user data
import/export.
> > > > Looking forward to your feedback.
> > >
> > >
> > > Frankly, I'm not sure, as Terraform just likes a tool used on Cloud.
Is it also can be used in bare-metal or containers deployed on-premise?
> >
> >
> > @tokers
> > yep, the most commonly used scenarios of Terraform are for cloud
provisioning. While as a matter of fact, Terraform is a great tool that can
handle all the cases as long as Declarative Configuration is needed. For
example, we can also find the Github/Gitlab providers for the
repository/branch/privilege/user management here
[[1](https://registry.terraform.io/browse/providers)].
> > With regards to APISIX, a minimum feasible Terraform `.tf`
configurations may seems like this:
> > ```terraform
> > provider "apisix" {
> > # Assume we use Admin API here
> > url = "https://your-apisix-server-addr:9080/;
> > access_user = "admin"
> > access_key = "the-access-key-for-admin-api"
> > }
> >
> > resource "apisix_route" "route_1" {
> > name = "r1"
> > desc = "for buzi1"
> > uri = "/foo/bar"
> > host = "foo.com"
> > methods = ["GET", "HOST"]
> > status = 1
> > labels = {
> > "k1": "v1",
> > "k2": "v2"
> > }
> > upstream_id = ${apisix_upstream.upstream_1.id}
> > }
> >
> > resource "apisix_upstream" "upstream_1" {
> > name = "u1"
> > type = "chash"
> > key = "remote_addr"
> > nodes = {
> > "127.0.0.1:80": 1,
> > "foo.com:80": 2
> > }
> > }
> > ```
> >
> >
> > This would bring us the reproducible APISIX resource definitions. For
backup/restore, we need to support export these definitions as the format of
Terraform templates stored in `.tf` files.
> > Please let me know what do you think. Maybe we all need much more
discussion. Thanks.
>
> Sounds cool, would you like to send a proposal to the mailing list, and
let's talk with more and more friends in community.
@tokers Really sorry for my late reply. I will send the proposal to mailing
list for further disuccsions. Thanks for the guidance.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* processing. Building with commit e700e4eeacb60155c99bfd1fa39142d7dc28e6e7 https://app.netlify.com/sites/apisix-dashboard/deploys/60936bbea3880f0007935dc8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1838: chore: use data value directly in tests
codecov-commenter edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-833202301 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1838](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (dc2146e) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/16dfb4d669b4cb6eecc38a3bee92067938dc5ccb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (16dfb4d) will **increase** coverage by `0.09%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1838 +/- ## == + Coverage 72.07% 72.17% +0.09% == Files 125 125 Lines2944 2947 +3 Branches 710 711 +1 == + Hits 2122 2127 +5 + Misses822 820 -2 ``` | Flag | Coverage Δ | | |---|---|---| | frontend-e2e-test | `72.17% <ø> (+0.09%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.99% <0.00%> (+0.25%)` | :arrow_up: | | [web/src/helpers.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9oZWxwZXJzLnRzeA==) | `72.13% <0.00%> (+3.27%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [16dfb4d...dc2146e](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1813: feat: refactor Plugin Orchestration
codecov-commenter edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823973919 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1813](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f2f885d) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/d7e08cb1637e312ce11c9ce49fd3a42ed3cf8571?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (d7e08cb) will **decrease** coverage by `1.67%`. > The diff coverage is `20.38%`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1813 +/- ## == - Coverage 71.05% 69.38% -1.68% == Files 173 170 -3 Lines6202 6366 +164 Branches 710 744 +34 == + Hits 4407 4417 +10 - Misses 1538 1692 +154 Partials 257 257 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `45.73% <ø> (+0.03%)` | :arrow_up: | | backend-e2e-test-ginkgo | `48.58% <ø> (-0.04%)` | :arrow_down: | | backend-unit-test | `52.47% <ø> (+0.03%)` | :arrow_up: | | frontend-e2e-test | `68.62% <20.38%> (-3.52%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/constants.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb25zdGFudHMudHM=) | `100.00% <ø> (ø)` | | | [...nents/PluginFlow/components/FlowGraph/FlowGraph.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbkZsb3cvY29tcG9uZW50cy9GbG93R3JhcGgvRmxvd0dyYXBoLnRz) | `1.45% <1.45%> (ø)` | | | [web/src/components/PluginFlow/PluginFlow.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbkZsb3cvUGx1Z2luRmxvdy50c3g=) | `1.47% <1.47%> (ø)` | | | [...components/PluginFlow/components/Toolbar/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbkZsb3cvY29tcG9uZW50cy9Ub29sYmFyL2luZGV4LnRzeA==) | `2.40% <2.40%> (ø)` | | | [web/src/components/PluginFlow/constants.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1BsdWdpbkZsb3cvY29uc3RhbnRzLnRz) | `29.03% <29.03%> (ø)` | | | [web/src/pages/Route/components/Step3/index.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9jb21wb25lbnRzL1N0ZXAzL2luZGV4LnRzeA==) | `51.85% <44.44%> (-1.72%)` | :arrow_down: | | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `84.55% <56.66%> (-6.19%)` | :arrow_down: | |
[GitHub] [apisix-dashboard] codecov-commenter commented on pull request #1838: chore: use data value directly in tests
codecov-commenter commented on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-833202301 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1838](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (7674b38) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/16dfb4d669b4cb6eecc38a3bee92067938dc5ccb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (16dfb4d) will **increase** coverage by `0.02%`. > The diff coverage is `n/a`. > :exclamation: Current head 7674b38 differs from pull request most recent head dc2146e. Consider uploading reports for the commit dc2146e to get more accurate results [](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1838 +/- ## == + Coverage 72.07% 72.10% +0.02% == Files 125 125 Lines2944 2947 +3 Branches 710 711 +1 == + Hits 2122 2125 +3 Misses822 822 ``` | Flag | Coverage Δ | | |---|---|---| | frontend-e2e-test | `72.10% <ø> (+0.02%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1838/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.99% <0.00%> (+0.25%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [16dfb4d...dc2146e](https://codecov.io/gh/apache/apisix-dashboard/pull/1838?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* ready! Built with commit dc2146eb72bf08f5f0bfcf9d1f3fc1fd3a42af1e https://deploy-preview-1838--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1813: feat: refactor Plugin Orchestration
netlify[bot] edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823954424 Deploy preview for *apisix-dashboard* ready! Built with commit f2f885d25b7a09b498b72366c35831669f4f1a98 https://deploy-preview-1813--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] iamayushdas commented on a change in pull request #1839: chore: update plugin catagory display name.
iamayushdas commented on a change in pull request #1839:
URL: https://github.com/apache/apisix-dashboard/pull/1839#discussion_r627054451
##
File path: web/src/components/Plugin/locales/en-US.ts
##
@@ -27,7 +27,7 @@ export default {
'component.plugin.security': 'Security',
'component.plugin.traffic': 'Traffic Control',
'component.plugin.serverless': 'Serverless',
- 'component.plugin.observability': 'Tracing & Metrics & Logging',
+ 'component.plugin.observability': 'Observability',
Review comment:
Don't you think,
'Tracing & Metrics & Logging' - gives a more clear idea
Just asking
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] iamayushdas commented on a change in pull request #1839: chore: update plugin catagory display name.
iamayushdas commented on a change in pull request #1839:
URL: https://github.com/apache/apisix-dashboard/pull/1839#discussion_r627054451
##
File path: web/src/components/Plugin/locales/en-US.ts
##
@@ -27,7 +27,7 @@ export default {
'component.plugin.security': 'Security',
'component.plugin.traffic': 'Traffic Control',
'component.plugin.serverless': 'Serverless',
- 'component.plugin.observability': 'Tracing & Metrics & Logging',
+ 'component.plugin.observability': 'Observability',
Review comment:
Don't you think,
'Tracing & Metrics & Logging' - gives a more clear idea
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1813: feat: refactor Plugin Orchestration
codecov-commenter edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823973919 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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-commenter edited a comment on pull request #412: feat: apisixcluster translation
codecov-commenter edited a comment on pull request #412: URL: https://github.com/apache/apisix-ingress-controller/pull/412#issuecomment-828347819 # [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#412](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f803d51) into [master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/0460a092004d5029c3936be91fbfe667291f73ed?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (0460a09) will **increase** coverage by `0.17%`. > The diff coverage is `100.00%`. [](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master #412 +/- ## == + Coverage 38.33% 38.51% +0.17% == Files 42 43 +1 Lines3529 3539 +10 == + Hits 1353 1363 +10 Misses 1997 1997 Partials 179 179 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [pkg/apisix/global\_rule.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2FwaXNpeC9nbG9iYWxfcnVsZS5nbw==) | `32.83% <ø> (ø)` | | | [pkg/kube/translation/translator.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vdHJhbnNsYXRvci5nbw==) | `51.38% <ø> (ø)` | | | [pkg/kube/translation/global\_rule.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vZ2xvYmFsX3J1bGUuZ28=) | `100.00% <100.00%> (ø)` | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [0460a09...f803d51](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1813: feat: refactor Plugin Orchestration
netlify[bot] edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823954424 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1813: feat: refactor Plugin Orchestration
codecov-commenter edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823973919 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1813](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f2f885d) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/d7e08cb1637e312ce11c9ce49fd3a42ed3cf8571?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (d7e08cb) will **decrease** coverage by `18.57%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@ Coverage Diff @@ ## master#1813 +/- ## === - Coverage 71.05% 52.47% -18.58% === Files 173 39 -134 Lines6202 2742 -3460 Branches 7100 -710 === - Hits 4407 1439 -2968 + Misses 1538 1109 -429 + Partials 257 194 -63 ``` | Flag | Coverage Δ | | |---|---|---| | backend-e2e-test | `?` | | | backend-e2e-test-ginkgo | `?` | | | backend-unit-test | `52.47% <ø> (+0.03%)` | :arrow_up: | | frontend-e2e-test | `?` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1813?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [api/internal/utils/version.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL3V0aWxzL3ZlcnNpb24uZ28=) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/filter/request\_id.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9yZXF1ZXN0X2lkLmdv) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/entity/entity.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvZW50aXR5L2VudGl0eS5nbw==) | `0.00% <0.00%> (-100.00%)` | :arrow_down: | | [api/internal/core/store/storehub.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2NvcmUvc3RvcmUvc3RvcmVodWIuZ28=) | `0.00% <0.00%> (-71.03%)` | :arrow_down: | | [api/internal/filter/cors.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9jb3JzLmdv) | `0.00% <0.00%> (-66.67%)` | :arrow_down: | | [api/internal/filter/schema.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL2ZpbHRlci9zY2hlbWEuZ28=) | `0.00% <0.00%> (-55.47%)` | :arrow_down: | | [api/internal/utils/consts/api\_error.go](https://codecov.io/gh/apache/apisix-dashboard/pull/1813/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-YXBpL2ludGVybmFsL3V0aWxzL2NvbnN0cy9hcGlfZXJyb3IuZ28=) | `0.00% <0.00%> (-50.00%)` | :arrow_down: | |
[GitHub] [apisix-dashboard] codecov-commenter commented on pull request #1839: chore: update plugin catagory display name.
codecov-commenter commented on pull request #1839: URL: https://github.com/apache/apisix-dashboard/pull/1839#issuecomment-833197021 # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#1839](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (d2a2fa8) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/16dfb4d669b4cb6eecc38a3bee92067938dc5ccb?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (16dfb4d) will **increase** coverage by `0.02%`. > The diff coverage is `n/a`. [](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master#1839 +/- ## == + Coverage 72.07% 72.10% +0.02% == Files 125 125 Lines2944 2947 +3 Branches 710 711 +1 == + Hits 2122 2125 +3 Misses822 822 ``` | Flag | Coverage Δ | | |---|---|---| | frontend-e2e-test | `72.10% <ø> (+0.02%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1839/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.99% <0.00%> (+0.25%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [16dfb4d...d2a2fa8](https://codecov.io/gh/apache/apisix-dashboard/pull/1839?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] juzhiyuan commented on pull request #1813: feat: refactor Plugin Orchestration
juzhiyuan commented on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-833196698 https://github.com/apache/apisix-dashboard/pull/1813/checks?check_run_id=2514882778 @nic-chen @starsz Please check 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-website] iamayushdas commented on pull request #328: docs: fixed kubernetes service api broken link
iamayushdas commented on pull request #328: URL: https://github.com/apache/apisix-website/pull/328#issuecomment-833195913 @xdshivani kindly have a look on other broken links residing there too like etcd/travelsky/aliyun -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1838: chore: use data value directly in tests
netlify[bot] edited a comment on pull request #1838: URL: https://github.com/apache/apisix-dashboard/pull/1838#issuecomment-832886508 Deploy preview for *apisix-dashboard* processing. Building with commit 7674b38516bd3f68787108f7a1344bd8c4e563e6 https://app.netlify.com/sites/apisix-dashboard/deploys/609360b67ccffb00078da904 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] imjoey closed issue #4150: bug: Inconsistent behavior of schema check for response-rewrite plugin between AdminAPI and ManagerAPI
imjoey closed issue #4150: URL: https://github.com/apache/apisix/issues/4150 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] imjoey commented on issue #4150: bug: Inconsistent behavior of schema check for response-rewrite plugin between AdminAPI and ManagerAPI
imjoey commented on issue #4150: URL: https://github.com/apache/apisix/issues/4150#issuecomment-833194439 > @imjoey The second way is a long-term job, what about just fixing these problems one-by-one now? @tokers OK, got this. I will close this issue for now and open other PRs if needed. Thanks for the guidance. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1813: feat: refactor Plugin Orchestration
netlify[bot] edited a comment on pull request #1813: URL: https://github.com/apache/apisix-dashboard/pull/1813#issuecomment-823954424 Deploy preview for *apisix-dashboard* processing. Building with commit b514ae3bc2e548b185dd9601ebb04826b549db59 https://app.netlify.com/sites/apisix-dashboard/deploys/60935fd0682839000852faf8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1839: chore: update plugin catagory display name.
netlify[bot] edited a comment on pull request #1839: URL: https://github.com/apache/apisix-dashboard/pull/1839#issuecomment-833191512 Deploy preview for *apisix-dashboard* ready! Built with commit d2a2fa8ceab93a3949245153a50b926f4b75a839 https://deploy-preview-1839--apisix-dashboard.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] imjoey commented on issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
imjoey commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-833193789 > > @Molio-tan the logs seem not very helpful. So could you please show us more information from the `/var/log/message` and `dmesg` command during the installation? I believe that they could give us some clues. Thanks. > > Ok, but I don't know exactly about how many lines or messages created during the installation.Forgive me to giving the whole file as follows. > > [messages.log](https://github.com/apache/apisix-dashboard/files/6431355/messages.log) > [dmesg.log](https://github.com/apache/apisix-dashboard/files/6431357/dmesg.log) @Molio-tan thanks for providing the logs, while I'm so sorry that I've to say I can find nothing useful to help us get through with this issue. Do you mind adding my WeChat `majunjiev` that I'm able to debug your environment? Thanks. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] netlify[bot] commented on pull request #1839: chore: update plugin catagory display name.
netlify[bot] commented on pull request #1839: URL: https://github.com/apache/apisix-dashboard/pull/1839#issuecomment-833191512 Deploy preview for *apisix-dashboard* processing. Building with commit d2a2fa8ceab93a3949245153a50b926f4b75a839 https://app.netlify.com/sites/apisix-dashboard/deploys/60935de76bb80a00074d7cf0 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-dashboard] dmsolr opened a new pull request #1839: chore: update plugin catagory display name.
dmsolr opened a new pull request #1839: URL: https://github.com/apache/apisix-dashboard/pull/1839 Please answer these questions before submitting a pull request, **or your PR will get closed**. I found this name is "可观测" in chinese. So I think `Observability` is better than "Tracing & Metrics & Logging". **Why submit this pull request?** - [ ] Bugfix - [ ] New feature provided - [ ] Improve performance - [ ] Backport patches **What changes will this PR take into?** Please update this section with detailed description. **Related issues** fix/resolve #0001 **Checklist:** - [ ] Did you explain what problem does this PR solve? Or what new features have been added? - [ ] Have you added corresponding test cases? - [ ] Have you modified the corresponding document? - [ ] Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list 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-website] iamayushdas commented on issue #182: refactor: fix Google Lighthouse errors and warnings
iamayushdas commented on issue #182: URL: https://github.com/apache/apisix-website/issues/182#issuecomment-833189484 > Hi @iamayushdas, could you take this or guide other contributors? yes, i will definitely look in to this, after i will be done by those test refactoring, and if i found this easy i will guide other contributors too Thank you -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #406: test: add e2e test cases for server-info plugin
tokers commented on a change in pull request #406:
URL:
https://github.com/apache/apisix-ingress-controller/pull/406#discussion_r627044476
##
File path: test/e2e/plugins/server-info.go
##
@@ -0,0 +1,109 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package plugins
+
+import (
+ "io/ioutil"
+ "strings"
+ "errors"
+
+ "github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
+ "github.com/onsi/ginkgo"
+ "github.com/stretchr/testify/assert"
+)
+
+var serverInfoKey = [...]string{"etcd_version", "up_time", "last_report_time",
"id", "hostname", "version", "boot_time"}
+
+var _ = ginkgo.FDescribe("server-info plugin", func() {
+ opts := {
+ Name:"default",
+ Kubeconfig: scaffold.GetKubeconfig(),
+ APISIXConfigPath:"testdata/apisix-gw-config.yaml",
+ APISIXDefaultConfigPath:
"testdata/apisix-gw-config-default.yaml",
+ IngressAPISIXReplicas: 1,
+ HTTPBinServicePort: 80,
+ APISIXRouteVersion: "apisix.apache.org/v2alpha1",
+ }
+ s := scaffold.NewScaffold(opts)
+ ginkgo.It("check server info", func() {
+ err := setServerInfoPluginStatus(opts.APISIXConfigPath, true)
Review comment:
Timing is too late, apisix deployment was created already before the
`It` block running.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and 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 commented on issue #182: refactor: fix Google Lighthouse errors and warnings
juzhiyuan commented on issue #182: URL: https://github.com/apache/apisix-website/issues/182#issuecomment-833188574 Hi @iamayushdas, could you take this or guide other contributors? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 edited a comment on pull request #1814: fix: efficient error handling in manager-api including graceful shutdown, self contained methods.
juzhiyuan edited a comment on pull request #1814: URL: https://github.com/apache/apisix-dashboard/pull/1814#issuecomment-833187903 Hi @bisakhmondal, there have some errors in Backend 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] juzhiyuan commented on pull request #1814: fix: efficient error handling in manager-api including graceful shutdown, self contained methods.
juzhiyuan commented on pull request #1814: URL: https://github.com/apache/apisix-dashboard/pull/1814#issuecomment-833187903 Hi @bisakhmondal, it seems that there have some errors in Backend 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] tzssangglass commented on issue #4157: bug: After installing the Apisix on ARM-based System,but it can't works properly.
tzssangglass commented on issue #4157: URL: https://github.com/apache/apisix/issues/4157#issuecomment-833184095 1. check that `events.lua` does not appear in the search path of the error log 2. check the `events.lua` file permissions -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander opened a new pull request #4185: feat: upgrade lua-resty-radixtree & retire patch
spacewander opened a new pull request #4185: URL: https://github.com/apache/apisix/pull/4185 Signed-off-by: spacewander ### What this PR does / why we need it: ### Pre-submission checklist: * [x] Did you explain what problem does this PR solve? Or what new features have been added? * [ ] Have you added corresponding test cases? * [ ] Have you modified the corresponding document? * [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] codecov-commenter edited a comment on pull request #412: feat: apisixcluster translation
codecov-commenter edited a comment on pull request #412: URL: https://github.com/apache/apisix-ingress-controller/pull/412#issuecomment-828347819 # [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#412](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f803d51) into [master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/0460a092004d5029c3936be91fbfe667291f73ed?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (0460a09) will **increase** coverage by `0.17%`. > The diff coverage is `100.00%`. [](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master #412 +/- ## == + Coverage 38.32% 38.49% +0.17% == Files 41 42 +1 Lines3528 3538 +10 == + Hits 1352 1362 +10 Misses 1997 1997 Partials 179 179 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [pkg/apisix/global\_rule.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2FwaXNpeC9nbG9iYWxfcnVsZS5nbw==) | `32.83% <ø> (ø)` | | | [pkg/kube/translation/translator.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vdHJhbnNsYXRvci5nbw==) | `51.38% <ø> (ø)` | | | [pkg/kube/translation/global\_rule.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cGtnL2t1YmUvdHJhbnNsYXRpb24vZ2xvYmFsX3J1bGUuZ28=) | `100.00% <100.00%> (ø)` | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [0460a09...f803d51](https://codecov.io/gh/apache/apisix-ingress-controller/pull/412?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] Molio-tan commented on issue #4157: bug: After installing the Apisix on ARM-based System,but it can't works properly.
Molio-tan commented on issue #4157: URL: https://github.com/apache/apisix/issues/4157#issuecomment-833181457 > @Molio-tan, hi, from the error logs, it seems that some dependent lua packages were missing during the installation of apisix. Have you solved this problem? Yes, I do. I am sure it 's successful during the command execution of `make deps`, and I could find the file `events.lua` was in the path `/usr/local/share/lua/5.1/resty/worker/`.So I think the module 'resty.worker.events' was already installed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] tokers merged pull request #4121: feat: support to use upstream_id in stream_route
tokers merged pull request #4121: URL: https://github.com/apache/apisix/pull/4121 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat: support to use upstream_id in stream_route (#4121)
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.git
The following commit(s) were added to refs/heads/master by this push:
new 3a3874a feat: support to use upstream_id in stream_route (#4121)
3a3874a is described below
commit 3a3874a2cb438854af0c6612f7e4b477a5933f98
Author: Alex Zhang
AuthorDate: Thu May 6 10:30:46 2021 +0800
feat: support to use upstream_id in stream_route (#4121)
---
apisix/init.lua| 78 +-
t/stream-node/sanity.t | 67 +++
2 files changed, 119 insertions(+), 26 deletions(-)
diff --git a/apisix/init.lua b/apisix/init.lua
index e090377..6225fcc 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -42,12 +42,16 @@ local str_byte= string.byte
local str_sub = string.sub
local tonumber= tonumber
local control_api_router
+
+local is_http = false
if ngx.config.subsystem == "http" then
+is_http = true
control_api_router = require("apisix.control.router")
end
+
local load_balancer
local local_conf
-local ver_header= "APISIX/" .. core.version.VERSION
+local ver_header = "APISIX/" .. core.version.VERSION
local _M = {version = 0.4}
@@ -118,7 +122,7 @@ function _M.http_init_worker()
end
require("apisix.debug").init_worker()
-require("apisix.upstream").init_worker()
+apisix_upstream.init_worker()
require("apisix.plugins.ext-plugin.init").init_worker()
local_conf = core.config.local_conf()
@@ -254,6 +258,38 @@ local function set_upstream_host(api_ctx)
end
+local function get_upstream_by_id(up_id)
+local upstreams = core.config.fetch_created_obj("/upstreams")
+if upstreams then
+local upstream = upstreams:get(tostring(up_id))
+if not upstream then
+core.log.error("failed to find upstream by id: " .. up_id)
+if is_http then
+return core.response.exit(502)
+end
+
+return ngx_exit(1)
+end
+
+if upstream.has_domain then
+local err
+upstream, err = parse_domain_in_up(upstream)
+if err then
+core.log.error("failed to get resolved upstream: ", err)
+if is_http then
+return core.response.exit(500)
+end
+
+return ngx_exit(1)
+end
+end
+
+core.log.info("parsed upstream: ", core.json.delay_encode(upstream))
+return upstream.dns_value or upstream.value
+end
+end
+
+
function _M.http_access_phase()
local ngx_ctx = ngx.ctx
@@ -385,30 +421,12 @@ function _M.http_access_phase()
end
if up_id then
-local upstreams = core.config.fetch_created_obj("/upstreams")
-if upstreams then
-local upstream = upstreams:get(tostring(up_id))
-if not upstream then
-core.log.error("failed to find upstream by id: " .. up_id)
-return core.response.exit(502)
-end
-
-if upstream.has_domain then
-local err
-upstream, err = parse_domain_in_up(upstream)
-if err then
-core.log.error("failed to get resolved upstream: ", err)
-return core.response.exit(500)
-end
-end
-
-if upstream.value.pass_host then
-api_ctx.pass_host = upstream.value.pass_host
-api_ctx.upstream_host = upstream.value.upstream_host
-end
+local upstream = get_upstream_by_id(up_id)
+api_ctx.matched_upstream = upstream
-core.log.info("parsed upstream: ",
core.json.delay_encode(upstream))
-api_ctx.matched_upstream = upstream.dns_value or upstream.value
+if upstream and upstream.pass_host then
+api_ctx.pass_host = upstream.pass_host
+api_ctx.upstream_host = upstream.upstream_host
end
else
@@ -722,6 +740,7 @@ function _M.stream_init_worker()
plugin.init_worker()
router.stream_init_worker()
+apisix_upstream.init_worker()
if core.config == require("apisix.core.config_yaml") then
core.config.init_worker()
@@ -756,11 +775,18 @@ function _M.stream_preread_phase()
return ngx_exit(1)
end
+
+local up_id = matched_route.value.upstream_id
+if up_id then
+api_ctx.matched_upstream = get_upstream_by_id(up_id)
+else
+api_ctx.matched_upstream = matched_route.value.upstream
+end
+
local plugins = core.tablepool.fetch("plugins", 32, 0)
api_ctx.plugins = plugin.stream_filter(matched_route, plugins)
-- core.log.info("valid plugins: ", core.json.delay_encode(plugins, true))
-api_ctx.matched_upstream = matched_route.value.upstream
api_ctx.conf_type =
[GitHub] [apisix] tokers closed issue #4111: bug: upstream_id in stream_route is ineffective.
tokers closed issue #4111: URL: https://github.com/apache/apisix/issues/4111 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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-commenter commented on pull request #419: ci: add golangci-lint
codecov-commenter commented on pull request #419: URL: https://github.com/apache/apisix-ingress-controller/pull/419#issuecomment-833179392 # [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#419](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (4c8e4c0) into [master](https://codecov.io/gh/apache/apisix-ingress-controller/commit/d8a40b7dfa49b844fd0159a4e0450c3066f24cfd?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (d8a40b7) will **decrease** coverage by `0.01%`. > The diff coverage is `n/a`. > :exclamation: Current head 4c8e4c0 differs from pull request most recent head ce0d6f7. Consider uploading reports for the commit ce0d6f7 to get more accurate results [](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) ```diff @@Coverage Diff @@ ## master #419 +/- ## == - Coverage 38.68% 38.66% -0.02% == Files 41 40 -1 Lines3345 3344 -1 == - Hits 1294 1293 -1 Misses 1890 1890 Partials 161 161 ``` | [Impacted Files](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [test/e2e/e2e.go](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-dGVzdC9lMmUvZTJlLmdv) | | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=continue_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=footer_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Last update [d8a40b7...ce0d6f7](https://codecov.io/gh/apache/apisix-ingress-controller/pull/419?src=pr=lastupdated_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #411: feat: add ApisixClusterConfig CRD and global_rule type, client
tokers merged pull request #411: URL: https://github.com/apache/apisix-ingress-controller/pull/411 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub 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: feat: add ApisixClusterConfig CRD and global_rule type, client (#411)
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 0460a09 feat: add ApisixClusterConfig CRD and global_rule type,
client (#411)
0460a09 is described below
commit 0460a092004d5029c3936be91fbfe667291f73ed
Author: Alex Zhang
AuthorDate: Thu May 6 10:29:04 2021 +0800
feat: add ApisixClusterConfig CRD and global_rule type, client (#411)
---
pkg/apisix/apisix.go | 10 +
pkg/apisix/cache/cache.go | 8 +
pkg/apisix/cache/memdb.go | 28 +++
pkg/apisix/cache/memdb_test.go | 43
pkg/apisix/cache/schema.go | 10 +
pkg/apisix/cluster.go | 32 +++
pkg/apisix/global_rule.go | 223 +
pkg/apisix/global_rule_test.go | 199 ++
pkg/apisix/nonexistentclient.go| 28 +++
pkg/apisix/resource.go | 10 +
pkg/kube/apisix/apis/config/v2alpha1/types.go | 72 +++
.../apis/config/v2alpha1/zz_generated.deepcopy.go | 152 ++
.../typed/config/v2alpha1/apisixclusterconfig.go | 168
.../typed/config/v2alpha1/config_client.go | 5 +
.../v2alpha1/fake/fake_apisixclusterconfig.go | 122 +++
.../config/v2alpha1/fake/fake_config_client.go | 4 +
.../typed/config/v2alpha1/generated_expansion.go | 2 +
.../config/v2alpha1/apisixclusterconfig.go | 89
.../externalversions/config/v2alpha1/interface.go | 7 +
.../client/informers/externalversions/generic.go | 2 +
.../listers/config/v2alpha1/apisixclusterconfig.go | 68 +++
.../listers/config/v2alpha1/expansion_generated.go | 4 +
pkg/types/apisix/v1/types.go | 9 +-
pkg/types/apisix/v1/zz_generated.deepcopy.go | 17 ++
.../deploy/crd/v1beta1/ApisixClusterConfig.yaml| 71 +++
samples/deploy/crd/v1beta1/kustomization.yaml | 1 +
26 files changed, 1383 insertions(+), 1 deletion(-)
diff --git a/pkg/apisix/apisix.go b/pkg/apisix/apisix.go
index 0e88f43..e407b7e 100644
--- a/pkg/apisix/apisix.go
+++ b/pkg/apisix/apisix.go
@@ -87,6 +87,16 @@ type StreamRoute interface {
Update(context.Context, *v1.StreamRoute) (*v1.StreamRoute, error)
}
+// GlobalRule is the specific client interface to take over the create, update,
+// list and delete for APISIX's Global Rule resource.
+type GlobalRule interface {
+ Get(context.Context, string) (*v1.GlobalRule, error)
+ List(context.Context) ([]*v1.GlobalRule, error)
+ Create(context.Context, *v1.GlobalRule) (*v1.GlobalRule, error)
+ Delete(context.Context, *v1.GlobalRule) error
+ Update(context.Context, *v1.GlobalRule) (*v1.GlobalRule, error)
+}
+
type apisix struct {
nonExistentCluster Cluster
clusters map[string]Cluster
diff --git a/pkg/apisix/cache/cache.go b/pkg/apisix/cache/cache.go
index c527157..c213f3e 100644
--- a/pkg/apisix/cache/cache.go
+++ b/pkg/apisix/cache/cache.go
@@ -31,6 +31,8 @@ type Cache interface {
InsertUpstream(*v1.Upstream) error
// InsertStreamRoute adds or updates stream_route to cache.
InsertStreamRoute(*v1.StreamRoute) error
+ // InsertGlobalRule adds or updates global_rule to cache.
+ InsertGlobalRule(*v1.GlobalRule) error
// GetRoute finds the route from cache according to the primary index
(id).
GetRoute(string) (*v1.Route, error)
@@ -40,6 +42,8 @@ type Cache interface {
GetUpstream(string) (*v1.Upstream, error)
// GetStreamRoute finds the stream_route from cache according to the
primary index (id).
GetStreamRoute(string) (*v1.StreamRoute, error)
+ // GetGlobalRule finds the global_rule from cache according to the
primary index (id).
+ GetGlobalRule(string) (*v1.GlobalRule, error)
// ListRoutes lists all routes in cache.
ListRoutes() ([]*v1.Route, error)
@@ -49,6 +53,8 @@ type Cache interface {
ListUpstreams() ([]*v1.Upstream, error)
// ListStreamRoutes lists all stream_route in cache.
ListStreamRoutes() ([]*v1.StreamRoute, error)
+ // ListGlobalRules lists all global_rule objects in cache.
+ ListGlobalRules() ([]*v1.GlobalRule, error)
// DeleteRoute deletes the specified route in cache.
DeleteRoute(*v1.Route) error
@@ -58,4 +64,6 @@ type Cache interface {
DeleteUpstream(*v1.Upstream) error
// DeleteStreamRoute deletes the specified stream_route in cache.
DeleteStreamRoute(*v1.StreamRoute) error
+ // DeleteGlobalRule deletes the specified stream_route in cache.
+ DeleteGlobalRule(*v1.GlobalRule) error
}
[GitHub] [apisix-ingress-controller] tokers commented on a change in pull request #411: feat: add ApisixClusterConfig CRD and global_rule type, client
tokers commented on a change in pull request #411:
URL:
https://github.com/apache/apisix-ingress-controller/pull/411#discussion_r627035348
##
File path: pkg/apisix/cluster.go
##
@@ -167,6 +169,16 @@ func (c *cluster) syncCacheOnce() (bool, error) {
log.Errorf("failed to list ssl in APISIX: %s", err)
return false, err
}
+ streamRoutes, err := c.streamRoute.List(context.TODO())
Review comment:
Yes, it was missing but it's OK since stream route is not in use 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-dashboard] Molio-tan commented on issue #1832: bug: apisix-dashboard v2.5 make build failed on Huawei Kunpeng system
Molio-tan commented on issue #1832: URL: https://github.com/apache/apisix-dashboard/issues/1832#issuecomment-833178570 > @Molio-tan the logs seem not very helpful. So could you please show us more information from the `/var/log/message` and `dmesg` command during the installation? I believe that they could give us some clues. Thanks. Ok, but I don't know exactly about how many lines or messages created during the installation.Forgive me to giving the whole file as follows. [messages.log](https://github.com/apache/apisix-dashboard/files/6431355/messages.log) [dmesg.log](https://github.com/apache/apisix-dashboard/files/6431357/dmesg.log) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #419: ci: add golangci-lint
tokers commented on a change in pull request #419: URL: https://github.com/apache/apisix-ingress-controller/pull/419#discussion_r627034770 ## File path: .github/workflows/golangci-lint.yml ## @@ -0,0 +1,21 @@ +name: golangci-lint + +on: + push: +branches: + - master + pull_request: +branches: + - master + +jobs: + golangci: +name: lint +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: golangci-lint +uses: golangci/golangci-lint-action@v2 +with: + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: latest Review comment: Please check your editor, EOL symbol is required. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] iamayushdas commented on issue #182: refactor: fix Google Lighthouse errors and warnings
iamayushdas commented on issue #182: URL: https://github.com/apache/apisix-website/issues/182#issuecomment-833175200 > **Actual Behaviour** > > Website is not optimized as much as it could be and there are coding errors and warnings etc. > > **Expected Behaviour** > > Google Lighthouse scores are not always the same on each run and device etc. > > All the `circles` should be as close to `100` as possible. Most modern best practice sites are all in the `green` above 90% range on all 4 stats. > > An additional PR for the 5th circle for PWA would be really nice in future. GatsbyJS is a new modern framework that builds full `green machine` for 5 circles on Google Lighthouse. > > A progressive web application is a type of application software delivered through the web, built using common web technologies including HTML, CSS and JavaScript. It is intended to work on any platform that uses a standards-compliant browser, including both desktop and mobile devices. > > Official -> "Lighthouse is an open-source, automated tool for improving the quality of web pages. You can run it against any web page, public or requiring authentication. It has audits for performance, accessibility, progressive web apps, SEO and more. > > You can run Lighthouse in Chrome DevTools, from the command line, or as a Node module. You give Lighthouse a URL to audit, it runs a series of audits against the page, and then it generates a report on how well the page did. From there, use the failing audits as indicators on how to improve the page. Each audit has a reference doc explaining why the audit is important, as well as how to fix it. > > You can also use Lighthouse CI to prevent regressions on your sites." > > https://developers.google.com/web/tools/chrome-devtools > https://developers.google.com/web/tools/lighthouse > https://web.dev/progressive-web-apps/ > https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps > https://www.gatsbyjs.com/ > > **Steps to reproduce it** > > Use Google Chrome desktop browser and open the menu -> View -> Developer > Use the Chrome devtools to reproduce the Google Lighthouse report. > > **Screenshots of the issue** > > https://user-images.githubusercontent.com/418747/107592176-0878fa00-6c58-11eb-945b-328b64476acd.png;> > > https://user-images.githubusercontent.com/418747/107592187-10d13500-6c58-11eb-8ee0-0bd63dcf2e60.png;> > > https://user-images.githubusercontent.com/418747/107592200-19297000-6c58-11eb-8bcb-cf326396636f.png;> > > https://user-images.githubusercontent.com/418747/107592214-2181ab00-6c58-11eb-8a86-a57d0676b4e6.png;> > > https://user-images.githubusercontent.com/418747/107592230-2ba3a980-6c58-11eb-9fae-5ef02608a369.png;> > > https://user-images.githubusercontent.com/418747/107592249-38c09880-6c58-11eb-8d1b-acaf1c0a5f7f.png;> > > I am happy to work on this issue but don't mind if someone else does. > > I report here first for discussion Thats a nice practice to be done, thank you for this info :smile: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] fregie opened a new pull request #419: ci: add golangci-lint
fregie opened a new pull request #419: URL: https://github.com/apache/apisix-ingress-controller/pull/419 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 #364 ___ ### New feature or improvement - add ci: golangci-lint -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] Yiyiyimu commented on pull request #328: docs: fixed kubernetes service api broken link
Yiyiyimu commented on pull request #328: URL: https://github.com/apache/apisix-website/pull/328#issuecomment-833173442 What about other links, like etcd/travelsky/aliyun -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] jbampton commented on a change in pull request #3624: feat: add pre-commit framework
jbampton commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627030926 ## File path: codespell.txt ## @@ -0,0 +1,4 @@ +hel Review comment: `codespell` is a new Python based spell checker that runs on `pre-commit`. This is the `codespell` dictionary and it found some new spelling mistakes. I added docs on this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-website] iamayushdas commented on pull request #328: docs: fixed kubernetes service api broken link
iamayushdas commented on pull request #328: URL: https://github.com/apache/apisix-website/pull/328#issuecomment-833172958 > > I tried to search those links in every repositories, but those links doesn't exist now. @iamayushdas could you check the issue once again. > > The reason those links are broken is due to, apisix-ingress-controller does not contain Chinese doc, but on Chinese website, the edit link is pointing to `zh` link. So the logic of multi-language doc edit links need to fix. But we could leave it to another PR. yes ofcourse, will look into it in another PR Thanks for review -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] Yiyiyimu opened a new issue #332: bug: doc edit links would be broken for zh doc page while repo not support zh doc
Yiyiyimu opened a new issue #332: URL: https://github.com/apache/apisix-website/issues/332 > I tried to search those links in every repositories, but those links doesn't exist now. @iamayushdas could you check the issue once again. https://user-images.githubusercontent.com/40708551/116728234-4853b000-aa03-11eb-92b7-09c5064e5f2e.png The reason those links are broken is due to, apisix-ingress-controller does not contain Chinese doc, but on Chinese website, the edit link is pointing to `zh` link. So the logic of multi-language doc edit links needs to fix. But we could leave it to another PR. _Originally posted by @Yiyiyimu in https://github.com/apache/apisix-website/issues/328#issuecomment-833172368_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] Yiyiyimu commented on pull request #328: docs: fixed kubernetes service api broken link
Yiyiyimu commented on pull request #328: URL: https://github.com/apache/apisix-website/pull/328#issuecomment-833172368 > I tried to search those links in every repositories, but those links doesn't exist now. @iamayushdas could you check the issue once again. The reason those links are broken is due to, apisix-ingress-controller does not contain Chinese doc, but on Chinese website, the edit link is pointing to `zh` link. So the logic of multi-language doc edit links need to fix. But we could leave it to another PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #4183: feat(ext-plugin): implement the http-req-call protocol
spacewander merged pull request #4183: URL: https://github.com/apache/apisix/pull/4183 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat(ext-plugin): implement the http-req-call protocol (#4183)
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 ffed438 feat(ext-plugin): implement the http-req-call protocol (#4183)
ffed438 is described below
commit ffed4383f14dd9de4118511ec4e6edff53965e03
Author: 罗泽轩
AuthorDate: Thu May 6 10:07:56 2021 +0800
feat(ext-plugin): implement the http-req-call protocol (#4183)
---
apisix/core/request.lua | 28 ++
apisix/plugins/ext-plugin/init.lua | 283 +++-
rockspec/apisix-master-0.rockspec | 2 +-
t/lib/ext-plugin.lua| 214 +++
t/lib/server.lua| 6 +-
t/plugin/ext-plugin/http-req-call.t | 517
6 files changed, 1038 insertions(+), 12 deletions(-)
diff --git a/apisix/core/request.lua b/apisix/core/request.lua
index f359460..e43a647 100644
--- a/apisix/core/request.lua
+++ b/apisix/core/request.lua
@@ -29,6 +29,8 @@ local io_open = io.open
local req_read_body = ngx.req.read_body
local req_get_body_data = ngx.req.get_body_data
local req_get_body_file = ngx.req.get_body_file
+local req_get_uri_args = ngx.req.get_uri_args
+local req_set_uri_args = ngx.req.set_uri_args
local _M = {}
@@ -122,6 +124,32 @@ function _M.get_remote_client_port(ctx)
end
+function _M.get_uri_args(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+
+if not ctx.req_uri_args then
+-- use 0 to avoid truncated result and keep the behavior as the
+-- same as other platforms
+local args = req_get_uri_args(0)
+ctx.req_uri_args = args
+end
+
+return ctx.req_uri_args
+end
+
+
+function _M.set_uri_args(ctx, args)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+
+ctx.req_uri_args = nil
+return req_set_uri_args(args)
+end
+
+
local function get_file(file_name)
local f, err = io_open(file_name, 'r')
if not f then
diff --git a/apisix/plugins/ext-plugin/init.lua
b/apisix/plugins/ext-plugin/init.lua
index 9dde610..f37ab81 100644
--- a/apisix/plugins/ext-plugin/init.lua
+++ b/apisix/plugins/ext-plugin/init.lua
@@ -16,8 +16,14 @@
--
local is_http = ngx.config.subsystem == "http"
local flatbuffers = require("flatbuffers")
+local a6_method = require("A6.Method")
local prepare_conf_req = require("A6.PrepareConf.Req")
local prepare_conf_resp = require("A6.PrepareConf.Resp")
+local http_req_call_req = require("A6.HTTPReqCall.Req")
+local http_req_call_resp = require("A6.HTTPReqCall.Resp")
+local http_req_call_action = require("A6.HTTPReqCall.Action")
+local http_req_call_stop = require("A6.HTTPReqCall.Stop")
+local http_req_call_rewrite = require("A6.HTTPReqCall.Rewrite")
local text_entry = require("A6.TextEntry")
local err_resp = require("A6.Err.Resp")
local err_code = require("A6.Err.Code")
@@ -35,16 +41,23 @@ local band = bit.band
local lshift = bit.lshift
local rshift = bit.rshift
local ffi = require("ffi")
+local ffi_new = ffi.new
local ffi_str = ffi.string
local socket_tcp = ngx.socket.tcp
-local str_byte = string.byte
-local str_format = string.format
+local worker_id = ngx.worker.id
local ngx_timer_at = ngx.timer.at
local exiting = ngx.worker.exiting
+local str_byte = string.byte
+local str_format = string.format
+local str_lower = string.lower
+local str_sub = string.sub
local error = error
-local events_list
+local ipairs = ipairs
+local pairs = pairs
+local type = type
+local events_list
local lrucache = core.lrucache.new({
type = "plugin",
ttl = helper.get_conf_token_cache_time(),
@@ -171,6 +184,80 @@ end
_M.receive = receive
+local generate_id
+do
+local count = 0
+local MAX_COUNT = lshift(1, 22)
+
+function generate_id()
+local wid = worker_id()
+local id = lshift(wid, 22) + count
+count = count + 1
+if count == MAX_COUNT then
+count = 0
+end
+return id
+end
+end
+
+
+local encode_a6_method
+do
+local map = {
+GET = a6_method.GET,
+HEAD = a6_method.HEAD,
+POST = a6_method.POST,
+PUT = a6_method.PUT,
+DELETE = a6_method.DELETE,
+MKCOL = a6_method.MKCOL,
+COPY = a6_method.COPY,
+MOVE = a6_method.MOVE,
+OPTIONS = a6_method.OPTIONS,
+PROPFIND = a6_method.PROPFIND,
+PROPPATCH = a6_method.PROPPATCH,
+LOCK = a6_method.LOCK,
+UNLOCK = a6_method.UNLOCK,
+PATCH = a6_method.PATCH,
+TRACE = a6_method.TRACE,
+}
+
+function encode_a6_method(name)
+return map[name]
+end
+end
+
+
+local function build_args(builder, key, val)
+local name = builder:CreateString(key)
+local value
+if val ~= true then
+value = builder:CreateString(val)
+end
+
+text_entry.Start(builder)
+text_entry.AddName(builder, name)
+
[GitHub] [apisix] tokers commented on issue #4150: bug: Inconsistent behavior of schema check for response-rewrite plugin between AdminAPI and ManagerAPI
tokers commented on issue #4150: URL: https://github.com/apache/apisix/issues/4150#issuecomment-833171049 @imjoey The second way is a long-term job, what about just fixing these problems one-by-one 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] gxthrj commented on pull request #408: feat: add upstream status & tls status
gxthrj commented on pull request #408: URL: https://github.com/apache/apisix-ingress-controller/pull/408#issuecomment-833171024 related to : #394 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #394: Support to record kubernetes events for resources processing
gxthrj closed issue #394: URL: https://github.com/apache/apisix-ingress-controller/issues/394 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #371: feat: add jsonschema validate for ApisixUpstream resource
gxthrj closed issue #371: URL: https://github.com/apache/apisix-ingress-controller/issues/371 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 edited a comment on issue #371: feat: add jsonschema validate for ApisixUpstream resource
gxthrj edited a comment on issue #371: URL: https://github.com/apache/apisix-ingress-controller/issues/371#issuecomment-833170144 ref: https://github.com/apache/apisix-ingress-controller/pull/407 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 #371: feat: add jsonschema validate for ApisixUpstream resource
gxthrj commented on issue #371: URL: https://github.com/apache/apisix-ingress-controller/issues/371#issuecomment-833170144 https://github.com/apache/apisix-ingress-controller/pull/407 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] tokers commented on issue #4124: request help: how to get current limit count from redis cache?
tokers commented on issue #4124: URL: https://github.com/apache/apisix/issues/4124#issuecomment-833170088 >  > ps: this is a screenshot of redis key naming for consumer plugin `limit count` by `consumer_name ` > > **part 1**: common prefix > **part 2**: consumer username > **part 3**: ？ > > Q1: Is this part(**part 3**) a version attribute? Can you help find out where the key generation rules are in the source code? > > Q2: If it is convenient for a third-party program to directly obtain the consumer's latest limit count value in redis, can we remove **part3** and only keep the latest version(**part1 + part2**)? That's right, the third part is the version of plugin configuration. Also, it's feasible to customize your key. Please see http://apisix.apache.org/docs/apisix/plugins/limit-count. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[apisix] branch master updated: feat(ext-plugin): handle error response (#4179)
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.git
The following commit(s) were added to refs/heads/master by this push:
new 50e9bfa feat(ext-plugin): handle error response (#4179)
50e9bfa is described below
commit 50e9bfa54ed00dc042ffdbe7bdd183bc09b66c2e
Author: 罗泽轩
AuthorDate: Thu May 6 10:00:12 2021 +0800
feat(ext-plugin): handle error response (#4179)
Signed-off-by: spacewander
---
apisix/plugins/ext-plugin/init.lua | 27 ++
t/lib/ext-plugin.lua | 46 --
t/plugin/ext-plugin/sanity.t | 18 +++
3 files changed, 70 insertions(+), 21 deletions(-)
diff --git a/apisix/plugins/ext-plugin/init.lua
b/apisix/plugins/ext-plugin/init.lua
index 924e9f4..9dde610 100644
--- a/apisix/plugins/ext-plugin/init.lua
+++ b/apisix/plugins/ext-plugin/init.lua
@@ -19,6 +19,8 @@ local flatbuffers = require("flatbuffers")
local prepare_conf_req = require("A6.PrepareConf.Req")
local prepare_conf_resp = require("A6.PrepareConf.Resp")
local text_entry = require("A6.TextEntry")
+local err_resp = require("A6.Err.Resp")
+local err_code = require("A6.Err.Code")
local constants = require("apisix.constants")
local core = require("apisix.core")
local helper = require("apisix.plugins.ext-plugin.helper")
@@ -117,6 +119,23 @@ end
_M.send = send
+local err_to_msg
+do
+local map = {
+[err_code.BAD_REQUEST] = "bad request",
+[err_code.SERVICE_UNAVAILABLE] = "service unavailable",
+[err_code.CONF_TOKEN_NOT_FOUND] = "conf token not found",
+}
+
+function err_to_msg(resp)
+local buf = flatbuffers.binaryArray.New(resp)
+local resp = err_resp.GetRootAsResp(buf, 0)
+local code = resp:Code()
+return map[code] or str_format("unknown err %d", code)
+end
+end
+
+
local function receive(sock)
local hdr, err = sock:receive(4)
if not hdr then
@@ -127,10 +146,6 @@ local function receive(sock)
end
local ty = str_byte(hdr, 1)
-if ty == constants.RPC_ERROR then
-return nil, "TODO: handler err"
-end
-
local resp
local hi, mi, li = str_byte(hdr, 2, 4)
local len = 256 * (256 * hi + mi) + li
@@ -147,6 +162,10 @@ local function receive(sock)
end
end
+if ty == constants.RPC_ERROR then
+return nil, err_to_msg(resp)
+end
+
return ty, resp
end
_M.receive = receive
diff --git a/t/lib/ext-plugin.lua b/t/lib/ext-plugin.lua
index 9b0a52d..be7f6e5 100644
--- a/t/lib/ext-plugin.lua
+++ b/t/lib/ext-plugin.lua
@@ -17,6 +17,8 @@
local ext = require("apisix.plugins.ext-plugin.init")
local constants = require("apisix.constants")
local flatbuffers = require("flatbuffers")
+local err_code = require("A6.Err.Code")
+local err_resp = require("A6.Err.Resp")
local prepare_conf_req = require("A6.PrepareConf.Req")
local prepare_conf_resp = require("A6.PrepareConf.Resp")
@@ -35,25 +37,35 @@ function _M.go(case)
ngx.log(ngx.WARN, "receive rpc call successfully")
if ty == constants.RPC_PREPARE_CONF then
-local buf = flatbuffers.binaryArray.New(data)
-local pc = prepare_conf_req.GetRootAsReq(buf, 0)
-
-if case.with_conf then
-local conf = pc:Conf(1)
-assert(conf:Name(), "foo")
-assert(conf:Value(), "bar")
-local conf = pc:Conf(2)
-assert(conf:Name(), "cat")
-assert(conf:Value(), "dog")
+if case.inject_error then
+ty = constants.RPC_ERROR
+err_resp.Start(builder)
+err_resp.AddCode(builder, err_code.BAD_REQUEST)
+local req = prepare_conf_req.End(builder)
+builder:Finish(req)
+data = builder:Output()
+
else
-assert(pc:ConfLength() == 0)
+local buf = flatbuffers.binaryArray.New(data)
+local pc = prepare_conf_req.GetRootAsReq(buf, 0)
+
+if case.with_conf then
+local conf = pc:Conf(1)
+assert(conf:Name(), "foo")
+assert(conf:Value(), "bar")
+local conf = pc:Conf(2)
+assert(conf:Name(), "cat")
+assert(conf:Value(), "dog")
+else
+assert(pc:ConfLength() == 0)
+end
+
+prepare_conf_resp.Start(builder)
+prepare_conf_resp.AddConfToken(builder, 233)
+local req = prepare_conf_req.End(builder)
+builder:Finish(req)
+data = builder:Output()
end
-
-prepare_conf_resp.Start(builder)
-prepare_conf_resp.AddConfToken(builder, 233)
-local req = prepare_conf_req.End(builder)
-builder:Finish(req)
-data = builder:Output()
end
local ok, err = ext.send(sock, ty, data)
diff --git a/t/plugin/ext-plugin/sanity.t
[GitHub] [apisix] tokers merged pull request #4179: feat(ext-plugin): handle error response
tokers merged pull request #4179: URL: https://github.com/apache/apisix/pull/4179 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] tokers commented on a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
tokers commented on a change in pull request #4183: URL: https://github.com/apache/apisix/pull/4183#discussion_r627025839 ## File path: apisix/plugins/ext-plugin/init.lua ## @@ -152,6 +165,80 @@ end _M.receive = receive +local generate_id +do +local count = 0 +local MAX_COUNT = lshift(1, 22) + +function generate_id() +local wid = worker_id() +local id = lshift(wid, 22) + count +count = count + 1 +if count == MAX_COUNT then +count = 0 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-dashboard] juzhiyuan commented on pull request #1816: feat: Use monaco editor
juzhiyuan commented on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-833167386 Fine! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] tokers commented on pull request #4121: feat: support to use upstream_id in stream_route
tokers commented on pull request #4121: URL: https://github.com/apache/apisix/pull/4121#issuecomment-833167189 @membphis Conflicts resolved. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
spacewander commented on a change in pull request #4183: URL: https://github.com/apache/apisix/pull/4183#discussion_r627025578 ## File path: apisix/plugins/ext-plugin/init.lua ## @@ -152,6 +165,80 @@ end _M.receive = receive +local generate_id +do +local count = 0 +local MAX_COUNT = lshift(1, 22) + +function generate_id() +local wid = worker_id() +local id = lshift(wid, 22) + count +count = count + 1 +if count == MAX_COUNT then +count = 0 Review comment: The id here is only used for logging purpose. In the given time window, it is rare to have two repeated id so we can distinguish them. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 edited a comment on pull request #414: chore: optimize the apisix cluster processing
tokers edited a comment on pull request #414: URL: https://github.com/apache/apisix-ingress-controller/pull/414#issuecomment-833165864 > I have two questions. > How to configure multi-clusters ? > How to match cluster `name` and `admin url` and `key`? Not in this PR. See the issue description, multiple-clusters will be supported in the future, this PR is just one of the prerequisites. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] tokers commented on pull request #414: chore: optimize the apisix cluster processing
tokers commented on pull request #414: URL: https://github.com/apache/apisix-ingress-controller/pull/414#issuecomment-833165864 > I have two questions. > How to configure multi-clusters ? > How to match cluster `name` and `admin url` and `key`? Not in this PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-ingress-controller] tokers commented on issue #364: ci: add golint workflow
tokers commented on issue #364: URL: https://github.com/apache/apisix-ingress-controller/issues/364#issuecomment-833165528 @fregie Assigned to you. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] tokers commented on a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
tokers commented on a change in pull request #4183: URL: https://github.com/apache/apisix/pull/4183#discussion_r627021898 ## File path: apisix/plugins/ext-plugin/init.lua ## @@ -152,6 +165,80 @@ end _M.receive = receive +local generate_id +do +local count = 0 +local MAX_COUNT = lshift(1, 22) + +function generate_id() +local wid = worker_id() +local id = lshift(wid, 22) + count +count = count + 1 +if count == MAX_COUNT then +count = 0 Review comment: Does the id rotate will influence the correctness? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] Yiyiyimu commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail
Yiyiyimu commented on issue #3673: URL: https://github.com/apache/apisix/issues/3673#issuecomment-833164013 > Any news? We found the similar porblem, some of nodes (not all) found this error message, my etcd version is 3.4.13. @nanamikon will add PR to solve it this week -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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 a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
membphis commented on a change in pull request #4183:
URL: https://github.com/apache/apisix/pull/4183#discussion_r627022066
##
File path: apisix/plugins/ext-plugin/init.lua
##
@@ -152,6 +165,80 @@ end
_M.receive = receive
+local generate_id
+do
+local count = 0
+local MAX_COUNT = lshift(1, 22)
+
+function generate_id()
+local wid = worker_id()
+local id = lshift(wid, 22) + count
+count = count + 1
+if count == MAX_COUNT then
+count = 0
+end
+return id
+end
+end
+
+
+local encode_a6_method
+do
+local map = {
+GET = a6_method.GET,
+HEAD = a6_method.HEAD,
+POST = a6_method.POST,
+PUT = a6_method.PUT,
+DELETE = a6_method.DELETE,
+MKCOL = a6_method.MKCOL,
+COPY = a6_method.COPY,
+MOVE = a6_method.MOVE,
+OPTIONS = a6_method.OPTIONS,
+PROPFIND = a6_method.PROPFIND,
+PROPPATCH = a6_method.PROPPATCH,
+LOCK = a6_method.LOCK,
+UNLOCK = a6_method.UNLOCK,
Review comment:
got it, many thanks for explaining
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and 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] nanamikon commented on issue #3673: request help: A node in the K8S environment ETCD cluster died, causing Apisix to fail
nanamikon commented on issue #3673: URL: https://github.com/apache/apisix/issues/3673#issuecomment-833162754 Any news? We found the similar porblem, some of nodes (not all) found this error message, my etcd version is 3.4.13. ``` stack traceback: ...p/huya-nginx-proxy//deps/share/lua/5.1/resty/etcd/v3.lua:652: in function 'res_func' /data/app/huya-nginx-proxy/apisix/core/config_etcd.lua:131: in function 'waitdir' /data/app/huya-nginx-proxy/apisix/core/config_etcd.lua:318: in function 'sync_data' /data/app/huya-nginx-proxy/apisix/core/config_etcd.lua:546: in function [C]: in function 'xpcall' ``` But admin api is ok provided by these nodes , and they can not recover forever -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
spacewander commented on a change in pull request #4183:
URL: https://github.com/apache/apisix/pull/4183#discussion_r627021530
##
File path: apisix/plugins/ext-plugin/init.lua
##
@@ -152,6 +165,80 @@ end
_M.receive = receive
+local generate_id
+do
+local count = 0
+local MAX_COUNT = lshift(1, 22)
+
+function generate_id()
+local wid = worker_id()
+local id = lshift(wid, 22) + count
+count = count + 1
+if count == MAX_COUNT then
+count = 0
+end
+return id
+end
+end
+
+
+local encode_a6_method
+do
+local map = {
+GET = a6_method.GET,
+HEAD = a6_method.HEAD,
+POST = a6_method.POST,
+PUT = a6_method.PUT,
+DELETE = a6_method.DELETE,
+MKCOL = a6_method.MKCOL,
+COPY = a6_method.COPY,
+MOVE = a6_method.MOVE,
+OPTIONS = a6_method.OPTIONS,
+PROPFIND = a6_method.PROPFIND,
+PROPPATCH = a6_method.PROPPATCH,
+LOCK = a6_method.LOCK,
+UNLOCK = a6_method.UNLOCK,
Review comment:
Those fields are copied from
https://github.com/openresty/lua-nginx-module#http-method-constants
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and 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 #3624: feat: add pre-commit framework
Yiyiyimu commented on a change in pull request #3624: URL: https://github.com/apache/apisix/pull/3624#discussion_r627017997 ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude: ^\.github/.*$ + # files: \.java$ + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + - id: insert-license Review comment: I'm a bit confused about this place. If pre-commit finds a place that need to add a license, would it add with bot account of Github Action? If so, the action is prohibited by Apache Community since we do not allow bot to do commits. ## File path: .gitignore ## @@ -63,8 +63,9 @@ t/lib/dubbo-backend/dubbo-backend-provider/target/ !.github/ ci/openwhisk-utilities/ !.gitmodules -!.markdownlint.yml -!.yamllint +!.markdownlint.yaml +!.pre-commit-config.yaml +!.yamllint.yaml Review comment: might be good to keep the extra newline ## File path: CONTRIBUTING.md ## @@ -51,9 +51,42 @@ Once we've discussed your changes and you've got your code ready, make sure that ## Contribution Guidelines for Documentation +* pre-commit + +A framework for managing and maintaining multi-language pre-commit hooks. +Pre-commit can be [installed](https://pre-commit.com/#installation) with `pip`, `curl`, `brew` or `conda`. Review comment: I still believe it's better to add a universal script for contributors to easily use it, like using `curl` to do the installation. ## File path: codespell.txt ## @@ -0,0 +1,4 @@ +hel Review comment: Sorry I failed to understand this. Is this a whitelist for misspell? ## File path: .pre-commit-config.yaml ## @@ -0,0 +1,193 @@ +# +# 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. +# +--- +default_stages: [commit, push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: "1.20.0" +repos: + - repo: meta +hooks: + - id: identity + - id: check-hooks-apply + - repo: https://github.com/Lucas-C/pre-commit-hooks +rev: v1.1.10 +hooks: + # - id: insert-license + # name: Add license for all Golang files + # exclude: ^\.github/.*$ + # files: \.go + # args: + #- --comment-style + #- "/*|| */" + #- --license-filepath + #- license-templates/LICENSE.txt + #- --fuzzy-match-generates-todo + # - id: insert-license + # name: Add license for all Java files + # exclude:
[GitHub] [apisix] membphis commented on a change in pull request #4183: feat(ext-plugin): implement the http-req-call protocol
membphis commented on a change in pull request #4183:
URL: https://github.com/apache/apisix/pull/4183#discussion_r626530037
##
File path: apisix/plugins/ext-plugin/init.lua
##
@@ -152,6 +165,80 @@ end
_M.receive = receive
+local generate_id
+do
+local count = 0
+local MAX_COUNT = lshift(1, 22)
+
+function generate_id()
+local wid = worker_id()
+local id = lshift(wid, 22) + count
+count = count + 1
+if count == MAX_COUNT then
+count = 0
+end
+return id
+end
+end
+
+
+local encode_a6_method
+do
+local map = {
+GET = a6_method.GET,
+HEAD = a6_method.HEAD,
+POST = a6_method.POST,
+PUT = a6_method.PUT,
+DELETE = a6_method.DELETE,
+MKCOL = a6_method.MKCOL,
+COPY = a6_method.COPY,
+MOVE = a6_method.MOVE,
+OPTIONS = a6_method.OPTIONS,
+PROPFIND = a6_method.PROPFIND,
+PROPPATCH = a6_method.PROPPATCH,
+LOCK = a6_method.LOCK,
+UNLOCK = a6_method.UNLOCK,
Review comment:
Is this type reserved for the future? If yes, is there any documentation?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-dashboard] iamayushdas commented on pull request #1816: feat: Use monaco editor
iamayushdas commented on pull request #1816: URL: https://github.com/apache/apisix-dashboard/pull/1816#issuecomment-833160594 > > @juzhiyuan @qian0817 > > > after having a search to those errors regarding jest, > > > we can give a try to this command after imports > > > `jest.useFakeTimers();` > > > > Hi, may I know which error you mean? If this PR's changes look good to you?  Else the changes done are good , have reviewed them -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] sandy420 commented on issue #4160: bug: Seek help !Problems of Prometheus, a plug-in of APISIX 2.4.
sandy420 commented on issue #4160: URL: https://github.com/apache/apisix/issues/4160#issuecomment-833159411 > > > I can't reproduce your exception, please describe clearly the configuration of config.yaml and the detailed steps you took to cause the exception, it's important for me to reproduce this. > > > This is my config.yaml > > >  > > The indentation of the server_info plugin configuration is wrong, it should be like this: > > ```yaml > plugin_attr: > prometheus: > export_uri: /apisix/prometheus/metrics > server-info: > report_interval: 600, > report_ttl: 3600 > ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and 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] sandy420 closed issue #4160: bug: Seek help !Problems of Prometheus, a plug-in of APISIX 2.4.
sandy420 closed issue #4160: URL: https://github.com/apache/apisix/issues/4160 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
