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

Generate error page warnings for gRPC upstreams #2196

Merged
merged 1 commit into from Dec 7, 2021

Conversation

ciarams87
Copy link
Member

Proposed changes

Generate an error when a user configures one or more gRPC Upstreams in the VirtualServer resource with a custom error page which conflicts with the ones generated for a gRPC upstream (one of 400, 401, 403, 404, 405, 408, 413, 414, 415, 426, 429, 495, 496, 497, 500, 501, 502, 503, 504)

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@github-actions github-actions bot added the chore Pull requests for routine tasks label Nov 18, 2021
@soneillf5
Copy link
Contributor

Lots of tests, great stuff

@ciarams87 ciarams87 changed the title Chore: generate error page warnings for gRPC upstreams draft: generate error page warnings for gRPC upstreams Nov 18, 2021
@nginx-bot nginx-bot force-pushed the chore/generate-error-page-warnings branch 3 times, most recently from 4c60a0a to 18a28c4 Compare November 18, 2021 21:29
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Hi @ciarams87 Please see my comments and suggestions

internal/configs/version2/nginx-plus.virtualserver.tmpl Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver_test.go Outdated Show resolved Hide resolved
internal/configs/virtualserver_test.go Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
@nginx-bot nginx-bot force-pushed the chore/generate-error-page-warnings branch 3 times, most recently from 349e8ff to f744cb1 Compare November 22, 2021 20:16
@ciarams87 ciarams87 force-pushed the chore/generate-error-page-warnings branch 3 times, most recently from 293df52 to 470f1d2 Compare November 24, 2021 14:22
@nginx-bot nginx-bot force-pushed the chore/generate-error-page-warnings branch 3 times, most recently from d6855db to 9651ca0 Compare November 24, 2021 20:57
@ciarams87 ciarams87 force-pushed the chore/generate-error-page-warnings branch from 9651ca0 to c55cdf6 Compare December 2, 2021 20:28
@ciarams87 ciarams87 changed the title draft: generate error page warnings for gRPC upstreams Generate error page warnings for gRPC upstreams Dec 2, 2021
@ciarams87 ciarams87 force-pushed the chore/generate-error-page-warnings branch from c55cdf6 to 01b0ef5 Compare December 2, 2021 20:30
@ciarams87
Copy link
Member Author

ciarams87 commented Dec 2, 2021

@pleshakov Can you please re-review when you get a chance? Thank you!

@ciarams87 ciarams87 force-pushed the chore/generate-error-page-warnings branch 2 times, most recently from 190b3d9 to 0e6cc68 Compare December 3, 2021 00:12
@nginx-bot nginx-bot force-pushed the chore/generate-error-page-warnings branch 3 times, most recently from a3c15fd to 974015c Compare December 3, 2021 18:17
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Hi @ciarams87 This looks good! Just a few comments

internal/configs/virtualserver.go Outdated Show resolved Hide resolved
tests/suite/test_virtual_server_grpc.py Outdated Show resolved Hide resolved
@ciarams87 ciarams87 force-pushed the chore/generate-error-page-warnings branch 10 times, most recently from 0d9e003 to bf0f3a7 Compare December 6, 2021 16:13
@nginx-bot nginx-bot force-pushed the chore/generate-error-page-warnings branch from bf0f3a7 to b2b0f1b Compare December 7, 2021 04:40
@ciarams87 ciarams87 merged commit 98b1742 into master Dec 7, 2021
@ciarams87 ciarams87 deleted the chore/generate-error-page-warnings branch December 7, 2021 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Pull requests for routine tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants