mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-12-23 10:30:40 +00:00
Update to latest AWS SDK
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1395>
This commit is contained in:
Sebastian Dröge
parent
dd67dc87e3
commit
dee27e35b7
6 changed files with 76 additions and 81 deletions
101
Cargo.lock
generated
101
Cargo.lock
generated
|
|
@ -297,9 +297,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-config"
|
||||
version = "0.57.2"
|
||||
version = "0.100.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09"
|
||||
checksum = "14044e9a7e7ae811d99e71d35e3698113ec27eb618445863b611c60811574cc6"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -328,9 +328,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-credential-types"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f"
|
||||
checksum = "e1eca93b9b017fab7c53a2d1518efc7f03de631e32f420298440acbfef146d21"
|
||||
dependencies = [
|
||||
"aws-smithy-async",
|
||||
"aws-smithy-runtime-api",
|
||||
|
|
@ -340,11 +340,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-http"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246"
|
||||
checksum = "c31eca8162dedcccb0ff256a878689510763b9ffd5a2c0d51ee0199dc2ec593a"
|
||||
dependencies = [
|
||||
"aws-smithy-http",
|
||||
"aws-smithy-runtime-api",
|
||||
"aws-smithy-types",
|
||||
"aws-types",
|
||||
|
|
@ -357,9 +356,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-runtime"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff"
|
||||
checksum = "bbb1cd6bf27e01014e52b5b181d1e700841abd8adccee55055b1a86757f9afbb"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -379,9 +378,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-kinesisvideo"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1314889bc43a8aeff95a91fb426e48f429c527b38892284004b18671bacc9444"
|
||||
checksum = "412dac1e2c024a82aa90ac00f10de926165a3d43f6a6ee303616d6688f774dc5"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -401,9 +400,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-kinesisvideosignaling"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c95e6089cf8767d085e34ce0b68e513727bd6b219f8737c5dc3f7014c16062aa"
|
||||
checksum = "b051f5c5d75fa9bdf0b67e3c4e155726369375a56a6e27f6ff18f2b1b8ffcf3b"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -423,9 +422,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-s3"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf188e8af89adb0b41ae2f21b6c666c618959e40242e79aaa43fafa9c0c90a8a"
|
||||
checksum = "a199d3c811f6dbe2aabc0f0e1c60bf06b50a2e0106be896f2d1d223147940cc9"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -453,9 +452,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-sso"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa"
|
||||
checksum = "73693581f8ad829c05e52738bdc44a650881e6bb2601d06a30bd67201228536b"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -475,9 +474,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-ssooidc"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48"
|
||||
checksum = "607c4f6ca50ff57ead33b8b5f89e01aefcd82a408b5b5d2a7c14385b9f93c88f"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -497,9 +496,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-sts"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a"
|
||||
checksum = "89064d7755ed95727f0ddb3e3aaab8191e37dd9c89fc38343a1604b9462fa583"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -520,9 +519,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-transcribestreaming"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f2d3625e963f2d453f278d4d8791ca62a055d1e0d1d78e413e6b60308c941f7"
|
||||
checksum = "89eaab3870ae1bda93d86da76a50747ca8f0597c49249a3c5c32983b10a1f527"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -545,9 +544,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sdk-translate"
|
||||
version = "0.36.0"
|
||||
version = "0.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e29d057d3d192013cd1611b9d758c444c981824184514a00543ad8fdf89ef01"
|
||||
checksum = "a0ab811106b5921a72ea83c241542da140f9c486982aa3f58de6491847dd79cd"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-http",
|
||||
|
|
@ -568,14 +567,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-sigv4"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b"
|
||||
checksum = "c2b2ae7efc433aac9c367e6038484e604df711b9ae7ad1224a1db5e3caaab0f1"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-smithy-eventstream",
|
||||
"aws-smithy-http",
|
||||
"aws-smithy-runtime-api",
|
||||
"aws-smithy-types",
|
||||
"bytes",
|
||||
"form_urlencoded",
|
||||
"hex",
|
||||
|
|
@ -595,9 +595,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-async"
|
||||
version = "0.57.2"
|
||||
version = "0.100.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80"
|
||||
checksum = "324538ebc89f2414c9c92d878fe7b0538d1dea8ebb72c45f8add0aa1002a3666"
|
||||
dependencies = [
|
||||
"futures-util",
|
||||
"pin-project-lite",
|
||||
|
|
@ -606,9 +606,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-checksums"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fb5701fbfb40600cc0fa547f318552dfd4e632b2099bd75d95fb0faae70675d"
|
||||
checksum = "a3e6859852e8dc253cd61cd9333f0eda852b2559b9e5b3816a3bc6389e030435"
|
||||
dependencies = [
|
||||
"aws-smithy-http",
|
||||
"aws-smithy-types",
|
||||
|
|
@ -627,9 +627,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-eventstream"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6b33fa99f928a5815b94ee07e1377901bcf51aa749034a2c802dc38f9dcfacf5"
|
||||
checksum = "36b06bdbc42a78b92e81c1582ed5b4f149b7d98e05536126ff329462f4828100"
|
||||
dependencies = [
|
||||
"aws-smithy-types",
|
||||
"bytes",
|
||||
|
|
@ -638,9 +638,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-http"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1"
|
||||
checksum = "b03f240d3eafae9359943d0ccdabf96f507e2ce00d865578bb10fc21c6a08a72"
|
||||
dependencies = [
|
||||
"aws-smithy-eventstream",
|
||||
"aws-smithy-runtime-api",
|
||||
|
|
@ -659,18 +659,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-json"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645"
|
||||
checksum = "5593def1d50cab58bffa61483a66d369520ae8d95902562314bac9bad6aaa64d"
|
||||
dependencies = [
|
||||
"aws-smithy-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aws-smithy-query"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5"
|
||||
checksum = "71452a6f146914adf3c6b1d4e2fc8a9df6bf10a2d05bd5b982e152d62280e18c"
|
||||
dependencies = [
|
||||
"aws-smithy-types",
|
||||
"urlencoding",
|
||||
|
|
@ -678,9 +678,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-runtime"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b"
|
||||
checksum = "b1ad73bc100c48acc09794914f06ae717f8d07132c2512a667e516f0c0a5fd4d"
|
||||
dependencies = [
|
||||
"aws-smithy-async",
|
||||
"aws-smithy-http",
|
||||
|
|
@ -702,9 +702,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-runtime-api"
|
||||
version = "0.57.2"
|
||||
version = "0.100.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9"
|
||||
checksum = "d354f37c2df3661338507bdb78d4ace08d3ff687c3ece9b0dca12f6fd5d09184"
|
||||
dependencies = [
|
||||
"aws-smithy-async",
|
||||
"aws-smithy-types",
|
||||
|
|
@ -718,9 +718,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-types"
|
||||
version = "0.57.2"
|
||||
version = "0.100.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03"
|
||||
checksum = "f1d66124208cd17da157b8603fee220187239caa3531a0c71260704a076281d8"
|
||||
dependencies = [
|
||||
"base64-simd",
|
||||
"bytes",
|
||||
|
|
@ -741,18 +741,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "aws-smithy-xml"
|
||||
version = "0.57.2"
|
||||
version = "0.58.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac"
|
||||
checksum = "dcfe149c4afea01e25105c712d16295c0b604631e97914968e3f77af27d646f2"
|
||||
dependencies = [
|
||||
"xmlparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aws-types"
|
||||
version = "0.57.2"
|
||||
version = "0.100.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38"
|
||||
checksum = "6bee3e0dfe1b104957a49f17b5a77b1e783deac4dfd829f2718ca0437ac7b814"
|
||||
dependencies = [
|
||||
"aws-credential-types",
|
||||
"aws-smithy-async",
|
||||
|
|
@ -2174,8 +2174,6 @@ dependencies = [
|
|||
"aws-sdk-s3",
|
||||
"aws-sdk-transcribestreaming",
|
||||
"aws-sdk-translate",
|
||||
"aws-smithy-http",
|
||||
"aws-smithy-types",
|
||||
"aws-types",
|
||||
"base32",
|
||||
"bytes",
|
||||
|
|
@ -2188,7 +2186,6 @@ dependencies = [
|
|||
"gstreamer-audio",
|
||||
"gstreamer-base",
|
||||
"gstreamer-check",
|
||||
"http",
|
||||
"percent-encoding",
|
||||
"rand",
|
||||
"serde",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue