Skip to content

Do not exit when access key is missing #427

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 1 commit into from
Jun 6, 2023
Merged

Do not exit when access key is missing #427

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
17 changes: 3 additions & 14 deletions server/src/storage/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,11 @@ pub struct S3Config {
pub endpoint_url: String,

/// The access key for AWS S3 or compatible object storage platform
#[arg(
long,
env = "P_S3_ACCESS_KEY",
value_name = "access-key",
required_unless_present = "profile_name"
)]
#[arg(long, env = "P_S3_ACCESS_KEY", value_name = "access-key")]
pub access_key_id: Option<String>,

/// The secret key for AWS S3 or compatible object storage platform
#[arg(
long,
env = "P_S3_SECRET_KEY",
value_name = "secret-key",
required_unless_present = "profile_name"
)]
#[arg(long, env = "P_S3_SECRET_KEY", value_name = "secret-key")]
pub secret_key: Option<String>,

// Use aws profile name to fetch credentials
Expand All @@ -91,7 +81,6 @@ pub struct S3Config {
env = "P_AWS_PROFILE_NAME",
value_name = "profile",
conflicts_with_all = ["access_key_id", "secret_key"],
required = false
)]
pub profile_name: Option<String>,

Expand Down Expand Up @@ -201,7 +190,7 @@ impl ObjectStorageProvider for S3Config {
// limit objectstore to a concurrent request limit
let s3 = LimitStore::new(s3, super::MAX_OBJECT_STORE_REQUESTS);

let object_store_registry = DefaultObjectStoreRegistry::new();
let object_store_registry: DefaultObjectStoreRegistry = DefaultObjectStoreRegistry::new();
let url = ObjectStoreUrl::parse(format!("s3://{}", &self.bucket_name)).unwrap();
object_store_registry.register_store(url.as_ref(), Arc::new(s3));

Expand Down