Skip to content

Commit

Permalink
fix: fix credentials provider
Browse files Browse the repository at this point in the history
upstream issue: awslabs/aws-sdk-rust#973

Signed-off-by: MrCroxx <mrcroxx@outlook.com>
  • Loading branch information
MrCroxx committed Nov 27, 2023
1 parent 61d4c7d commit 7c54eeb
Showing 1 changed file with 17 additions and 11 deletions.
28 changes: 17 additions & 11 deletions src/object_store/src/object/s3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,21 +641,27 @@ impl S3ObjectStore {
let (address, bucket) = rest.split_once('/').unwrap();

#[cfg(madsim)]
let builder = aws_sdk_s3::config::Builder::new();
let builder = aws_sdk_s3::config::Builder::new().credentials_provider(
Credentials::from_keys(access_key_id, secret_access_key, None),
);
#[cfg(not(madsim))]
let builder =
aws_sdk_s3::config::Builder::from(&aws_config::ConfigLoader::default().load().await)
.force_path_style(true)
.http_client(Self::new_http_client(&S3ObjectStoreConfig::default()))
.behavior_version_latest();
let builder = aws_sdk_s3::config::Builder::from(
&aws_config::ConfigLoader::default()
// FIXME: https://github.com/awslabs/aws-sdk-rust/issues/973
.credentials_provider(Credentials::from_keys(
access_key_id,
secret_access_key,
None,
))
.load()
.await,
)
.force_path_style(true)
.http_client(Self::new_http_client(&S3ObjectStoreConfig::default()))
.behavior_version_latest();
let config = builder
.region(Region::new("custom"))
.endpoint_url(format!("{}{}", endpoint_prefix, address))
.credentials_provider(Credentials::from_keys(
access_key_id,
secret_access_key,
None,
))
.build();
let client = Client::from_conf(config);

Expand Down

0 comments on commit 7c54eeb

Please sign in to comment.