Update to AWS SDK 0.101 / 0.59 / 0.38

4 files changed, 25 insertions, 21 deletions

diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml
index 18b067461..a3745c33c 100644
--- a/net/aws/Cargo.toml
+++ b/net/aws/Cargo.toml
@@ -13,12 +13,12 @@ rust-version = "1.70"
 [dependencies]
 async-stream = "0.3.4"
 base32 = "0.4"
-aws-config = "0.100.0"
-aws-sdk-s3 = "0.37.0"
-aws-sdk-transcribestreaming = "0.37.0"
-aws-sdk-translate = "0.37.0"
-aws-types = "0.100.0"
-aws-credential-types = "0.58.0"
+aws-config = "0.101.0"
+aws-sdk-s3 = "0.38.0"
+aws-sdk-transcribestreaming = "0.38.0"
+aws-sdk-translate = "0.38.0"
+aws-types = "0.101.0"
+aws-credential-types = "0.101.0"
 bytes = "1.0"
 futures = "0.3"
 gio = { git = "https://github.com/gtk-rs/gtk-rs-core.git", package = "gio" }
diff --git a/net/aws/src/s3src/imp.rs b/net/aws/src/s3src/imp.rs
index 361219c05..7c6dc87b8 100644
--- a/net/aws/src/s3src/imp.rs
+++ b/net/aws/src/s3src/imp.rs
@@ -40,7 +40,7 @@ enum StreamingState {
     Started {
         url: GstS3Url,
         client: Client,
-        size: u64,
+        size: Option<u64>,
     },
 }
 
@@ -168,7 +168,11 @@ impl S3Src {
         }
     }
 
-    fn head(self: &S3Src, client: &Client, url: &GstS3Url) -> Result<u64, gst::ErrorMessage> {
+    fn head(
+        self: &S3Src,
+        client: &Client,
+        url: &GstS3Url,
+    ) -> Result<Option<u64>, gst::ErrorMessage> {
         let head_object = client
             .head_object()
             .set_bucket(Some(url.bucket.clone()))
@@ -193,11 +197,11 @@ impl S3Src {
         gst::info!(
             CAT,
             imp: self,
-            "HEAD success, content length = {}",
+            "HEAD success, content length = {:?}",
             output.content_length
         );
 
-        Ok(output.content_length as u64)
+        Ok(output.content_length.map(|size| size as u64))
     }
 
     /* Returns the bytes, Some(error) if one occurred, or a None error if interrupted */
@@ -244,7 +248,7 @@ impl S3Src {
                 WaitError::Cancelled => None,
             })?;
 
-        gst::debug!(CAT, imp: self, "Read {} bytes", output.content_length);
+        gst::debug!(CAT, imp: self, "Read {:?} bytes", output.content_length);
 
         s3utils::wait_stream(&self.canceller, &mut output.body).map_err(|err| match err {
             WaitError::FutureError(err) => Some(gst::error_msg!(
@@ -461,7 +465,7 @@ impl BaseSrcImpl for S3Src {
         let state = self.state.lock().unwrap();
         match *state {
             StreamingState::Stopped => None,
-            StreamingState::Started { size, .. } => Some(size),
+            StreamingState::Started { size, .. } => size,
         }
     }
 
diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml
index 6a8b2e3f8..1f10da8f1 100644
--- a/net/webrtc/Cargo.toml
+++ b/net/webrtc/Cargo.toml
@@ -33,14 +33,14 @@ gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-sig
 human_bytes = "0.4"
 url = "2"
 
-aws-config = "0.100.0"
-aws-types = "0.100.0"
-aws-credential-types = "0.58.0"
-aws-sigv4 = "0.58.0"
-aws-smithy-http = { version = "0.58.0", features = [ "rt-tokio" ] }
-aws-smithy-types = "0.100"
-aws-sdk-kinesisvideo = "0.37.0"
-aws-sdk-kinesisvideosignaling = "0.37.0"
+aws-config = "0.101.0"
+aws-types = "0.101.0"
+aws-credential-types = "0.101.0"
+aws-sigv4 = "0.101.0"
+aws-smithy-http = { version = "0.59.0", features = [ "rt-tokio" ] }
+aws-smithy-types = "0.101"
+aws-sdk-kinesisvideo = "0.38.0"
+aws-sdk-kinesisvideosignaling = "0.38.0"
 http = "0.2"
 chrono = "0.4"
 data-encoding = "2.3.3"
diff --git a/net/webrtc/src/aws_kvs_signaller/imp.rs b/net/webrtc/src/aws_kvs_signaller/imp.rs
index 385a6656c..0ff8db083 100644
--- a/net/webrtc/src/aws_kvs_signaller/imp.rs
+++ b/net/webrtc/src/aws_kvs_signaller/imp.rs
@@ -403,7 +403,7 @@ impl Signaller {
             .expect("Failed to build valid request");
         let (signing_instructions, _signature) =
             sign(signable_request, &signing_params)?.into_parts();
-        signing_instructions.apply_to_request(&mut request);
+        signing_instructions.apply_to_request_http0x(&mut request);
 
         let url = request.uri().to_string();