Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: basic support Apache APISIX 2.11 #2233

Merged
merged 16 commits into from
Dec 3, 2021

Conversation

bzp2010
Copy link
Contributor

@bzp2010 bzp2010 commented Dec 2, 2021

Please answer these questions before submitting a pull request, or your PR will get closed.

Why submit this pull request?

  • Bugfix
  • New feature provided
  • Improve performance
  • Backport patches

What changes will this PR take into?

Adapt Apache APISIX version 2.11, synchronize schema to support new plugins.

Related issues

follow: apache/apisix#5567

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

@bzp2010 bzp2010 added enhancement New feature or request backend labels Dec 2, 2021
@bzp2010 bzp2010 self-assigned this Dec 2, 2021
api/conf/schema.json Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Dec 2, 2021

Codecov Report

Merging #2233 (601f9cf) into master (cbcac5f) will increase coverage by 1.68%.
The diff coverage is 93.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2233      +/-   ##
==========================================
+ Coverage   68.02%   69.71%   +1.68%     
==========================================
  Files         127      184      +57     
  Lines        3359     7274    +3915     
  Branches      826      829       +3     
==========================================
+ Hits         2285     5071    +2786     
- Misses       1074     1908     +834     
- Partials        0      295     +295     
Flag Coverage Δ
backend-e2e-test 44.09% <ø> (?)
backend-e2e-test-ginkgo 51.39% <ø> (?)
backend-unit-test 49.13% <ø> (?)
frontend-e2e-test 68.12% <93.93%> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
web/src/components/Plugin/data.tsx 100.00% <ø> (ø)
web/src/components/Plugin/UI/limit-count.tsx 88.09% <87.50%> (+0.91%) ⬆️
web/src/components/Plugin/UI/limit-conn.tsx 92.30% <100.00%> (ø)
web/src/components/Plugin/UI/limit-req.tsx 100.00% <100.00%> (ø)
web/src/components/Plugin/UI/plugin.tsx 91.66% <100.00%> (ø)
.../src/pages/Route/components/Step1/ProxyRewrite.tsx 94.82% <100.00%> (+0.38%) ⬆️
web/src/pages/Route/transform.ts 77.77% <100.00%> (+0.35%) ⬆️
api/internal/handler/data_loader/route_export.go 75.00% <0.00%> (ø)
api/internal/log/zap.go 64.28% <0.00%> (ø)
api/internal/handler/handler.go 79.31% <0.00%> (ø)
... and 54 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cbcac5f...601f9cf. Read the comment docs.

juzhiyuan
juzhiyuan previously approved these changes Dec 2, 2021
Copy link
Member

@okaybase okaybase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

limit-conn appears twice in schema.json, and remove here(#L6728) will be better:
api/conf/schema.json#L6728 is repeated with api/conf/schema.json#L4630

@juzhiyuan juzhiyuan dismissed their stale review December 3, 2021 01:04

New changes

@bzp2010

This comment has been minimized.

@okaybase

This comment has been minimized.

@bzp2010
Copy link
Contributor Author

bzp2010 commented Dec 3, 2021

Update

The PR is now almost complete and ready for review.

@bzp2010 bzp2010 merged commit 6b86ff4 into apache:master Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants