Update to latest conformance image #166
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
…ce.swift Co-authored-by: Michael Rebello <me@michaelrebello.com>
smaye81
commented
Sep 12, 2023
Comment on lines
76
to
92
| public init(from decoder: Swift.Decoder) throws { | ||
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
|
|
||
| // Read the base64-encoded payload and then pad if needed | ||
| let encodedPayload = try container.decode(String.self, forKey: .payload) | ||
| let padded = encodedPayload.padding( | ||
| toLength: ((encodedPayload.count+3)/4)*4, | ||
| withPad: "=", | ||
| startingAt: 0 | ||
| ) | ||
|
|
||
| self.init( | ||
| type: try container.decodeIfPresent(String.self, forKey: .type) ?? "", | ||
| payload: Data(base64Encoded: padded) | ||
| ) | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
@rebello95 Here is the padding fix I mentioned.
Collaborator
There was a problem hiding this comment.
Do tests cover receiving both a padded and unpadded error?
Member
Author
There was a problem hiding this comment.
Do you mean the conformance suite? If so, no, they don't account for that. But probably a good one to add when it's refactored.
rebello95
reviewed
Sep 12, 2023
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
|
|
||
| // Read the base64-encoded payload and then pad if needed | ||
| let encodedPayload = try container.decode(String.self, forKey: .payload) |
Collaborator
There was a problem hiding this comment.
Should this be a decodeIfPresent? This is changing behavior to throw if payload is omitted
Member
Author
There was a problem hiding this comment.
Definitely should. Fixed.
Comment on lines
76
to
92
| public init(from decoder: Swift.Decoder) throws { | ||
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
|
|
||
| // Read the base64-encoded payload and then pad if needed | ||
| let encodedPayload = try container.decode(String.self, forKey: .payload) | ||
| let padded = encodedPayload.padding( | ||
| toLength: ((encodedPayload.count+3)/4)*4, | ||
| withPad: "=", | ||
| startingAt: 0 | ||
| ) | ||
|
|
||
| self.init( | ||
| type: try container.decodeIfPresent(String.self, forKey: .type) ?? "", | ||
| payload: Data(base64Encoded: padded) | ||
| ) | ||
| } | ||
|
|
Collaborator
There was a problem hiding this comment.
Do tests cover receiving both a padded and unpadded error?
Co-authored-by: Michael Rebello <me@michaelrebello.com>
…ce.swift Co-authored-by: Michael Rebello <me@michaelrebello.com>
Base automatically changed from
sayers/fix_streaming_error_after_response
to
main
September 12, 2023 20:57
rebello95
approved these changes
Sep 12, 2023
Co-authored-by: Michael Rebello <me@michaelrebello.com>
Co-authored-by: Michael Rebello <me@michaelrebello.com>
rebello95
approved these changes
Sep 12, 2023
Collaborator
|
Would be nice to add tests for unpadded |
Member
Author
|
Agreed. I'll put a PR together for that. Thanks for reviewing! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This updates the repo to use the latest conformance image, which uses the new organization on Dockerhub as well as the new proto packages (
connectrpc.conformance.v1instead ofgrpc.testing).As a part of this update, this attempts a fix at decoding the
ErrorDetailsvalue, which is returned as a base64-encoded string. The Connect protocol states that implementations should emit unpadded values and that downstream implementations should accept both padded and unpadded values. This adds padding to this string if needed as part of theConnectErrordecode logic.