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.

Sign up for GitHub

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

Jump to bottom

swagger: block swagger url if disbale swagger server #6785

Merged
merged 4 commits into from
Jul 12, 2023
Merged

swagger: block swagger url if disbale swagger server #6785

merged 4 commits into from
Jul 12, 2023

Conversation

bufferflies
Copy link
Contributor

@bufferflies bufferflies commented Jul 12, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Close #6786

What is changed and how does it work?

 /swagger/* return 404

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    Before
    curl xxxx:2379/swagger/ui/index
image

After
curl xxxx:2379/swagger/ui/index
image

swagger=1 make
image

Code changes

Side effects

Related changes

Release note

swagger: block swagger url if disbale swagger server

@bufferflies
disable swagger url
8c8de97 
Signed-off-by: bufferflies <1045931706@qq.com>
@bufferflies
not add swagger handler
2edf9eb 
Signed-off-by: bufferflies <1045931706@qq.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 12, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch
  • rleungx

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 12, 2023
@ti-chi-bot ti-chi-bot bot requested review from nolouch and rleungx July 12, 2023 03:29
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Jul 12, 2023
@bufferflies
pass ut
e3f7c10 
Signed-off-by: bufferflies <1045931706@qq.com>
nolouch
nolouch approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

lgtm

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 12, 2023
@codecov
Copy link

codecov bot commented Jul 12, 2023 •
edited
Loading

Codecov Report

Merging #6785 (e3f7c10) into master (2b9c9d9) will increase coverage by 0.10%.
The diff coverage is 50.00%.

❗ Current head e3f7c10 differs from pull request most recent head 4dd6af2. Consider uploading reports for the commit 4dd6af2 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #6785      +/-   ##
==========================================
+ Coverage   74.17%   74.28%   +0.10%     
==========================================
  Files         413      412       -1     
  Lines       43373    43369       -4     
==========================================
+ Hits        32172    32215      +43     
+ Misses       8318     8282      -36     
+ Partials     2883     2872      -11
Flag Coverage Δ
unittests 74.28% <50.00%> (+0.10%) ⬆️

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

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 12, 2023
@bufferflies
add unit test
4dd6af2 
Signed-off-by: bufferflies <1045931706@qq.com>
@bufferflies
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 12, 2023

@bufferflies: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 12, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 4dd6af2

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2023
@ti-chi-bot ti-chi-bot bot merged commit c07c333 into tikv:master Jul 12, 2023
19 checks passed
@bufferflies bufferflies deleted the swagger_disable branch July 12, 2023 04:54
@bufferflies bufferflies added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Jul 12, 2023
This was referenced Jul 12, 2023
Merged
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #6789.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #6790.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 12, 2023
@bufferflies @ti-chi-bot
This is an automated cherry-pick of tikv#6785
2552312 
close tikv#6786

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jul 12, 2023
@ti-chi-bot @bufferflies
swagger: block swagger url if disbale swagger server (#6785) (#6790)
61a7f07 
close #6786

/swagger/* return 404

Signed-off-by: bufferflies <1045931706@qq.com>

Co-authored-by: bufferflies <1045931706@qq.com>
ti-chi-bot bot pushed a commit that referenced this pull request Jul 14, 2023
@ti-chi-bot @bufferflies
swagger: block swagger url if disbale swagger server (#6785) (#6789)
f427242 
close #6786

/swagger/* return 404

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: bufferflies <1045931706@qq.com>

Co-authored-by: buffer <1045931706@qq.com>
Co-authored-by: bufferflies <1045931706@qq.com>
@HuSharp HuSharp mentioned this pull request Aug 3, 2023
Merged
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch approved these changes

@rleungx rleungx rleungx approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

swagger: curl /swagger/* return 404 if swagger server is disabled
4 participants
@bufferflies @ti-chi-bot @nolouch @rleungx