Merge branch 'main' into feat/schema-reassign-field-ids

.github/workflows/ci_typos.yml

@@ -42,4 +42,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Check typos
-        uses: crate-ci/[email protected].3
+        uses: crate-ci/[email protected].5

crates/catalog/memory/src/catalog.rs

@@ -371,7 +371,7 @@ mod tests {
         let expected_sorted_order = SortOrder::builder()
             .with_order_id(0)
             .with_fields(vec![])
-            .build(expected_schema.clone())
+            .build(expected_schema)
             .unwrap();
 
         assert_eq!(

crates/iceberg/src/io/storage_s3.rs

@@ -36,6 +36,10 @@ pub const S3_SECRET_ACCESS_KEY: &str = "s3.secret-access-key";
 pub const S3_SESSION_TOKEN: &str = "s3.session-token";
 /// S3 region.
 pub const S3_REGION: &str = "s3.region";
+/// Region to use for the S3 client.
+///
+/// This takes precedence over [`S3_REGION`].
+pub const CLIENT_REGION: &str = "client.region";
 /// S3 Path Style Access.
 pub const S3_PATH_STYLE_ACCESS: &str = "s3.path-style-access";
 /// S3 Server Side Encryption Type.
@@ -73,6 +77,9 @@ pub(crate) fn s3_config_parse(mut m: HashMap<String, String>) -> Result<S3Config
     if let Some(region) = m.remove(S3_REGION) {
         cfg.region = Some(region);
     };
+    if let Some(region) = m.remove(CLIENT_REGION) {
+        cfg.region = Some(region);
+    };
     if let Some(path_style_access) = m.remove(S3_PATH_STYLE_ACCESS) {
         if ["true", "True", "1"].contains(&path_style_access.as_str()) {
             cfg.enable_virtual_host_style = true;