diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml index 6a9134c6..2217d961 100644 --- a/net/aws/Cargo.toml +++ b/net/aws/Cargo.toml @@ -16,13 +16,13 @@ futures = "0.3" 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"] } -aws-config = "0.49.0" -aws-sdk-s3 = "0.19.0" -aws-sdk-transcribe = "0.19.0" -aws-types = "0.49.0" -aws-sig-auth = "0.49.0" -aws-smithy-http = { version = "0.49.0", features = [ "rt-tokio" ] } -aws-smithy-types = "0.49.0" +aws-config = "0.51.0" +aws-sdk-s3 = "0.21.0" +aws-sdk-transcribe = "0.21.0" +aws-types = "0.51.0" +aws-sig-auth = "0.51.0" +aws-smithy-http = { version = "0.51.0", features = [ "rt-tokio" ] } +aws-smithy-types = "0.51.0" http = "0.2.7" chrono = "0.4" url = "2" diff --git a/net/aws/src/s3hlssink/imp.rs b/net/aws/src/s3hlssink/imp.rs index 0cc7aa1c..74ea7428 100644 --- a/net/aws/src/s3hlssink/imp.rs +++ b/net/aws/src/s3hlssink/imp.rs @@ -23,7 +23,7 @@ use aws_sdk_s3::config; use aws_sdk_s3::model::ObjectCannedAcl; use aws_sdk_s3::types::ByteStream; use aws_sdk_s3::Endpoint; -use aws_sdk_s3::{Client, Credentials, Region, RetryConfig}; +use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials, Region}; use aws_types::sdk_config::SdkConfig; use http::Uri; diff --git a/net/aws/src/s3sink/imp.rs b/net/aws/src/s3sink/imp.rs index 6a9d61a0..4241b890 100644 --- a/net/aws/src/s3sink/imp.rs +++ b/net/aws/src/s3sink/imp.rs @@ -18,7 +18,7 @@ use aws_sdk_s3::config; use aws_sdk_s3::model::{CompletedMultipartUpload, CompletedPart}; use aws_sdk_s3::types::ByteStream; use aws_sdk_s3::Endpoint; -use aws_sdk_s3::{Client, Credentials, Region, RetryConfig}; +use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials, Region}; use http::Uri; use futures::future; diff --git a/net/aws/src/s3src/imp.rs b/net/aws/src/s3src/imp.rs index 8a6c677a..24e6341d 100644 --- a/net/aws/src/s3src/imp.rs +++ b/net/aws/src/s3src/imp.rs @@ -14,7 +14,7 @@ use std::time::Duration; use aws_sdk_s3::config; use aws_sdk_s3::Endpoint; -use aws_sdk_s3::{Client, Credentials, RetryConfig}; +use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials}; use http::Uri; use gst::glib; diff --git a/net/aws/src/s3utils.rs b/net/aws/src/s3utils.rs index 92a3f2f9..856f74f7 100644 --- a/net/aws/src/s3utils.rs +++ b/net/aws/src/s3utils.rs @@ -7,11 +7,10 @@ // SPDX-License-Identifier: MPL-2.0 use aws_config::meta::region::RegionProviderChain; -use aws_sdk_s3::{Credentials, Region}; +use aws_sdk_s3::{config::timeout::TimeoutConfig, Credentials, Region}; use aws_types::sdk_config::SdkConfig; use aws_smithy_http::byte_stream::{ByteStream, Error}; -use aws_smithy_types::{timeout, tristate::TriState}; use bytes::{buf::BufMut, Bytes, BytesMut}; use futures::stream::TryStreamExt; @@ -96,19 +95,16 @@ pub fn wait_stream( } // See setting-timeouts example in aws-sdk-rust. -pub fn timeout_config(request_timeout: Duration) -> timeout::Config { - timeout::Config::new().with_api_timeouts( - timeout::Api::new() - // This timeout acts at the "HTTP request" level and sets a separate timeout for each - // HTTP request made as part of a "service request." - .with_call_attempt_timeout(TriState::Set(request_timeout)), - ) +pub fn timeout_config(request_timeout: Duration) -> TimeoutConfig { + TimeoutConfig::builder() + .operation_attempt_timeout(request_timeout) + .build() } pub fn wait_config( canceller: &Mutex>, region: Region, - timeout_config: timeout::Config, + timeout_config: TimeoutConfig, credentials: Option, ) -> Result> { let region_provider = RegionProviderChain::first_try(region)