Add canary for S3 Express (disabled by default until it's been released)

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" }

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

@@ -542,7 +542,9 @@ pub(crate) mod identity_provider {
             runtime_components: &'a RuntimeComponents,
             config_bag: &'a ConfigBag,
         ) -> Result<SessionCredentials, BoxError> {
-            let mut config_builder = crate::config::Builder::from_config_bag(config_bag);
+            // TODO(Post S3Express release): Thread through `BehaviorVersion` from the outer S3 client
+            let mut config_builder = crate::config::Builder::from_config_bag(config_bag)
+                .behavior_version(crate::config::BehaviorVersion::latest());
 
             // inherits all runtime components from a current S3 operation but clears out
             // out interceptors configured for that operation

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/s3/S3Decorator.kt

@@ -56,6 +56,8 @@ class S3Decorator : ClientCodegenDecorator {
             ShapeId.from("com.amazonaws.s3#CreateSessionOutput"),
             // API returns GetObjectAttributes_Response_ instead of Output
             ShapeId.from("com.amazonaws.s3#GetObjectAttributesOutput"),
+            // API returns ListAllMyDirectoryBucketsResult instead of ListDirectoryBucketsOutput
+            ShapeId.from("com.amazonaws.s3#ListDirectoryBucketsOutput"),
         )
 
     override fun protocols(

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/s3/S3ExpressDecorator.kt

@@ -294,6 +294,10 @@ private fun s3ExpressModule(runtimeConfig: RuntimeConfig) =
 
 private fun s3ExpressDependencies(runtimeConfig: RuntimeConfig) =
     arrayOf(
+        // 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`
+        CargoDependency.AHash,
         AwsCargoDependency.awsCredentialTypes(runtimeConfig),
         AwsCargoDependency.awsRuntime(runtimeConfig),
         AwsCargoDependency.awsSigv4(runtimeConfig),

aws/sdk/integration-tests/s3/tests/express.rs

@@ -27,28 +27,6 @@ where
     aws_sdk_s3::Client::from_conf(update_builder(config).build())
 }
 
-// TODO(S3Express): Convert this test to the S3 express section in canary
-#[tokio::test]
-async fn list_objects_v2() {
-    let _logs = capture_test_logs();
-
-    let http_client =
-        ReplayingClient::from_file("tests/data/express/list-objects-v2.json").unwrap();
-    let client = test_client(|b| b.http_client(http_client.clone())).await;
-
-    let result = client
-        .list_objects_v2()
-        .bucket("s3express-test-bucket--usw2-az1--x-s3")
-        .send()
-        .await;
-    dbg!(result).expect("success");
-
-    http_client
-        .validate_body_and_headers(Some(&["x-amz-s3session-token"]), "application/xml")
-        .await
-        .unwrap();
-}
-
 #[tokio::test]
 async fn mixed_auths() {
     let _logs = capture_test_logs();

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt

@@ -242,6 +242,9 @@ data class CargoDependency(
     }
 
     companion object {
+        // Forces AHash to be a later version that avoids
+        // https://github.com/tkaitchuck/aHash/issues/200
+        val AHash: CargoDependency = CargoDependency("ahash", CratesIo("0.8.11"))
         val OnceCell: CargoDependency = CargoDependency("once_cell", CratesIo("1.16"))
         val Url: CargoDependency = CargoDependency("url", CratesIo("2.3.1"))
         val Bytes: CargoDependency = CargoDependency("bytes", CratesIo("1.0.0"))

tools/ci-cdk/canary-lambda/src/canary.rs

@@ -50,9 +50,11 @@ pub fn get_canaries_to_run(
         .collect()
 }
 
+#[derive(Clone)]
 pub struct CanaryEnv {
     pub(crate) s3_bucket_name: String,
     pub(crate) s3_mrap_bucket_arn: String,
+    pub(crate) s3_express_bucket_name: String,
     pub(crate) expected_transcribe_result: String,
     #[allow(dead_code)]
     pub(crate) page_size: usize,
@@ -63,6 +65,7 @@ impl fmt::Debug for CanaryEnv {
         f.debug_struct("CanaryEnv")
             .field("s3_bucket_name", &"*** redacted ***")
             .field("s3_mrap_bucket_arn", &"*** redacted ***")
+            .field("s3_express_bucket_name", &"*** redacted ***")
             .field(
                 "expected_transcribe_result",
                 &self.expected_transcribe_result,
@@ -79,6 +82,9 @@ impl CanaryEnv {
         // S3 MRAP bucket name to test against
         let s3_mrap_bucket_arn =
             env::var("CANARY_S3_MRAP_BUCKET_ARN").expect("CANARY_S3_MRAP_BUCKET_ARN must be set");
+        // S3 Express bucket name to test against
+        let s3_express_bucket_name = env::var("CANARY_S3_EXPRESS_BUCKET_NAME")
+            .expect("CANARY_S3_EXPRESS_BUCKET_NAME must be set");
 
         // Expected transcription from Amazon Transcribe from the embedded audio file.
         // This is an environment variable so that the code doesn't need to be changed if
@@ -97,6 +103,7 @@ impl CanaryEnv {
         Self {
             s3_bucket_name,
             s3_mrap_bucket_arn,
+            s3_express_bucket_name,
             expected_transcribe_result,
             page_size,
         }