Add support for constructing sdk body types from http-body 1.0 #3300

rcoh · 2023-12-08T21:17:10Z

Motivation and Context

aws-sdk-rust#977

Description

The first of several PRs to make add support for Hyper 1.0. This minimal change allows the use of Hyper 1.0 bodies although it does not actually leverage Hyper 1.0.

Testing

Unit test suite
Ran cargo hack check --feature-powerset because we had a lot of features. I found a couple of issues.

Checklist

I have updated CHANGELOG.next.toml if I made changes to the smithy-rs codegen or runtime crates
I have updated CHANGELOG.next.toml if I made changes to the AWS SDK, generated SDK code, or SDK runtime crates

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

github-actions · 2023-12-08T21:33:51Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
No codegen difference in the Client Test
No codegen difference in the Server Test
Server Test Python (ignoring whitespace)
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

jdisanti

Awesome!

CHANGELOG.next.toml

jdisanti · 2023-12-09T00:13:57Z

rust-runtime/aws-smithy-types/Cargo.toml

@@ -13,9 +13,10 @@ repository = "https://github.com/smithy-lang/smithy-rs"
 [features]
 byte-stream-poll-next = []
 http-body-0-4-x = ["dep:http-body-0-4"]
+http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "http-body-0-4-x"]


If this pulls in http-body-0-4-x, then it will have to pull that in forever since removing it would technically break the API. It should pull in the dependency instead so that the APIs associated with the feature don't come with it.

good point—these things were required to actually compile this in all cases but I'll add private APIs to fix this up.

jdisanti · 2023-12-09T00:16:03Z

rust-runtime/aws-smithy-types/Cargo.toml

-    "dep:http-body-0-4",
+    "http-body-0-4-x",


This will permanently tie rt-tokio to the http-body-0-4-x feature since it brings in the API for 0.4.

jdisanti · 2023-12-09T00:17:32Z

rust-runtime/aws-smithy-types/src/body/http_body_1_x.rs

+    /// Construct an `SdkBody` from a type that implements [`http_body_1_0::Body<Data = Bytes>`](http_body_1_0::Body).
+    ///
+    /// _Note: This is only available with `http-body-1-0` enabled._
+    pub fn from_body_1_0<T, E>(body: T) -> Self


1_0 or 1_x?

github-actions · 2023-12-11T16:22:39Z

A new generated diff is ready to view.

A new doc preview is ready to view.

github-actions · 2023-12-11T16:44:15Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
No codegen difference in the Client Test
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

jdisanti · 2023-12-12T17:54:22Z

rust-runtime/aws-smithy-types/Cargo.toml

 [features]
 byte-stream-poll-next = []
-http-body-0-4-x = ["dep:http-body-0-4"]
+http-body-0-4-x = ["http-body-0-4"]
+http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "http-body-0-4", "http-1x"]


Suggested change

http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "http-body-0-4", "http-1x"]

http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "dep:http-body-0-4", "dep:http-1x"]

jdisanti · 2023-12-12T18:23:00Z

rust-runtime/aws-smithy-types/src/body.rs

+    #[cfg(any(
+        feature = "http-body-0-4-x",
+        feature = "http-body-1-x",
+        feature = "rt-tokio"


Why does rt-tokio require this?

rt-tokio is what enables PathBody, path body uses it

github-actions · 2023-12-12T18:28:09Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
No codegen difference in the Client Test
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

ysaito1001 · 2023-12-12T18:33:50Z

rust-runtime/aws-smithy-types/src/body/http_body_1_x.rs

