Echo Metadata in TestService #1824
Merged
Conversation
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
Motivation: We want to be able to test that the server receives metadata and can send both initial and trailing metadata. Modifications: - added extensions for server requests that extract the initial and trailing metadata that should be echoed - added the initial and trailing metadata n the server responses Result: The interop tests will test that the server sends metadata as initial and trailing.
glbrntt
requested changes
Mar 11, 2024
Comment on lines
212
to
243
| fileprivate func extractInitialAndTrailingMetadata() -> (Metadata, Metadata) { | ||
| var initialMetadata = Metadata() | ||
| var trailingMetadata = Metadata() | ||
|
|
||
| for value in self.metadata[stringValues: "x-grpc-test-echo-initial"] { | ||
| initialMetadata.addString(value, forKey: "x-grpc-test-echo-initial") | ||
| } | ||
|
|
||
| for value in self.metadata[binaryValues: "x-grpc-test-echo-trailing-bin"] { | ||
| trailingMetadata.addBinary(value, forKey: "x-grpc-test-echo-trailing-bin") | ||
| } | ||
|
|
||
| return (initialMetadata, trailingMetadata) | ||
| } | ||
| } | ||
|
|
||
| @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) | ||
| extension ServerRequest.Stream { | ||
| fileprivate func extractInitialAndTrailingMetadata() -> (Metadata, Metadata) { | ||
| var initialMetadata = Metadata() | ||
| var trailingMetadata = Metadata() | ||
|
|
||
| for value in self.metadata[stringValues: "x-grpc-test-echo-initial"] { | ||
| initialMetadata.addString(value, forKey: "x-grpc-test-echo-initial") | ||
| } | ||
|
|
||
| for value in self.metadata[binaryValues: "x-grpc-test-echo-trailing-bin"] { | ||
| trailingMetadata.addBinary(value, forKey: "x-grpc-test-echo-trailing-bin") | ||
| } | ||
|
|
||
| return (initialMetadata, trailingMetadata) | ||
| } |
Collaborator
There was a problem hiding this comment.
There's a lot of needless repetition here. Instead can we have a fileprivate extension on Metadata which makes the initial and trailing metadata?
Then in the test functions we can just call request.metadata.makeInitialAndTrailingMetadata()?
glbrntt
approved these changes
Mar 11, 2024
gjcairo
added
semver/none
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation:
We want to be able to test that the server receives metadata and can send both initial and trailing metadata.
Modifications:
Result:
The interop tests will test that the server sends metadata as initial and trailing.