Skip to content

Add env variable to control aws identity cache timeout #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bbalser wants to merge 1 commit into from
Closed

Add env variable to control aws identity cache timeout #1189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions file_store/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub use rolling_file_sink::{RollingFileSink, RollingFileSinkError, RollingFileWr
pub use settings::{BucketSettings, Settings};

// Client functions
use aws_config::BehaviorVersion;
use aws_config::{identity::IdentityCache, BehaviorVersion};
use aws_sdk_s3::primitives::ByteStream;
use aws_smithy_types_convert::stream::PaginationStreamExt;
use bytes::BytesMut;
Expand All @@ -34,9 +34,20 @@ use futures::{
stream::{self, BoxStream},
FutureExt, StreamExt, TryFutureExt, TryStreamExt,
};
use std::{collections::HashMap, future::Future, path::Path, sync::OnceLock};
use std::{collections::HashMap, future::Future, path::Path, sync::OnceLock, time::Duration};
use tokio::sync::Mutex;

const IDENTITY_LOAD_TIMEOUT_ENV: &str = "FILE_STORE_IDENTITY_LOAD_TIMEOUT_SECS";
const DEFAULT_IDENTITY_LOAD_TIMEOUT: Duration = Duration::from_secs(30);

fn identity_load_timeout() -> Duration {
std::env::var(IDENTITY_LOAD_TIMEOUT_ENV)
.ok()
.and_then(|v| v.parse::<u64>().ok())
.map(Duration::from_secs)
.unwrap_or(DEFAULT_IDENTITY_LOAD_TIMEOUT)
}

pub type Client = aws_sdk_s3::Client;
pub type Stream<T> = BoxStream<'static, Result<T>>;
pub type FileInfoStream = Stream<FileInfo>;
Expand Down Expand Up @@ -94,7 +105,14 @@ pub async fn new_client(
return client.clone();
}

let config = aws_config::defaults(BehaviorVersion::latest()).load().await;
let config = aws_config::defaults(BehaviorVersion::latest())
.identity_cache(
IdentityCache::lazy()
.load_timeout(identity_load_timeout())
.build(),
)
.load()
.await;

let mut s3_config = aws_sdk_s3::config::Builder::from(&config);

Expand Down
Loading