+impl SdkBody {
+    /// Construct an `SdkBody` from a type that implements [`http_body_1_0::Body<Data = Bytes>`](http_body_1_0::Body).
+    ///
+    /// _Note: This is only available with `http-body-1-0` enabled._


I'm not suggesting to remove this (good to be explicit), but will #![cfg_attr(docsrs, feature(doc_auto_cfg))] add a similar comment?

yeah should remove actually, I just copy-pasted but we'll get a docs attr

ysaito1001 · 2023-12-12T19:33:45Z

rust-runtime/aws-smithy-types/src/byte_stream/http_body_1_x.rs

+    /// Construct a `ByteStream` from a type that implements [`http_body_0_4::Body<Data = Bytes>`](http_body_0_4::Body).
+    ///
+    /// _Note: This is only available with `http-body-0-4-x` enabled._


Suggested change

/// Construct a `ByteStream` from a type that implements [`http_body_0_4::Body<Data = Bytes>`](http_body_0_4::Body).

///

/// _Note: This is only available with `http-body-0-4-x` enabled._

/// Construct a `ByteStream` from a type that implements [`http_body_1_0::Body<Data = Bytes>`](http_body_1_0::Body).

///

/// _Note: This is only available with `http-body-1-0` enabled._

fix changelog Co-authored-by: John DiSanti <[email protected]>

github-actions · 2023-12-13T20:50:05Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
No codegen difference in the Client Test
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

## Motivation and Context - aws-sdk-rust#977 ## Description The first of several PRs to make add support for Hyper 1.0. This minimal change allows the use of Hyper 1.0 bodies although it does not actually leverage Hyper 1.0. ## Testing - Unit test suite - Ran cargo hack check --feature-powerset because we had a lot of features. I found a couple of issues. ## Checklist  - [x] I have updated `CHANGELOG.next.toml` if I made changes to the smithy-rs codegen or runtime crates - [x] I have updated `CHANGELOG.next.toml` if I made changes to the AWS SDK, generated SDK code, or SDK runtime crates ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._ --------- Co-authored-by: John DiSanti <[email protected]>

rcoh requested review from a team as code owners December 8, 2023 21:17

jdisanti reviewed Dec 9, 2023

View reviewed changes

rcoh force-pushed the http-body-10 branch from 36c60e1 to acfdba9 Compare December 11, 2023 15:48

rcoh force-pushed the http-body-10 branch from 86f74dd to d55d133 Compare December 11, 2023 16:26

rcoh added the needs-sdk-review label Dec 11, 2023

rcoh mentioned this pull request Dec 11, 2023

[tracking] support hyper/http/etc. 1.0 awslabs/aws-sdk-rust#977

Open

11 tasks

jdisanti reviewed Dec 12, 2023

View reviewed changes

ysaito1001 reviewed Dec 12, 2023

View reviewed changes

ysaito1001 approved these changes Dec 12, 2023

View reviewed changes

jdisanti approved these changes Dec 12, 2023

View reviewed changes

rcoh and others added 5 commits December 13, 2023 15:32

Add support for constructing sdk body types from http-body 1.0

5504803

Ensure http-body-0-4 is not inadvertently publicly exposed

46f0860

Apply suggestions from code review

7261cc8

fix changelog Co-authored-by: John DiSanti <[email protected]>

Cleanup feature usage

62952e1

Fix doc comments

55eaa2f

rcoh force-pushed the http-body-10 branch from 2f32228 to 55eaa2f Compare December 13, 2023 20:32

rcoh enabled auto-merge December 13, 2023 20:32

rcoh added this pull request to the merge queue Dec 13, 2023

Merged via the queue into main with commit 7dfd609 Dec 13, 2023
41 checks passed

rcoh deleted the http-body-10 branch December 13, 2023 21:22

Velfi removed the needs-sdk-review label Feb 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for constructing sdk body types from http-body 1.0 #3300

Add support for constructing sdk body types from http-body 1.0 #3300

rcoh commented Dec 8, 2023

github-actions bot commented Dec 8, 2023

jdisanti left a comment

jdisanti Dec 9, 2023

rcoh Dec 11, 2023

jdisanti Dec 9, 2023

jdisanti Dec 9, 2023

github-actions bot commented Dec 11, 2023

github-actions bot commented Dec 11, 2023

jdisanti Dec 12, 2023

jdisanti Dec 12, 2023

rcoh Dec 12, 2023

github-actions bot commented Dec 12, 2023

ysaito1001 Dec 12, 2023

rcoh Dec 12, 2023

ysaito1001 Dec 12, 2023

github-actions bot commented Dec 13, 2023

	http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "http-body-0-4", "http-1x"]
	http-body-1-x = ["dep:http-body-1-0", "dep:http-body-util", "dep:http-body-0-4", "dep:http-1x"]

Add support for constructing sdk body types from http-body 1.0 #3300

Add support for constructing sdk body types from http-body 1.0 #3300

Conversation

rcoh commented Dec 8, 2023

Motivation and Context

Description

Testing

Checklist

github-actions bot commented Dec 8, 2023

jdisanti left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 11, 2023

github-actions bot commented Dec 11, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 12, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 13, 2023