-
Notifications
You must be signed in to change notification settings - Fork 52
Add new MessageOneof rule
#377
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5bd0da8
Oneof rule
4e0ef35
Format
7498240
Feedback
1b4d5d4
Feedback
57e344b
Feedback
34eac5b
Format
57ee667
Feedback
fd2217b
Remove no fields test case (for now)
f5211e7
Feedback re: oneof phrasing
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,6 +137,26 @@ message MessageRules { | |
| // } | ||
| // ``` | ||
| repeated Rule cel = 3; | ||
|
|
||
| // `oneof` is a repeated field of type MessageOneofRule that specifies a list of fields | ||
| // of which exactly one can be present. If `required` is also specified, then exactly one | ||
| // of the specified fields _must_ be present. | ||
timostamm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // | ||
| // | ||
| // ```proto | ||
| // message MyMessage { | ||
| // // Only one of 'field1' or 'field2' _can_ be present in this message. | ||
timostamm marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // option (buf.validate.message).oneof = { fields: ["field1", "field2"] }; | ||
| // // Only one of 'field3' or 'field4' _must_ be present in this message. | ||
| // option (buf.validate.message).oneof = { fields: ["field3", "field4"], required: true }; | ||
| // } | ||
timostamm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // ``` | ||
| repeated MessageOneofRule oneof = 4; | ||
| } | ||
|
|
||
| message MessageOneofRule { | ||
| repeated string fields = 1; | ||
| optional bool required = 2; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add comments on the fields too? |
||
| } | ||
|
|
||
| // The `OneofRules` message type enables you to manage rules for | ||
|
|
||
216 changes: 197 additions & 19 deletions
216
tools/internal/gen/buf/validate/conformance/cases/messages.pb.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add test case for
MessageOneofSingleFieldRequired?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can do in followup PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Follow-up: #379