Skip to content
Open
Changes from all commits
Commits
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
51 changes: 47 additions & 4 deletions rust/lance-io/src/object_store/providers/aws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,12 @@ impl CredentialProvider for AwsCredentialAdapter {
token: creds.session_token().map(|s| s.to_string()),
}))
} else {
let refreshed_creds =
Arc::new(self.inner.provide_credentials().await.map_err(|e| {
Error::internal(format!("Failed to get AWS credentials: {:?}", e))
})?);
let refreshed_creds = Arc::new(
self.inner
.provide_credentials()
.await
.map_err(|e| Error::io(format!("Failed to get AWS credentials: {:?}", e)))?,
);

self.cache
.write()
Expand Down Expand Up @@ -580,6 +582,7 @@ pub type DynamicStorageOptionsCredentialProvider =
mod tests {
use crate::object_store::ObjectStoreRegistry;
use crate::object_store::StorageOptionsProvider;
use aws_credential_types::provider::error::CredentialsError;
use mock_instant::thread_local::MockClock;
use object_store::path::Path;
use std::sync::atomic::{AtomicBool, Ordering};
Expand All @@ -605,6 +608,46 @@ mod tests {
}
}

#[derive(Debug)]
struct FailingAwsCredentialsProvider;

impl ProvideCredentials for FailingAwsCredentialsProvider {
fn provide_credentials<'a>(
&'a self,
) -> aws_credential_types::provider::future::ProvideCredentials<'a>
where
Self: 'a,
{
aws_credential_types::provider::future::ProvideCredentials::new(async {
Err(CredentialsError::provider_error(Box::new(
std::io::Error::other("Glue credential endpoint unavailable"),
)))
})
}
}

#[tokio::test]
async fn test_aws_credential_failure_is_io_error() {
let provider = AwsCredentialAdapter::new(
Arc::new(FailingAwsCredentialsProvider),
Duration::from_secs(60),
);

let error = provider.get_credential().await.unwrap_err();
let object_store::Error::Generic { source, .. } = &error else {
panic!("expected a generic object store error, got {error}");
};
assert!(matches!(
source.downcast_ref::<Error>(),
Some(Error::IO { .. })
));

let message = error.to_string();
assert!(message.contains("Failed to get AWS credentials"));
assert!(message.contains("Glue credential endpoint unavailable"));
assert!(!message.contains("Encountered internal error"));
}

#[tokio::test]
async fn test_injected_aws_creds_option_is_used() {
let mock_provider = Arc::new(MockAwsCredentialsProvider::default());
Expand Down
Loading