Fix S3 Express metric J propagation using Identity::from()

Author: vcjana

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

@@ -520,10 +520,8 @@ pub(crate) mod identity_provider {
                     let mut data = Credentials::try_from(creds)?;
                     data.get_property_mut_or_default::<Vec<AwsCredentialFeature>>()
                         .push(AwsCredentialFeature::S3ExpressBucket);
-                    Ok((
-                        Identity::new(data.clone(), data.expiry()),
-                        data.expiry().unwrap(),
-                    ))
+                    let expiry = data.expiry().unwrap();
+                    Ok((Identity::from(data), expiry))
                 })
                 .await
         }
@@ -754,14 +752,24 @@ pub(crate) mod identity_provider {
             let credentials = identity
                 .data::<Credentials>()
                 .expect("Identity should contain Credentials");
-
             let features = credentials
                 .get_property::<Vec<AwsCredentialFeature>>()
                 .expect("Credentials should have features");
-
             assert!(
                 features.contains(&AwsCredentialFeature::S3ExpressBucket),
-                "S3ExpressBucket feature should be present in credentials returned by identity()"
+                "S3ExpressBucket feature should be present in Credentials' property field"
+            );
+
+            let identity_layer = identity
+                .property::<aws_smithy_types::config_bag::FrozenLayer>()
+                .expect("Identity should have a property layer");
+            let identity_features: Vec<AwsCredentialFeature> = identity_layer
+                .load::<AwsCredentialFeature>()
+                .cloned()
+                .collect();
+            assert!(
+                identity_features.contains(&AwsCredentialFeature::S3ExpressBucket),
+                "S3ExpressBucket feature should be present in Identity's property field"
             );
         }
     }

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

@@ -7,7 +7,9 @@ use std::time::{Duration, SystemTime};
 
 use aws_config::timeout::TimeoutConfig;
 use aws_config::Region;
-use aws_runtime::user_agent::test_util::assert_ua_does_not_contain_metric_values;
+use aws_runtime::user_agent::test_util::{
+    assert_ua_contains_metric_values, assert_ua_does_not_contain_metric_values,
+};
 use aws_sdk_s3::config::endpoint::{EndpointFuture, Params, ResolveEndpoint};
 use aws_sdk_s3::config::{Builder, Credentials};
 use aws_sdk_s3::presigning::PresigningConfig;
@@ -466,3 +468,34 @@ async fn s3_express_auth_flow_should_not_be_reached_with_no_auth_schemes() {
     // If s3 Express auth flow were exercised, no request would be received, most likely due to `TimeoutError`.
     let _ = request.expect_request();
 }
+
+#[tokio::test]
+async fn s3_express_request_contains_metric_j() {
+    let _logs = capture_test_logs();
+
+    let http_client = ReplayingClient::from_file("tests/data/express/mixed-auths.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
+        .expect("Request should succeed");
+
+    let requests = http_client.take_requests().await;
+
+    let s3_express_request = requests
+        .iter()
+        .find(|req| req.headers().get("x-amz-s3session-token").is_some())
+        .expect("Should have at least one S3 Express request with session token");
+
+    let user_agent = s3_express_request
+        .headers()
+        .get("x-amz-user-agent")
+        .expect("User-Agent header should be present")
+        .to_str()
+        .expect("User-Agent should be valid UTF-8");
+
+    assert_ua_contains_metric_values(user_agent, &["J"]);
+}