feat(aws-smithy-types): Impl http-body-1.0 Body for SdkBody #3380
Conversation
This file contains 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
cayman-amzn
force-pushed
the
SdkBody-http-1.0
branch
from
c3359a5 to
5e8334a
Compare
rcoh
requested changes
Jan 23, 2024
Comment on lines
27
to
46
| /// Construct an `SdkBody` from a type that implements [`hyper_1_0::body::Body<Data = Bytes>`](hyper_1_0::body::Body) | ||
| pub fn from_hyper_1_x<T, E>(body: T) -> Self | ||
| where | ||
| T: hyper_1_0::body::Body<Data = Bytes, Error = E> + Send + Sync + 'static, | ||
| E: Into<Error> + 'static, | ||
| { | ||
| SdkBody { | ||
| bytes_contents: None, | ||
| inner: super::Inner::Dyn { | ||
| inner: super::BoxBody::HttpBody10(http_body_util::combinators::BoxBody::new( | ||
| body.map_err(Into::into), | ||
| )), | ||
| }, | ||
| rebuild: None, | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
how does this type differ from HttpBody? aren't they kinda the same ? I don't think we necessarily want a hyper-specific constructor.
| self: Pin<&mut Self>, | ||
| cx: &mut Context<'_>, | ||
| ) -> Poll<Option<Result<http_body_1_0::Frame<Bytes>, Error>>> { | ||
| // There has got to be a way to simplify this matching matchy match |
There was a problem hiding this comment.
yeah you want the ready! macro
Comment on lines
152
to
161
| Poll::Pending => return Poll::Pending, | ||
| Poll::Ready(maybe_ready) => match maybe_ready { | ||
| None => return Poll::Ready(None), | ||
| Some(result) => match result { | ||
| Err(err) => return Poll::Ready(Some(Err(err))), | ||
| Ok(bytes) => return Poll::Ready(Some(Ok(http_body_1_0::Frame::data(bytes)))), | ||
| }, | ||
| }, | ||
| } | ||
| } |
There was a problem hiding this comment.
this doesn't handle trailers correctly. I'd start by adding a test case involving trailers (that should fail), then go from there.
| @@ -248,7 +248,7 @@ pin_project! { | |||
| /// 3. **From an `SdkBody` directly**: For more advanced / custom use cases, a ByteStream can be created directly | |||
| /// from an SdkBody. **When created from an SdkBody, care must be taken to ensure retriability.** An SdkBody is retryable | |||
| /// when constructed from in-memory data or when using [`SdkBody::retryable`](crate::body::SdkBody::retryable). | |||
| /// ```no_run | |||
There was a problem hiding this comment.
It might have been something about the host I pulled the repo down on, but it was still compiling for some reason. This was the only way I could get it to pass the initial build (locally)
rcoh
previously requested changes
Jan 23, 2024
rcoh
force-pushed
the
SdkBody-http-1.0
branch
from
adb22b8 to
0d646b7
Compare
rcoh
force-pushed
the
SdkBody-http-1.0
branch
from
0d646b7 to
e34dbde
Compare
Co-authored-by: John DiSanti <[email protected]>
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.
Motivation and Context
A step towards moving to http-1.0
awslabs/aws-sdk-rust#1046
(Russell): This is a minimal implementation of
http-body = 1. It isn't maximally efficient since even if we were given a 1x body, we convert it back and forth first. This is a first step.Description
Implements http-body-1.0 Body trait for SdkBody.
Testing
Regular CI
Checklist
CHANGELOG.next.tomlif I made changes to the smithy-rs codegen or runtime cratesCHANGELOG.next.tomlif I made changes to the AWS SDK, generated SDK code, or SDK runtime cratesBy submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.