Update from TestConnector to StaticReplayClient

DavidSouther · DavidSouther · commit cc7b98994374 · 2023-10-13T10:50:13.000-04:00
diff --git a/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml b/rust_dev_preview/cross_service/photo_asset_management/Cargo.toml
@@ -23,6 +23,7 @@ aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch =
   "test-util",
 ] }
 aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-smithy-types-convert ={ git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["convert-chrono"] }
 aws_lambda_events = { version = "0.10.0", features = ["s3", "apigw"], default-features = false }
 bytes = "1.4.0"
@@ -35,6 +36,7 @@ lambda_runtime = "0.8.0"
 miniz_oxide = "0.7.1"
 pin-project = "1.0.12"
 pipe = "0.4.0"
+sdk-examples-test-utils = { path = "../../test-utils" }
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
 streaming-zip = "0.5.0"
diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/handlers/labels.rs b/rust_dev_preview/cross_service/photo_asset_management/src/handlers/labels.rs
@@ -104,10 +104,9 @@ pub async fn handler(
 
 #[cfg(test)]
 mod test {
+    use sdk_examples_test_utils::single_shot_client;
     use serde_json::json;
 
-    use crate::single_shot_client;
-
     use super::{get_labels, Labels};
 
     #[tokio::test]
diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/lib.rs b/rust_dev_preview/cross_service/photo_asset_management/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod chunked_uploader;
 pub mod common;
 pub mod handlers;
-pub mod test_utils;
 pub mod uploader;
diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/test_utils/macros.rs b/rust_dev_preview/cross_service/photo_asset_management/src/test_utils/macros.rs
diff --git a/rust_dev_preview/cross_service/photo_asset_management/src/test_utils/mod.rs b/rust_dev_preview/cross_service/photo_asset_management/src/test_utils/mod.rs
diff --git a/rust_dev_preview/cross_service/rest_ses/Cargo.toml b/rust_dev_preview/cross_service/rest_ses/Cargo.toml
@@ -18,6 +18,7 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"
 aws-sdk-cloudwatchlogs = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-rdsdata = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-sdk-ses = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 chrono = { version = "0.4.22", default-features = false, features = [
     "clock",
     "serde",
diff --git a/rust_dev_preview/cross_service/rest_ses/src/client.rs b/rust_dev_preview/cross_service/rest_ses/src/client.rs
@@ -64,23 +64,20 @@ impl RdsClient {
 
 #[cfg(test)]
 mod rds_client_for_test {
-    use aws_smithy_http::body::SdkBody;
+    use aws_smithy_runtime::client::http::test_util::ReplayEvent;
     use secrecy::Secret;
 
     use super::RdsClient;
     impl RdsClient {
-        pub fn for_test(
-            pairs: Vec<(
-                http::request::Request<SdkBody>,
-                http::response::Response<SdkBody>,
-            )>,
-        ) -> Self {
+        pub fn for_test(pairs: Vec<ReplayEvent>) -> Self {
             RdsClient {
                 client: aws_sdk_rdsdata::Client::from_conf(
                     sdk_examples_test_utils::client_config!(aws_sdk_rdsdata)
-                        .http_connector(aws_smithy_client::test_connection::TestConnection::new(
-                            pairs,
-                        ))
+                        .http_client(
+                            aws_smithy_runtime::client::http::test_util::StaticReplayClient::new(
+                                pairs,
+                            ),
+                        )
                         .build(),
                 ),
                 secret_arn: Secret::from("secret".to_string()),
diff --git a/rust_dev_preview/examples/dynamodb/Cargo.toml b/rust_dev_preview/examples/dynamodb/Cargo.toml
@@ -12,30 +12,25 @@ edition = "2021"
 
 [dependencies]
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
-  "client-hyper",
-  "rustls",
-  "rt-tokio",
-] }
-aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
-  "rt-tokio",
-] }
+aws-sdk-dynamodb = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "client-hyper", "rustls", "rt-tokio", ] }
+aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "rt-tokio", ] }
+aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["test-util"] }
 aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 axum = "0.5.16"
-http = "0.2.5"
+clap = { version = "~4.2", features = ["derive"] }
 futures = "0.3"
+http = "0.2.5"
 log = "0.4.17"
 rand = "0.8.3"
 sdk-examples-test-utils = { path = "../../test-utils" }
 serde = {version = "1.0", features = ["derive"]}
-serde_json = "1"
 serde_dynamo = { version = "4", features = ["aws-sdk-dynamodb+0_22"] }
-clap = { version = "~4.2", features = ["derive"] }
-tracing = "0.1"
+serde_json = "1"
 thiserror = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
 tokio-stream = "0.1.8"
 tower-http = { version = "0.3.0", features = ["cors"] }
-tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+tracing = "0.1"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
diff --git a/rust_dev_preview/examples/dynamodb/src/scenario/list.rs b/rust_dev_preview/examples/dynamodb/src/scenario/list.rs
@@ -119,8 +119,8 @@ mod test_list_more_tables {
     async fn test_list_tables_iterative() {
         let client = aws_sdk_dynamodb::Client::from_conf(
             sdk_examples_test_utils::client_config!(aws_sdk_dynamodb)
-                .http_connector(aws_smithy_client::test_connection::TestConnection::new(
-                    vec![
+                .http_client(
+                    aws_smithy_runtime::client::http::test_util::StaticReplayClient::new(vec![
                         test_event!(
                             "",
                             (
@@ -136,8 +136,8 @@ mod test_list_more_tables {
                             )
                         ),
                         test_event!("", (200, r#"{"TableNames":["g","h"]}"#)),
-                    ],
-                ))
+                    ]),
+                )
                 .build(),
         );
 
diff --git a/rust_dev_preview/examples/s3/Cargo.toml b/rust_dev_preview/examples/s3/Cargo.toml
@@ -30,6 +30,7 @@ aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch =
   "test-util",
 ] }
 aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["rt-tokio"] }
+aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
 sdk-examples-test-utils = { path = "../../test-utils" }
 bytes = "1.4.0"
diff --git a/rust_dev_preview/examples/s3/src/s3-service-lib.rs b/rust_dev_preview/examples/s3/src/s3-service-lib.rs
@@ -164,6 +164,7 @@ mod test {
     use std::env::temp_dir;
 
     use aws_smithy_client::test_connection::TestConnection;
+    use aws_smithy_runtime::client::http::test_util::StaticReplayClient;
     use sdk_examples_test_utils::{client_config, single_shot_client, test_event};
     use tokio::{fs::File, io::AsyncWriteExt};
     use uuid::Uuid;
@@ -190,7 +191,7 @@ mod test {
     async fn test_delete_objects() {
         let client = aws_sdk_s3::Client::from_conf(
             client_config!(aws_sdk_s3)
-                .http_connector(TestConnection::new(vec![
+                .http_client(StaticReplayClient::new(vec![
                     // client.list_objects_v2().bucket(bucket_name)
                     test_event!(
                         r#""#,
diff --git a/rust_dev_preview/run_all.sh b/rust_dev_preview/run_all.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash -x
+
+DIRS=(
+  cross_service
+  examples
+  lambda
+  webassembly
+)
+
+final=0
+for f in ${DIRS[@]} ; do
+  "$HOME/.cargo/bin/cargo" fmt --manifest-path rust_dev_preview/$f/Cargo.toml --all --check
+  [ $? ] || final=1
+  "$HOME/.cargo/bin/cargo" clippy --manifest-path rust_dev_preview/$f/Cargo.toml --all
+  [ $? ] || final=1
+  "$HOME/.cargo/bin/cargo" test --manifest-path rust_dev_preview/$f/Cargo.toml --all
+  [ $? ] || final=1
+done
+
+exit $final
diff --git a/rust_dev_preview/test-utils/Cargo.toml b/rust_dev_preview/test-utils/Cargo.toml
@@ -10,10 +10,9 @@ edition = "2021"
 
 [dependencies]
 aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
-aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [
-  "test-util",
-] }
+aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ "test-util", ] }
 aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }
+aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["test-util"] }
 aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next"}
 http = "0.2"
 
diff --git a/rust_dev_preview/test-utils/src/macros.rs b/rust_dev_preview/test-utils/src/macros.rs
@@ -20,7 +20,7 @@ macro_rules! test_event {
             $res:expr
         )
     ) => {{
-        (
+        aws_smithy_runtime::client::http::test_util::ReplayEvent::new(
             http::Request::builder()
                 .body(aws_smithy_http::body::SdkBody::from($req))
                 .unwrap(),
@@ -38,7 +38,7 @@ macro_rules! test_event {
             $res:expr
         )
     ) => {{
-        (
+        aws_smithy_runtime::client::http::test_util::ReplayEvent::new(
             http::Request::builder()
                 .body(aws_smithy_http::body::SdkBody::from($req))
                 .unwrap(),
@@ -73,7 +73,7 @@ macro_rules! single_shot_client {
     ($sdk_crate:ident, $req:expr, $status:expr, $res_headers:expr, $res:expr) => {{
         $sdk_crate::Client::from_conf(
             sdk_examples_test_utils::client_config!($sdk_crate)
-                .http_connector(sdk_examples_test_utils::single_shot(
+                .http_client(sdk_examples_test_utils::single_shot(
                     $req.into(),
                     ($status.try_into().unwrap(), $res_headers, $res.into()),
                 ))
diff --git a/rust_dev_preview/test-utils/src/mod.rs b/rust_dev_preview/test-utils/src/mod.rs
@@ -8,8 +8,8 @@ pub mod macros;
 pub fn single_shot(
     req: SdkBody,
     res: (http::StatusCode, Vec<(&str, &str)>, SdkBody),
-) -> aws_smithy_client::test_connection::TestConnection<SdkBody> {
-    aws_smithy_client::test_connection::TestConnection::new(vec![
+) -> aws_smithy_runtime::client::http::test_util::StaticReplayClient {
+    aws_smithy_runtime::client::http::test_util::StaticReplayClient::new(vec![
         (test_event!(req, (res.0, res.1, res.2))),
     ])
 }
