feat: run batcher with only one storage if second config is not set

Author: JuArce

crates/batcher/src/lib.rs

@@ -75,9 +75,9 @@ pub struct Batcher {
     s3_client: S3Client,
     s3_bucket_name: String,
     download_endpoint: String,
-    s3_client_secondary: S3Client,
-    s3_bucket_name_secondary: String,
-    download_endpoint_secondary: String,
+    s3_client_secondary: Option<S3Client>,
+    s3_bucket_name_secondary: Option<String>,
+    download_endpoint_secondary: Option<String>,
     eth_ws_url: String,
     eth_ws_url_fallback: String,
     batcher_signer: Arc<SignerMiddlewareT>,
@@ -125,20 +125,22 @@ impl Batcher {
 
         let s3_client = s3::create_client(s3_config_primary).await;
 
-        // Secondary S3 configuration
-        let s3_config_secondary = s3::S3Config {
-            access_key_id: env::var("AWS_ACCESS_KEY_ID_SECONDARY").ok(),
-            secret_access_key: env::var("AWS_SECRET_ACCESS_KEY_SECONDARY").ok(),
-            region: env::var("AWS_REGION_SECONDARY").ok(),
-            endpoint_url: env::var("UPLOAD_ENDPOINT_SECONDARY").ok(),
-        };
-
-        let s3_bucket_name_secondary = env::var("AWS_BUCKET_NAME_SECONDARY")
-            .expect("AWS_BUCKET_NAME_SECONDARY not found in environment");
-        let download_endpoint_secondary = env::var("DOWNLOAD_ENDPOINT_SECONDARY")
-            .expect("DOWNLOAD_ENDPOINT_SECONDARY not found in environment");
+        // Secondary S3 configuration (optional)
+        let s3_bucket_name_secondary = env::var("AWS_BUCKET_NAME_SECONDARY").ok();
+        let download_endpoint_secondary = env::var("DOWNLOAD_ENDPOINT_SECONDARY").ok();
 
-        let s3_client_secondary = s3::create_client(s3_config_secondary).await;
+        let s3_client_secondary = if s3_bucket_name_secondary.is_some() && download_endpoint_secondary.is_some() {
+            let s3_config_secondary = s3::S3Config {
+                access_key_id: env::var("AWS_ACCESS_KEY_ID_SECONDARY").ok(),
+                secret_access_key: env::var("AWS_SECRET_ACCESS_KEY_SECONDARY").ok(),
+                region: env::var("AWS_REGION_SECONDARY").ok(),
+                endpoint_url: env::var("UPLOAD_ENDPOINT_SECONDARY").ok(),
+            };
+            Some(s3::create_client(s3_config_secondary).await)
+        } else {
+            info!("Secondary S3 configuration not found or incomplete. Operating with primary S3 only.");
+            None
+        };
 
         let config = ConfigFromYaml::new(config_file);
         // Ensure max_batch_bytes_size can at least hold one proof of max_proof_size,
@@ -1913,25 +1915,28 @@ impl Batcher {
             warn!("Failed to upload batch to primary S3");
         }
 
-        // Try secondary S3 upload
-        if self
-            .upload_batch_to_s3(
-                &self.s3_client_secondary,
-                batch_bytes,
-                file_name,
-                &self.s3_bucket_name_secondary,
-            )
-            .await
-            .is_ok()
-        {
-            let secondary_url = format!("{}/{}", self.download_endpoint_secondary, file_name);
-            successful_urls.push(secondary_url.clone());
-            info!(
-                "Successfully uploaded batch to secondary S3: {}",
-                secondary_url
-            );
-        } else {
-            warn!("Failed to upload batch to secondary S3");
+        // Try secondary S3 upload (if configured)
+        if let (Some(s3_client_secondary), Some(s3_bucket_name_secondary), Some(download_endpoint_secondary)) = 
+            (&self.s3_client_secondary, &self.s3_bucket_name_secondary, &self.download_endpoint_secondary) {
+            if self
+                .upload_batch_to_s3(
+                    s3_client_secondary,
+                    batch_bytes,
+                    file_name,
+                    s3_bucket_name_secondary,
+                )
+                .await
+                .is_ok()
+            {
+                let secondary_url = format!("{}/{}", download_endpoint_secondary, file_name);
+                successful_urls.push(secondary_url.clone());
+                info!(
+                    "Successfully uploaded batch to secondary S3: {}",
+                    secondary_url
+                );
+            } else {
+                warn!("Failed to upload batch to secondary S3");
+            }
         }
 
         // Update metrics with number of available data services