Skip to content

Commit

Permalink
Update from TestConnector to StaticReplayClient
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidSouther committed Oct 11, 2023
1 parent a0ecc30 commit 0dca99a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 26 deletions.
23 changes: 9 additions & 14 deletions rust_dev_preview/examples/dynamodb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
8 changes: 4 additions & 4 deletions rust_dev_preview/examples/dynamodb/src/scenario/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
"",
(
Expand All @@ -136,8 +136,8 @@ mod test_list_more_tables {
)
),
test_event!("", (200, r#"{"TableNames":["g","h"]}"#)),
],
))
]),
)
.build(),
);

Expand Down
5 changes: 2 additions & 3 deletions rust_dev_preview/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions rust_dev_preview/test-utils/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down Expand Up @@ -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()),
))
Expand Down
4 changes: 2 additions & 2 deletions rust_dev_preview/test-utils/src/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
])
}

0 comments on commit 0dca99a

Please sign in to comment.