After 10/31 updates from rcoh

rust_dev_preview/cross_service/detect_faces/src/main.rs

@@ -217,7 +217,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .await;
     let rek_client = aws_sdk_rekognition::Client::new(&rek_shared_config);
 
-    let body = aws_sdk_s3::primitives::ByteStream::from_path_body_0_4(path).await;
+    let body = aws_sdk_s3::primitives::ByteStream::from_path(path).await;
 
     let key: String = String::from("uploads/") + &filename;
 

rust_dev_preview/cross_service/detect_labels/src/main.rs

@@ -49,9 +49,7 @@ struct Edata {
 
 // snippet-start:[detect_labels-add_file_to_bucket.rust.main]
 async fn add_file_to_bucket(client: &aws_sdk_s3::Client, bucket: &str, filename: &str) {
-    let body =
-        aws_sdk_s3::primitives::ByteStream::from_path_body_0_4(std::path::Path::new(filename))
-            .await;
+    let body = aws_sdk_s3::primitives::ByteStream::from_path(std::path::Path::new(filename)).await;
 
     match body {
         Ok(b) => {

rust_dev_preview/cross_service/photo_asset_management/src/uploader.rs

@@ -73,7 +73,7 @@ impl<'a> ZipUpload<'a> {
         let bucket = self.bucket;
         let key = self.key;
 
-        let body = ByteStream::read_with_body_0_4_from()
+        let body = ByteStream::read_from()
             .file(zip.try_into()?)
             .buffer_size(4096 * 16)
             .build()

rust_dev_preview/cross_service/telephone/src/main.rs

@@ -98,7 +98,7 @@ async fn save_mp3_file(
         println!();
     }
 
-    let body = aws_sdk_s3::primitives::ByteStream::from_path_body_0_4(Path::new(filename)).await?;
+    let body = aws_sdk_s3::primitives::ByteStream::from_path(Path::new(filename)).await?;
 
     client
         .put_object()

rust_dev_preview/examples/glue/src/prepare.rs

@@ -216,7 +216,7 @@ impl GlueScenario {
             .bucket(self.bucket())
             .key("job.py")
             .body(
-                ByteStream::from_path_body_0_4(self.script.clone())
+                ByteStream::from_path(self.script.clone())
                     .await
                     .map_err(|err| GlueMvpError::Unknown(format!("{err:?}")))?,
             )
@@ -229,7 +229,7 @@ impl GlueScenario {
             .bucket(self.bucket.as_str())
             .key("setup_scenario_getting_started.yaml")
             .body(
-                ByteStream::from_path_body_0_4(self.config.clone())
+                ByteStream::from_path(self.config.clone())
                     .await
                     .map_err(|err| GlueMvpError::Unknown(format!("{err:?}")))?,
             )

rust_dev_preview/examples/s3/Cargo.toml

@@ -25,7 +25,7 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 # snippet-start:[s3.rust.s3-object-lambda-cargo.toml]
 aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 # snippet-end:[s3.rust.s3-object-lambda-cargo.toml]
-aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["rt-tokio"]}
 aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-smithy-runtime-api = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["client"] }
 aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["http-body-0-4-x"] }

rust_dev_preview/examples/s3/src/bin/put-object-progress.rs

@@ -135,7 +135,7 @@ async fn put_object(client: &Client, opts: &Opt) -> Result<(), anyhow::Error> {
     debug!("object: {}", opts.object);
     debug!("source: {}", opts.source.display());
 
-    let body = ByteStream::read_with_body_0_4_from()
+    let body = ByteStream::read_from()
         .path(opts.source.clone())
         // Artificially limit the buffer size to ensure the file has multiple
         // progress steps.

rust_dev_preview/examples/s3/src/bin/s3-helloworld.rs

@@ -51,7 +51,7 @@ async fn upload_object(
 
     println!();
 
-    let body = ByteStream::from_path_body_0_4(Path::new(filename)).await;
+    let body = ByteStream::from_path(Path::new(filename)).await;
 
     match body {
         Ok(b) => {

rust_dev_preview/examples/s3/src/bin/s3-multipart-upload.rs

@@ -102,7 +102,7 @@ async fn run_example() -> Result<(), Error> {
         } else {
             CHUNK_SIZE
         };
-        let stream = ByteStream::read_with_body_0_4_from()
+        let stream = ByteStream::read_from()
             .path(path)
             .offset(chunk_index * CHUNK_SIZE)
             .length(Length::Exact(this_chunk))

rust_dev_preview/examples/s3/src/s3-service-lib.rs

@@ -127,7 +127,7 @@ pub async fn upload_object(
     file_name: &str,
     key: &str,
 ) -> Result<PutObjectOutput, SdkError<PutObjectError>> {
-    let body = ByteStream::from_path_body_0_4(Path::new(file_name)).await;
+    let body = ByteStream::from_path(Path::new(file_name)).await;
     client
         .put_object()
         .bucket(bucket_name)