Skip to content

Fetch from task iam when env var is found #480

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

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Fetch from task iam when env var is found #480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6aacd
Fetch from task iam when env var is found
trueleo Aug 24, 2023
c6bb2d2
Fix
trueleo Aug 24, 2023
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
10 changes: 9 additions & 1 deletion server/src/storage/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use datafusion::datasource::object_store::{
use datafusion::execution::runtime_env::RuntimeConfig;
use futures::stream::FuturesUnordered;
use futures::{StreamExt, TryStreamExt};
use object_store::aws::{AmazonS3, AmazonS3Builder, Checksum};
use object_store::aws::{AmazonS3, AmazonS3Builder, AmazonS3ConfigKey, Checksum};
use object_store::limit::LimitStore;
use object_store::path::Path as StorePath;
use object_store::{ClientOptions, ObjectStore};
Expand All @@ -46,6 +46,7 @@ use super::{object_storage, ObjectStorageProvider};
// in bytes
const MULTIPART_UPLOAD_SIZE: usize = 1024 * 1024 * 100;
const CONNECT_TIMEOUT_SECS: u64 = 5;
const AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: &str = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";

#[derive(Debug, Clone, clap::Args)]
#[command(
Expand Down Expand Up @@ -152,6 +153,13 @@ impl S3Config {
.with_secret_access_key(secret_key);
}

if let Ok(relative_uri) = std::env::var(AWS_CONTAINER_CREDENTIALS_RELATIVE_URI) {
builder = builder.with_config(
AmazonS3ConfigKey::ContainerCredentialsRelativeUri,
relative_uri,
);
}

if self.imdsv1_fallback {
builder = builder.with_imdsv1_fallback()
}
Expand Down