refactor: improve S3 config reading

src/config/mod.rs

@@ -242,36 +242,13 @@ impl From<IncompleteConfig> for Config {
                     }),
                     directory_structure,
                 },
-                IncompleteMediaBackendConfig::S3 {
+                IncompleteMediaBackendConfig::S3(value) => MediaBackendConfig::S3 {
-                    endpoint,
+                    bucket: value.bucket,
-                    bucket,
+                    credentials: value.credentials,
-                    region,
+                    duration: value.duration,
-                    path,
+                    path: value.path,
-                    key,
+                    directory_structure: value.directory_structure,
-                    secret,
+                },
-                    duration,
-                    bucket_use_path,
-                    directory_structure,
-                } => {
-                    let path_style = if bucket_use_path {
-                        rusty_s3::UrlStyle::Path
-                    } else {
-                        rusty_s3::UrlStyle::VirtualHost
-                    };
-
-                    let bucket = rusty_s3::Bucket::new(endpoint, path_style, bucket, region)
-                        .expect("Invalid S3 config");
-
-                    let credentials = rusty_s3::Credentials::new(key, secret);
-
-                    MediaBackendConfig::S3 {
-                        bucket: Box::new(bucket),
-                        credentials: Box::new(credentials),
-                        duration: Duration::from_secs(duration),
-                        path,
-                        directory_structure,
-                    }
-                }
             },
             retention: media.retention.into(),
         };
@@ -511,22 +488,7 @@ pub enum IncompleteMediaBackendConfig {
         #[serde(default)]
         directory_structure: DirectoryStructure,
     },
-    S3 {
+    S3(S3MediaBackend),
-        endpoint: Url,
-        bucket: String,
-        region: String,
-        path: Option<String>,
-
-        key: String,
-        secret: String,
-
-        #[serde(default = "default_s3_duration")]
-        duration: u64,
-        #[serde(default = "false_fn")]
-        bucket_use_path: bool,
-        #[serde(default)]
-        directory_structure: DirectoryStructure,
-    },
 }
 
 impl Default for IncompleteMediaBackendConfig {
@@ -607,6 +569,58 @@ impl TryFrom<ShadowDirectoryStructure> for DirectoryStructure {
     }
 }
 
+#[derive(Deserialize)]
+struct ShadowS3MediaBackend {
+    endpoint: Url,
+    bucket: String,
+    region: String,
+    path: Option<String>,
+
+    key: String,
+    secret: String,
+
+    #[serde(default = "default_s3_duration")]
+    duration: u64,
+    #[serde(default = "false_fn")]
+    bucket_use_path: bool,
+    #[serde(default)]
+    directory_structure: DirectoryStructure,
+}
+
+impl TryFrom<ShadowS3MediaBackend> for S3MediaBackend {
+    type Error = Error;
+
+    fn try_from(value: ShadowS3MediaBackend) -> Result<Self, Self::Error> {
+        let path_style = if value.bucket_use_path {
+            rusty_s3::UrlStyle::Path
+        } else {
+            rusty_s3::UrlStyle::VirtualHost
+        };
+        let credentials = rusty_s3::Credentials::new(value.key, value.secret);
+
+        match rusty_s3::Bucket::new(value.endpoint, path_style, value.bucket, value.region) {
+            Ok(bucket) => Ok(S3MediaBackend {
+                bucket: Box::new(bucket),
+                credentials: Box::new(credentials),
+                duration: Duration::from_secs(value.duration),
+                path: value.path,
+                directory_structure: value.directory_structure,
+            }),
+            Err(_) => Err(Error::bad_config("Invalid S3 config")),
+        }
+    }
+}
+
+#[derive(Deserialize, Debug, Clone)]
+#[serde(try_from = "ShadowS3MediaBackend")]
+pub struct S3MediaBackend {
+    pub bucket: Box<rusty_s3::Bucket>,
+    pub credentials: Box<rusty_s3::Credentials>,
+    pub duration: Duration,
+    pub path: Option<String>,
+    pub directory_structure: DirectoryStructure,
+}
+
 const DEPRECATED_KEYS: &[&str] = &[
     "cache_capacity",
     "turn_username",