Update to latest AWS SDK

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1395>

5 files changed, 27 insertions, 29 deletions

diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml
index b09c3f2b5..18b067461 100644
--- a/net/aws/Cargo.toml
+++ b/net/aws/Cargo.toml
@@ -13,21 +13,18 @@ rust-version = "1.70"
 [dependencies]
 async-stream = "0.3.4"
 base32 = "0.4"
-aws-config = "0.57.0"
-aws-sdk-s3 = "0.36.0"
-aws-sdk-transcribestreaming = "0.36.0"
-aws-sdk-translate = "0.36.0"
-aws-types = "0.57.0"
-aws-credential-types = "0.57.0"
-aws-smithy-http = { version = "0.57.0", features = [ "rt-tokio" ] }
-aws-smithy-types = "0.57.0"
+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"
 bytes = "1.0"
 futures = "0.3"
 gio = { git = "https://github.com/gtk-rs/gtk-rs-core.git", package = "gio" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
-http = "0.2.7"
 percent-encoding = "2"
 tokio = { version = "1.0", features = [ "full" ] }
 serde = "1"
diff --git a/net/aws/src/s3utils.rs b/net/aws/src/s3utils.rs
index 1dda437d3..f983d65b4 100644
--- a/net/aws/src/s3utils.rs
+++ b/net/aws/src/s3utils.rs
@@ -7,11 +7,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use aws_config::meta::region::RegionProviderChain;
-use aws_sdk_s3::config::{timeout::TimeoutConfig, Credentials, Region};
+use aws_sdk_s3::{
+    config::{timeout::TimeoutConfig, Credentials, Region},
+    primitives::{ByteStream, ByteStreamError},
+};
 use aws_types::sdk_config::SdkConfig;
 
-use aws_smithy_types::byte_stream::{error::Error, ByteStream};
-
 use bytes::{buf::BufMut, Bytes, BytesMut};
 use futures::{future, Future};
 use gst::glib::once_cell::sync::Lazy;
@@ -80,7 +81,7 @@ where
 pub fn wait_stream(
     canceller: &Mutex<Option<future::AbortHandle>>,
     stream: &mut ByteStream,
-) -> Result<Bytes, WaitError<Error>> {
+) -> Result<Bytes, WaitError<ByteStreamError>> {
     wait(canceller, async move {
         let mut collect = BytesMut::new();
 
@@ -89,7 +90,7 @@ pub fn wait_stream(
             collect.put(item)
         }
 
-        Ok::<Bytes, Error>(collect.freeze())
+        Ok::<Bytes, ByteStreamError>(collect.freeze())
     })
 }
 
@@ -105,17 +106,17 @@ pub fn wait_config(
     region: Region,
     timeout_config: TimeoutConfig,
     credentials: Option<Credentials>,
-) -> Result<SdkConfig, WaitError<Error>> {
+) -> Result<SdkConfig, WaitError<ByteStreamError>> {
     let region_provider = RegionProviderChain::first_try(region)
         .or_default_provider()
         .or_else(Region::new(DEFAULT_S3_REGION));
     let config_future = match credentials {
-        Some(cred) => aws_config::from_env()
+        Some(cred) => aws_config::defaults(aws_config::BehaviorVersion::latest())
             .timeout_config(timeout_config)
             .region(region_provider)
             .credentials_provider(cred)
             .load(),
-        None => aws_config::from_env()
+        None => aws_config::defaults(aws_config::BehaviorVersion::latest())
             .timeout_config(timeout_config)
             .region(region_provider)
             .load(),
diff --git a/net/aws/src/transcriber/imp.rs b/net/aws/src/transcriber/imp.rs
index 283d6903f..6b94a10b2 100644
--- a/net/aws/src/transcriber/imp.rs
+++ b/net/aws/src/transcriber/imp.rs
@@ -557,7 +557,7 @@ impl Transcriber {
             }
             _ => {
                 gst::debug!(CAT, imp: self, "Attempting to get credentials from env...");
-                aws_config::from_env()
+                aws_config::defaults(aws_config::BehaviorVersion::latest())
             }
         };
 
diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml
index 891761279..02f8a81f9 100644
--- a/net/webrtc/Cargo.toml
+++ b/net/webrtc/Cargo.toml
@@ -33,15 +33,15 @@ gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-sig
 human_bytes = "0.4"
 url = "2"
 
-aws-config = "0.57.0"
-aws-types = "0.57.0"
-aws-credential-types = "0.57.0"
-aws-sigv4 = "0.57.0"
-aws-smithy-http = { version = "0.57.0", features = [ "rt-tokio" ] }
-aws-smithy-types = "0.57.0"
-aws-sdk-kinesisvideo = "0.36.0"
-aws-sdk-kinesisvideosignaling = "0.36.0"
-http = "0.2.7"
+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"
+http = "0.2"
 chrono = "0.4"
 data-encoding = "2.3.3"
 url-escape = "0.1.1"
diff --git a/net/webrtc/src/aws_kvs_signaller/imp.rs b/net/webrtc/src/aws_kvs_signaller/imp.rs
index b88e12b73..128b6ca3f 100644
--- a/net/webrtc/src/aws_kvs_signaller/imp.rs
+++ b/net/webrtc/src/aws_kvs_signaller/imp.rs
@@ -233,7 +233,7 @@ impl Signaller {
         };
 
         let client = Client::new(
-            &aws_config::from_env()
+            &aws_config::defaults(aws_config::BehaviorVersion::latest())
                 .credentials_provider(credentials.clone())
                 .load()
                 .await,
@@ -303,7 +303,7 @@ impl Signaller {
         );
 
         let signaling_config = aws_sdk_kinesisvideosignaling::config::Builder::from(
-            &aws_config::from_env()
+            &aws_config::defaults(aws_config::BehaviorVersion::latest())
                 .credentials_provider(credentials.clone())
                 .load()
                 .await,