From f78c59b19bbcf4f8c2f2be500e0eb8d2883600ca Mon Sep 17 00:00:00 2001
From: Jack <56563911+jdockerty@users.noreply.github.com>
Date: Mon, 9 Sep 2024 03:35:16 +0100
Subject: [PATCH] feat: add `client.region` (#623)

---
 crates/iceberg/src/io/storage_s3.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/iceberg/src/io/storage_s3.rs b/crates/iceberg/src/io/storage_s3.rs
index 115640131..60e97ab45 100644
--- a/crates/iceberg/src/io/storage_s3.rs
+++ b/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;