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: change etcd prefix for ssl and proto #2693

Merged
merged 13 commits into from Dec 22, 2022

Conversation

bzp2010
Copy link
Contributor

@bzp2010 bzp2010 commented Dec 15, 2022

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?

APISIX 3.0 changed its TLS certificate (SSL), Protocol Buffer (proto) to use the etcd prefix, adding a plural suffix to it. We need to modify it for adaptation.

This is essential as an interim measure for our APISIX 3.0 compatibility on the APISIX Dashboard 2.x branch.

  • change ssl to ssls
  • change proto to protos
  • update E2E APISIX to 3.0.0

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 self-assigned this Dec 15, 2022
@codecov-commenter
Copy link

codecov-commenter commented Dec 15, 2022

Codecov Report

Merging #2693 (678cfdb) into master (8d6d1c7) will decrease coverage by 11.09%.
The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           master    #2693       +/-   ##
===========================================
- Coverage   66.96%   55.87%   -11.10%     
===========================================
  Files         198      183       -15     
  Lines        7750     7089      -661     
  Branches      870      870               
===========================================
- Hits         5190     3961     -1229     
- Misses       2258     2925      +667     
+ Partials      302      203       -99     
Flag Coverage Δ
backend-e2e-test-ginkgo ?
backend-unit-test 50.08% <0.00%> (ø)
frontend-e2e-test 61.26% <ø> (ø)

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

Impacted Files Coverage Δ
api/internal/core/store/storehub.go 0.00% <0.00%> (-73.11%) ⬇️
api/main.go 0.00% <0.00%> (-100.00%) ⬇️
api/internal/utils/version.go 0.00% <0.00%> (-100.00%) ⬇️
api/internal/filter/request_id.go 0.00% <0.00%> (-100.00%) ⬇️
api/internal/core/entity/entity.go 0.00% <0.00%> (-90.91%) ⬇️
api/internal/filter/oidc.go 0.00% <0.00%> (-73.92%) ⬇️
api/internal/filter/invalid_request.go 28.57% <0.00%> (-71.43%) ⬇️
api/internal/utils/closer.go 0.00% <0.00%> (-71.43%) ⬇️
api/internal/handler/proto/proto.go 0.00% <0.00%> (-67.26%) ⬇️
... and 44 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@bzp2010 bzp2010 marked this pull request as ready for review December 21, 2022 10:14
Copy link
Member

@juzhiyuan juzhiyuan left a comment

Choose a reason for hiding this comment

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

LGTM

@bzp2010 bzp2010 merged commit 38557d3 into apache:master Dec 22, 2022
@bzp2010
Copy link
Contributor Author

bzp2010 commented Dec 22, 2022

Thanks to all reviewers! 🙏

hongbinhsu added a commit to fitphp/apix-dashboard that referenced this pull request Jan 30, 2023
* upstream/master:
  feat: release 3.0.0 (apache#2722)
  Revert "feat: release 2.16.0 (apache#2719)" (apache#2721)
  feat: release 2.16.0 (apache#2719)
  fix: plugin configuration lost in editor (apache#2718)
  fix: adapt APISIX plugin disabled (apache#2717)
  feat: basic support Apache APISIX 3.0.0 (apache#2701)
  feat: change etcd prefix for ssl and proto (apache#2693)
  fix: remove cases external service dependency (apache#2697)
  chore: simplify e2e environment (apache#2694)
  chore: optimize "allow_origins_by_regex tooltip" description (apache#2690)
  feat: release 2.15.0 (apache#2685)
  feat: basic support Apache APISIX 2.15.0 (apache#2680)
  feat: release 2.14.0 (apache#2677)
  fix: bump go version to 1.16 (apache#2678)
  feat: release 2.13.1 (apache#2658)
  feat: support more upstream scheme (apache#2675)
  feat: support purge method (apache#2674)
  feat: add enable flag to oidc function (apache#2672)

# Conflicts:
#	web/package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants