rebase: resolve s3 config conflicts

Author: Zk2u

bin/mosaic/src/config.rs

@@ -306,12 +306,9 @@ pub(crate) enum TableStoreBackend {
         bucket: String,
         region: String,
         prefix: String,
-<<<<<<< HEAD
-=======
         /// When both `access_key_id` and `secret_access_key` are omitted, the
         /// AWS credential chain is used: IRSA web-identity token → ECS task
         /// creds → EC2 instance profile.
->>>>>>> 3e11546 (remove IRSA backend, allow optional access_key, secret in S3Compatible backend for IRSA)
         access_key_id: Option<String>,
         secret_access_key: Option<String>,
         endpoint: Option<String>,
@@ -325,7 +322,6 @@ pub(crate) enum TableStoreBackend {
         #[serde(default)]
         virtual_hosted_style_request: bool,
     },
-<<<<<<< HEAD
 }
 
 impl TableStoreBackend {
@@ -343,8 +339,6 @@ impl TableStoreBackend {
             Self::LocalFilesystem { .. } => None,
         }
     }
-=======
->>>>>>> 3e11546 (remove IRSA backend, allow optional access_key, secret in S3Compatible backend for IRSA)
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -620,8 +614,6 @@ backend = "s3_compatible"
 bucket = "bucket"
 region = "us-east-1"
 prefix = "tables"
-access_key_id = "access"
-secret_access_key = "secret"
 {extra_table_store}
 
 [job_scheduler]
@@ -673,56 +665,15 @@ bind_addr = "127.0.0.1:8080"
         config.validate().expect("config should validate");
     }
 
-<<<<<<< HEAD
     #[test]
     fn s3_timeout_defaults_are_applied() {
-=======
-    fn sample_s3_config_toml(circuit_path: &Path, credential_lines: &str) -> String {
-        format!(
-            r#"
-[logging]
-filter = "debug"
-
-[circuit]
-path = "{}"
-
-[network]
-signing_key_hex = "1111111111111111111111111111111111111111111111111111111111111111"
-bind_addr = "127.0.0.1:7000"
-
-[[network.peers]]
-peer_id_hex = "2222222222222222222222222222222222222222222222222222222222222222"
-addr = "127.0.0.1:7001"
-
-[storage]
-
-[table_store]
-backend = "s3_compatible"
-bucket = "bucket"
-region = "us-east-1"
-prefix = "prefix"
-{}
-
-[job_scheduler]
-
-[sm_executor]
-
-[rpc]
-bind_addr = "127.0.0.1:8080"
-"#,
-            circuit_path.display(),
-            credential_lines
-        )
-    }
-
-    #[test]
-    fn validate_accepts_s3_default_credential_chain() {
->>>>>>> 6d1277f (config: reject invalid s3 session token configs)
         let path = std::env::current_exe().expect("current executable path");
-        let config: MosaicConfig =
-            toml::from_str(&sample_s3_config_toml(&path, "")).expect("config should parse");
+        let config: MosaicConfig = toml::from_str(&sample_s3_config_toml(
+            &path,
+            "request_timeout_secs = 7200\nconnect_timeout_secs = 5",
+        ))
+        .expect("config should parse");
 
-<<<<<<< HEAD
         let options = config
             .table_store
             .backend
@@ -769,7 +720,18 @@ bind_addr = "127.0.0.1:8080"
         assert_eq!(
             options.get_config_value(&ClientConfigKey::ConnectTimeout),
             expected.get_config_value(&ClientConfigKey::ConnectTimeout)
-=======
+        );
+    }
+
+    #[test]
+    fn validate_accepts_s3_default_credential_chain() {
+        let path = std::env::current_exe().expect("current executable path");
+        let config: MosaicConfig = toml::from_str(&sample_s3_config_toml(
+            &path,
+            "request_timeout_secs = 7200\nconnect_timeout_secs = 5",
+        ))
+        .expect("config should parse");
+
         config.validate().expect("config should validate");
     }
 
@@ -806,7 +768,6 @@ session_token = "token"
                 .to_string()
                 .contains("table_store.session_token requires table_store.access_key_id"),
             "unexpected error: {error}"
->>>>>>> 6d1277f (config: reject invalid s3 session token configs)
         );
     }
 }

bin/mosaic/src/main.rs

@@ -156,12 +156,6 @@ where
 
             // When credentials are omitted the builder falls through to the
             // AWS credential chain: IRSA web-identity → ECS task → instance profile.
-            if let (Some(key_id), Some(secret)) = (access_key_id, secret_access_key) {
-                builder = builder
-                    .with_access_key_id(key_id)
-                    .with_secret_access_key(secret);
-            }
-
             if let Some(endpoint) = endpoint {
                 builder = builder.with_endpoint(endpoint);
             }