Update to latest AWS SDK

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

6 files changed, 76 insertions, 81 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 0a109d6c9..649e9c19b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -284,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "0.57.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7489a72550db3712fe3a0a92068f832d6270ff82f518b84a800af131f99570d7"
+checksum = "14044e9a7e7ae811d99e71d35e3698113ec27eb618445863b611c60811574cc6"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -315,9 +315,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80009846d61a0a4f9070d789cf0e64db284cba6984fae3871050d044e6569cd2"
+checksum = "e1eca93b9b017fab7c53a2d1518efc7f03de631e32f420298440acbfef146d21"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -327,11 +327,10 @@ dependencies = [
 
 [[package]]
 name = "aws-http"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e65730b741a5f6422fd338bf6f76b7956b090affeaa045e78fca8c4186e0fd5"
+checksum = "c31eca8162dedcccb0ff256a878689510763b9ffd5a2c0d51ee0199dc2ec593a"
 dependencies = [
- "aws-smithy-http",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
@@ -344,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2414b96071ae840b97c0cc1d44b248d5607d648593cdf474f3fb5465572898"
+checksum = "bbb1cd6bf27e01014e52b5b181d1e700841abd8adccee55055b1a86757f9afbb"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -366,9 +365,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kinesisvideo"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7850ff38be97b732530f09345b8e6324618429c2b2e1ca4f5c155c0123622b5c"
+checksum = "412dac1e2c024a82aa90ac00f10de926165a3d43f6a6ee303616d6688f774dc5"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -388,9 +387,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kinesisvideosignaling"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ab1752e7355b7345bbb63cbc418c7e6cb2dd37e9de003cf8245addf488765a"
+checksum = "b051f5c5d75fa9bdf0b67e3c4e155726369375a56a6e27f6ff18f2b1b8ffcf3b"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -410,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84022763485483ea17d417f9832d5da198bc36829b59f086c0d35ecd2ce59991"
+checksum = "a199d3c811f6dbe2aabc0f0e1c60bf06b50a2e0106be896f2d1d223147940cc9"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -440,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "341a5b00567d0f350025501c8fd36e1ca8055744a2d17e351f0b254f84eba48a"
+checksum = "73693581f8ad829c05e52738bdc44a650881e6bb2601d06a30bd67201228536b"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -462,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbd4bffbd26f66269933bcd26123f2d6860769c0f769b6d3fc10eda025d287d8"
+checksum = "607c4f6ca50ff57ead33b8b5f89e01aefcd82a408b5b5d2a7c14385b9f93c88f"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -484,9 +483,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b1a8ae5c7098502a3e6d4130dbee1e1d3fcb8dc5d65cecab39e01d595f90f6"
+checksum = "89064d7755ed95727f0ddb3e3aaab8191e37dd9c89fc38343a1604b9462fa583"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -507,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-transcribestreaming"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc5f2feaaf9ae77128ce79a840c8a7dadc85b1aca14da5436bdfe659f2924df"
+checksum = "89eaab3870ae1bda93d86da76a50747ca8f0597c49249a3c5c32983b10a1f527"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -532,9 +531,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-translate"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b271c642b5b2516c7a7220f4649ebfdfc252e3b55be053c121bc60bc76beefb"
+checksum = "a0ab811106b5921a72ea83c241542da140f9c486982aa3f58de6491847dd79cd"
 dependencies = [
  "aws-credential-types",
  "aws-http",
@@ -555,14 +554,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3347c738e0a8449020877d319cda56da74d6e8aba9fff210720fac66cae3c7f4"
+checksum = "c2b2ae7efc433aac9c367e6038484e604df711b9ae7ad1224a1db5e3caaab0f1"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
  "aws-smithy-http",
  "aws-smithy-runtime-api",
+ "aws-smithy-types",
  "bytes",
  "form_urlencoded",
  "hex",
@@ -582,9 +582,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "0.57.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b65a284265d3eec6cc9f1daef2d0cc3b78684b712cb6c7f1d0f665456b7604"
+checksum = "324538ebc89f2414c9c92d878fe7b0538d1dea8ebb72c45f8add0aa1002a3666"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -593,9 +593,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-checksums"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40f1d5a222ba11ac7d6b20f3668ae282970e50615fa5ee1dd8ac8180c0c1803"
+checksum = "a3e6859852e8dc253cd61cd9333f0eda852b2559b9e5b3816a3bc6389e030435"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
@@ -614,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16e7ecebc2b083a1b138868a46a343204a6097f343c4830a8b22b3a0d30013e"
+checksum = "36b06bdbc42a78b92e81c1582ed5b4f149b7d98e05536126ff329462f4828100"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -625,9 +625,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715aeb61fb743848d5d398ce6fb1259f5eba5e13dceec5d5064cada1a181d38d"
+checksum = "b03f240d3eafae9359943d0ccdabf96f507e2ce00d865578bb10fc21c6a08a72"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -646,18 +646,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de21d368dcd5cab17033406ea6e7351b091164b208381de837510bd7558c0f30"
+checksum = "5593def1d50cab58bffa61483a66d369520ae8d95902562314bac9bad6aaa64d"
 dependencies = [
  "aws-smithy-types",
 ]
 
 [[package]]
 name = "aws-smithy-query"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5ace389c7e4def130bff7275647481c8d49b867909ca61d5dc9a809b3632f3"
+checksum = "71452a6f146914adf3c6b1d4e2fc8a9df6bf10a2d05bd5b982e152d62280e18c"
 dependencies = [
  "aws-smithy-types",
  "urlencoding",
@@ -665,9 +665,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4395310662d10f1847324af5fe43e621922cba03b1aa6d26c21096e18a4e79"
+checksum = "b1ad73bc100c48acc09794914f06ae717f8d07132c2512a667e516f0c0a5fd4d"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -689,9 +689,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "0.57.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27594c06f5b36e97d18ef26ed693f1d4c7167b9bbb544b3a9bb653f9f7035"
+checksum = "d354f37c2df3661338507bdb78d4ace08d3ff687c3ece9b0dca12f6fd5d09184"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -705,9 +705,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "0.57.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d36f1723ed61e82094498e7283510fe21484b73c215c33874c81a84411b5bdc"
+checksum = "f1d66124208cd17da157b8603fee220187239caa3531a0c71260704a076281d8"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -728,18 +728,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68225c8d3e3e6c565a3cf764aa82440837ef15c33d1dd7205e15715444e4b4ad"
+checksum = "dcfe149c4afea01e25105c712d16295c0b604631e97914968e3f77af27d646f2"
 dependencies = [
  "xmlparser",
 ]
 
 [[package]]
 name = "aws-types"
-version = "0.57.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc27aac60f715bab25f5d758ba5651b80aae791c48e9871ffe298683f00a2b"
+checksum = "6bee3e0dfe1b104957a49f17b5a77b1e783deac4dfd829f2718ca0437ac7b814"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -2124,8 +2124,6 @@ dependencies = [
  "aws-sdk-s3",
  "aws-sdk-transcribestreaming",
  "aws-sdk-translate",
- "aws-smithy-http",
- "aws-smithy-types",
  "aws-types",
  "base32",
  "bytes",
@@ -2138,7 +2136,6 @@ dependencies = [
  "gstreamer-audio",
  "gstreamer-base",
  "gstreamer-check",
- "http",
  "percent-encoding",
  "rand",
  "serde",
diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml
index dbbd2332f..9edbeb172 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", branch = "0.18", version = "0.18", package = "gio" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.21", version = "0.21" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.21", version = "0.21" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.21", version = "0.21", 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 066dcaebf..2d0ea1cf7 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 74d065445..3909c9ab3 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,