mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-22 19:41:00 +00:00
Code Issues Projects Releases Wiki Activity

aws_transcriber: Fix regression with credentials mechanism

Browse source 
A regression was introduced during the migration to AWS SDK. One used
to be able to provide credentials in multiple ways with the earlier
Rusoto ChainProvider (config file / environment variables). Now one
has to explicitly set the properties.

Use the DefaultCredentialsChain from AWS SDK to restore the previous
functionality.

See
https://docs.rs/aws-config/0.46.0/aws_config/default_provider/credentials/struct.DefaultCredentialsChain.html.
This commit is contained in:
Sanchayan Maity 2022-08-04 11:41:41 +05:30 committed by Arun Raghavan
parent a4893f30c8
commit d240bbc4e2
1 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
net/aws/src/aws_transcriber/imp.rs
View file

@ -13,8 +13,10 @@ use gst::{element_error, error_msg, loggable_error};
use std::default::Default;
use aws_config::default_provider::credentials::DefaultCredentialsChain;
use aws_sig_auth::signer::{self, HttpSignatureType, OperationSigningConfig, RequestConfig};
use aws_smithy_http::body::SdkBody;
use aws_types::credentials::ProvideCredentials;
use aws_types::region::{Region, SigningRegion};
use aws_types::{Credentials, SigningService};
use std::time::{Duration, SystemTime};
@ -44,6 +46,8 @@ use once_cell::sync::Lazy;
use super::AwsTranscriberResultStability;
const DEFAULT_TRANSCRIBER_REGION: &str = "us-east-1";
#[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "PascalCase")]
struct TranscriptItem {
@ -869,26 +873,47 @@ impl Transcriber {
gst::info!(CAT, obj: element, "Connecting ..");
if settings.access_key.is_none() || settings.secret_access_key.is_none() {
let region = Region::new(DEFAULT_TRANSCRIBER_REGION);
let access_key = settings.access_key.as_ref();
let secret_access_key = settings.secret_access_key.as_ref();
let session_token = settings.session_token.clone();
let credentials = match (access_key, secret_access_key) {
(Some(key), Some(secret_key)) => {
gst::debug!(
CAT,
obj: element,
"Using provided access and secret access key"
);
Ok(Credentials::new(
key.clone(),
secret_key.clone(),
session_token,
None,
"transcribe",
))
}
_ => {
gst::debug!(CAT, obj: element, "Using default AWS credentials");
let cred_future = async {
let cred = DefaultCredentialsChain::builder()
.region(region.clone())
.build()
.await;
cred.provide_credentials().await
};
RUNTIME.block_on(cred_future)
}
};
if let Err(e) = credentials {
return Err(error_msg!(
gst::LibraryError::Settings,
["Access key and secret access key not provided"]
["Failed to retrieve credentials with error {}", e]
));
}
let access_key = settings.access_key.as_ref().unwrap().clone();
let secret_access_key = settings.secret_access_key.as_ref().unwrap().clone();
let session_token = settings.session_token.clone();
let credentials = Credentials::new(
access_key,
secret_access_key,
session_token,
None,
"transcribe",
);
let region = Region::new("us-east-1");
let current_time = Utc::now();
let mut query_params = String::from("/stream-transcription-websocket?");
@ -969,7 +994,7 @@ impl Transcriber {
.sign(
&operation_config,
&request_config,
&credentials,
&credentials.unwrap(),
&mut request,
)
.map_err(|err| {