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

Add statusCodeHandler to 404-server-with-metrics which serves status code given in URL path #1844

Merged
merged 1 commit into from
Oct 25, 2022
Merged

Add statusCodeHandler to 404-server-with-metrics which serves status code given in URL path #1844

merged 1 commit into from
Oct 25, 2022

Conversation

yiyangy
Copy link
Contributor

@yiyangy yiyangy commented Oct 20, 2022

Add to 404 server with metrics the functionality to return status code. The status code to return is given in the URL path of request in the format of /statuscode/, e.g. /statuscode/500 .

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 20, 2022
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 20, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @yiyangy. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 20, 2022
@yiyangy
Copy link
Contributor Author

yiyangy commented Oct 20, 2022

/cc @bowei

@k8s-ci-robot k8s-ci-robot requested a review from bowei October 20, 2022 17:55
@bowei
Copy link
Member

bowei commented Oct 20, 2022

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 20, 2022
bowei
bowei reviewed Oct 21, 2022
View reviewed changes
cmd/404-server-with-metrics/server-with-metrics.go Outdated
p := strings.TrimPrefix(r.URL.Path, statusCodePrefix)
code, err := strconv.Atoi(p)
if err != nil {
code = http.StatusNotFound
Copy link
Member

Choose a reason for hiding this comment

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

we should return an error message here instead of dropping through...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

cmd/404-server-with-metrics/server-with-metrics.go
func (s *server) statusCodeHandler() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
p := strings.TrimPrefix(r.URL.Path, statusCodePrefix)
code, err := strconv.Atoi(p)
Copy link
Member

Choose a reason for hiding this comment

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

We should only allow codes between [400, 599] to avoid potential for any abuse use case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

cmd/404-server-with-metrics/server-with-metrics.go Outdated
statusText = http.StatusText(code)
}
w.WriteHeader(code)
fmt.Fprintf(w, "response %d (%s) \n", code, statusText)
Copy link
Member

Choose a reason for hiding this comment

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

we probably don't need the text...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 21, 2022
@yiyangy yiyangy requested review from bowei and removed request for MrHohn and kl52752 October 21, 2022 05:30
@yiyangy
Copy link
Contributor Author

yiyangy commented Oct 21, 2022

/cc @swetharepakula

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 21, 2022
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 21, 2022
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 25, 2022
@bowei
Copy link
Member

bowei commented Oct 25, 2022

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bowei, yiyangy

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 194a3fb into kubernetes:master Oct 25, 2022
@yiyangy yiyangy deleted the statusCode branch October 26, 2022 02:31
yiyangy pushed a commit to yiyangy/ingress-gce that referenced this pull request Oct 26, 2022
@k8s-ci-robot @yiyangy
[Cherrypick kubernetes#1844] cherry pick 404-server-with-metrics chan…
413bd26 
…ge to release

1.20
k8s-ci-robot added a commit that referenced this pull request Oct 26, 2022
@k8s-ci-robot
Merge pull request #1846 from yiyangy/release-1.20
0ba42e4 
[Cherrypick #1844] cherry pick 404-server-with-metrics change to release 1.20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bowei bowei bowei approved these changes

@swetharepakula swetharepakula Awaiting requested review from swetharepakula

Assignees

@bowei bowei

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yiyangy @k8s-ci-robot @bowei