s3 support commit1

src/config.rs

@@ -8,6 +8,7 @@ pub struct Config {
     pub database_max_connections: u32,
     pub static_dir: String,
     pub files_dir: String,
+    pub storage: crate::storage::StorageConfig,
     pub upload_max_size_bytes: usize,
     pub asset_version: String,
     pub asset_cache_max_age_seconds: u64,
@@ -31,6 +32,19 @@ impl Config {
             env_var("UPLOAD_MAX_SIZE_MB", "20").parse()?;
         let anonymous_access_token_ttl_days = env_positive_i64("ANONYMOUS_ACCESS_TOKEN_TTL_DAYS", 7)?;
         let user_session_ttl_days = env_positive_i64("USER_SESSION_TTL_DAYS", 30)?;
+        let files_dir = env_var("FILES_DIR", "data/files");
+        let storage = match env_var("STORAGE_DRIVER", "local").trim().to_ascii_lowercase().as_str() {
+            "local" => crate::storage::StorageConfig::Local { root: files_dir.clone().into() },
+            "s3" => crate::storage::StorageConfig::S3 {
+                endpoint: env::var("S3_ENDPOINT").ok(),
+                region: env_var("S3_REGION", "us-east-1"),
+                bucket: required_env("S3_BUCKET")?,
+                access_key: required_env("S3_ACCESS_KEY")?,
+                secret_key: required_env("S3_SECRET_KEY")?,
+                force_path_style: env_bool("S3_FORCE_PATH_STYLE", false)?,
+            },
+            _ => return Err("STORAGE_DRIVER must be local or s3".into()),
+        };
 
         if upload_max_size_mb == 0 {
             return Err("UPLOAD_MAX_SIZE_MB must be greater than 0".into());
@@ -57,7 +71,8 @@ impl Config {
             ),
             database_max_connections,
             static_dir: env_var("STATIC_DIR", "static"),
-            files_dir: env_var("FILES_DIR", "data/files"),
+            files_dir,
+            storage,
             upload_max_size_bytes: upload_max_size_mb
                 .checked_mul(1024 * 1024)
                 .ok_or("UPLOAD_MAX_SIZE_MB is too large")?,
@@ -108,3 +123,9 @@ fn env_positive_i64(name: &str, default: i64) -> Result<i64, Box<dyn std::error:
 fn env_nonnegative_u64(name: &str, default: u64) -> Result<u64, Box<dyn std::error::Error>> {
     Ok(env_var(name, &default.to_string()).parse()?)
 }
+
+fn required_env(name: &str) -> Result<String, Box<dyn std::error::Error>> {
+    let value = env::var(name).map_err(|_| format!("{name} is required when STORAGE_DRIVER=s3"))?;
+    if value.trim().is_empty() { return Err(format!("{name} cannot be empty when STORAGE_DRIVER=s3").into()); }
+    Ok(value)
+}