Add support for S3 Express One Zone

CHANGELOG.next.toml

@@ -52,3 +52,9 @@ message = "Upgrade Smithy to 1.45."
 references = ["smithy-rs#3470"]
 meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "all" }
 authors = ["jdisanti"]
+
+[[aws-sdk-rust]]
+message = "Add support for S3 Express One Zone. See [the user guide](https://github.com/awslabs/aws-sdk-rust/discussions/1091) for more details."
+references = ["aws-sdk-rust#992", "smithy-rs#3465"]
+meta = { "breaking" = false, "bug" = false, "tada" = true }
+author = "ysaito1001"

aws/rust-runtime/aws-inlineable/Cargo.toml

@@ -12,6 +12,10 @@ publish = false
 repository = "https://github.com/smithy-lang/smithy-rs"
 
 [dependencies]
+# Used by lru, and this forces it to be a later version that avoids
+# https://github.com/tkaitchuck/aHash/issues/200
+# when built with `cargo update -Z minimal-versions`
+ahash = "0.8.11"
 aws-credential-types = { path = "../aws-credential-types" }
 aws-runtime = { path = "../aws-runtime", features = ["http-02x"] }
 aws-sigv4 = { path = "../aws-sigv4" }
@@ -22,10 +26,14 @@ aws-smithy-runtime = { path = "../../../rust-runtime/aws-smithy-runtime", featur
 aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["client"] }
 aws-smithy-types = { path = "../../../rust-runtime/aws-smithy-types", features = ["http-body-0-4-x"] }
 bytes = "1"
+fastrand = "2.0.0"
 hex = "0.4.3"
 http = "0.2.9"
 http-body = "0.4.5"
+hmac = "0.12"
+lru = "0.12.2"
 ring = "0.17.5"
+sha2 = "0.10"
 tokio = "1.23.1"
 tracing = "0.1"
 

aws/rust-runtime/aws-inlineable/src/http_request_checksum.rs

@@ -60,6 +60,45 @@ impl Storable for RequestChecksumInterceptorState {
     type Storer = StoreReplace<Self>;
 }
 
+type CustomDefaultFn = Box<
+    dyn Fn(Option<ChecksumAlgorithm>, &ConfigBag) -> Option<ChecksumAlgorithm>
+        + Send
+        + Sync
+        + 'static,
+>;
+
+pub(crate) struct DefaultRequestChecksumOverride {
+    custom_default: CustomDefaultFn,
+}
+impl fmt::Debug for DefaultRequestChecksumOverride {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("DefaultRequestChecksumOverride").finish()
+    }
+}
+impl Storable for DefaultRequestChecksumOverride {
+    type Storer = StoreReplace<Self>;
+}
+impl DefaultRequestChecksumOverride {
+    pub(crate) fn new<F>(custom_default: F) -> Self
+    where
+        F: Fn(Option<ChecksumAlgorithm>, &ConfigBag) -> Option<ChecksumAlgorithm>
+            + Send
+            + Sync
+            + 'static,
+    {
+        Self {
+            custom_default: Box::new(custom_default),
+        }
+    }
+    pub(crate) fn custom_default(
+        &self,
+        original: Option<ChecksumAlgorithm>,
+        config_bag: &ConfigBag,
+    ) -> Option<ChecksumAlgorithm> {
+        (self.custom_default)(original, config_bag)
+    }
+}
+
 pub(crate) struct RequestChecksumInterceptor<AP> {
     algorithm_provider: AP,
 }
@@ -102,7 +141,7 @@ where
     /// Calculate a checksum and modify the request to include the checksum as a header
     /// (for in-memory request bodies) or a trailer (for streaming request bodies).
     /// Streaming bodies must be sized or this will return an error.
-    fn modify_before_retry_loop(
+    fn modify_before_signing(
         &self,
         context: &mut BeforeTransmitInterceptorContextMut<'_>,
         _runtime_components: &RuntimeComponents,
@@ -112,7 +151,8 @@ where
             .load::<RequestChecksumInterceptorState>()
             .expect("set in `read_before_serialization`");
 
-        if let Some(checksum_algorithm) = state.checksum_algorithm {
+        let checksum_algorithm = incorporate_custom_default(state.checksum_algorithm, cfg);
+        if let Some(checksum_algorithm) = checksum_algorithm {
             let request = context.request_mut();
             add_checksum_for_request_body(request, checksum_algorithm, cfg)?;
         }
@@ -121,6 +161,16 @@ where
     }
 }
 
+fn incorporate_custom_default(
+    checksum: Option<ChecksumAlgorithm>,
+    cfg: &ConfigBag,
+) -> Option<ChecksumAlgorithm> {
+    match cfg.load::<DefaultRequestChecksumOverride>() {
+        Some(checksum_override) => checksum_override.custom_default(checksum, cfg),
+        None => checksum,
+    }
+}
+
 fn add_checksum_for_request_body(
     request: &mut HttpRequest,
     checksum_algorithm: ChecksumAlgorithm,

aws/rust-runtime/aws-inlineable/src/lib.rs

@@ -31,6 +31,11 @@ pub mod presigning;
 /// Presigning interceptors
 pub mod presigning_interceptors;
 
+// This module uses module paths that assume the target crate to which it is copied, e.g.
+// `crate::config::endpoint::Params`. If included into `aws-inlineable`, this module would
+// fail to compile.
+// pub mod s3_express;
+
 /// Special logic for extracting request IDs from S3's responses.
 #[allow(dead_code)]
 pub mod s3_request_id;