S3 storage backend

server/src/config.rs

@@ -7,8 +7,9 @@ use async_compression::Level as CompressionLevel;
 
 use common::signing::Keypair;
 use auth::{HS256Key, decode_token_hs256_secret_base64};
-use crate::storage::local::LocalStorageConfig;
 use crate::narinfo::Compression as NixCompression;
+use crate::storage::local::LocalStorageConfig;
+use crate::storage::s3::S3StorageConfig;
 
 const CONFIG_PATH: &str = "/trestripes/nixcache/config.toml";
 
@@ -113,6 +114,9 @@ pub enum StorageConfig {
     /// Local file storage.
     #[serde(rename = "local")]
     Local(LocalStorageConfig),
+    /// S3 file storage.
+    #[serde(rename = "s3")]
+    S3(S3StorageConfig),
 }
 
 /// Compression configuration.

server/src/lib.rs

@@ -17,7 +17,10 @@ use tower_http::trace::TraceLayer;
 
 use crate::config::{Config, StorageConfig};
 use crate::error::{ErrorKind, ServerResult};
-use crate::storage::{StorageBackend, local::LocalBackend};
+use crate::storage::{
+    StorageBackend,
+    local::LocalBackend, s3::S3Backend,
+};
 use crate::access::RequireAuth;
 
 /// Global server state.
@@ -30,13 +33,18 @@ pub struct State {
 }
 impl State {
     async fn new(config: Config) -> Result<Arc<Self>> {
-        let storage = match &config.storage {
-            StorageConfig::Local(local_config) => {
-                let local = LocalBackend::new(local_config.clone()).await?;
-                let boxed: Box<dyn StorageBackend> = Box::new(local);
-                Arc::new(boxed)
-            }
-        };
+        let storage = Arc::new(match &config.storage {
+            StorageConfig::Local(config) => {
+                let backend = LocalBackend::new(config.clone()).await?;
+                let boxed: Box<dyn StorageBackend> = Box::new(backend);
+                boxed
+            },
+            StorageConfig::S3(config) => {
+                let backend = S3Backend::new(config.clone()).await?;
+                let boxed: Box<dyn StorageBackend> = Box::new(backend);
+                boxed
+            },
+        });
 
         Ok(Arc::new(Self {
             config,