diff --git a/rust_dev_preview/cross_service/rest_ses/Cargo.toml b/rust_dev_preview/cross_service/rest_ses/Cargo.toml index d429638a7cd..d39ae87fd61 100644 --- a/rust_dev_preview/cross_service/rest_ses/Cargo.toml +++ b/rust_dev_preview/cross_service/rest_ses/Cargo.toml @@ -45,7 +45,7 @@ uuid = { version = "1.2.1", features = ["v4", "serde"] } xlsxwriter = "0.6.0" [dev-dependencies] -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["test-util"] } +aws-smithy-runtime = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } fake = { version = "2.5.0", features = ["uuid"] } once_cell = "1.15.0" diff --git a/rust_dev_preview/examples/cognitoidentity/src/bin/describe-identity-pool.rs b/rust_dev_preview/examples/cognitoidentity/src/bin/describe-identity-pool.rs index eee8ddfecf0..1a922599036 100644 --- a/rust_dev_preview/examples/cognitoidentity/src/bin/describe-identity-pool.rs +++ b/rust_dev_preview/examples/cognitoidentity/src/bin/describe-identity-pool.rs @@ -64,13 +64,13 @@ async fn describe_pool(client: &Client, id: &str) -> Result<(), Error> { println!(" value: {}", value); } - let open_id_arns = response.open_id_connect_provider_ar_ns(); + let open_id_arns = response.open_id_connect_provider_arns(); println!(" Open ID provider ARNs:"); for arn in open_id_arns { println!(" {}", arn); } - let saml_arns = response.saml_provider_ar_ns(); + let saml_arns = response.saml_provider_arns(); println!(" SAML provider ARNs:"); for arn in saml_arns { println!(" {}", arn); diff --git a/rust_dev_preview/examples/custom-root-certificates/Cargo.toml b/rust_dev_preview/examples/custom-root-certificates/Cargo.toml index a961c5e711e..a3605ff91e5 100644 --- a/rust_dev_preview/examples/custom-root-certificates/Cargo.toml +++ b/rust_dev_preview/examples/custom-root-certificates/Cargo.toml @@ -8,7 +8,6 @@ description = "An example demonstrating setting a custom root certificate with r [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" } # bringing our own HTTPs so no need for the default features aws-sdk-s3 = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } tokio = { version = "1.21.2", features = ["full"] } diff --git a/rust_dev_preview/examples/dynamodb/Cargo.toml b/rust_dev_preview/examples/dynamodb/Cargo.toml index 94085e4ee72..eadc56e11a9 100644 --- a/rust_dev_preview/examples/dynamodb/Cargo.toml +++ b/rust_dev_preview/examples/dynamodb/Cargo.toml @@ -14,7 +14,6 @@ edition = "2021" aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } 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" } diff --git a/rust_dev_preview/examples/glue/Cargo.toml b/rust_dev_preview/examples/glue/Cargo.toml index cc746495b4d..5b6e0daa005 100644 --- a/rust_dev_preview/examples/glue/Cargo.toml +++ b/rust_dev_preview/examples/glue/Cargo.toml @@ -17,11 +17,6 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" aws-sdk-glue = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-sdk-s3 = { 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", ] } diff --git a/rust_dev_preview/examples/kms/Cargo.toml b/rust_dev_preview/examples/kms/Cargo.toml index 74717fdc895..4cd0f82d5d3 100644 --- a/rust_dev_preview/examples/kms/Cargo.toml +++ b/rust_dev_preview/examples/kms/Cargo.toml @@ -11,11 +11,6 @@ description = "Example usage of the KMS service" [dependencies] aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-sdk-kms = { 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", -] } tokio = { version = "1.20.1", features = ["full"] } base64 = "0.13.0" clap = { version = "~4.2", features = ["derive"] } diff --git a/rust_dev_preview/examples/s3/Cargo.toml b/rust_dev_preview/examples/s3/Cargo.toml index 92d8b2ab198..36c7fdcb42b 100644 --- a/rust_dev_preview/examples/s3/Cargo.toml +++ b/rust_dev_preview/examples/s3/Cargo.toml @@ -26,9 +26,6 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" aws-endpoint = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } # snippet-end:[s3.rust.s3-object-lambda-cargo.toml] aws-sdk-s3 = { 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-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" } diff --git a/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs b/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs index f21feea2a99..cf6fca1ffa1 100644 --- a/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs +++ b/rust_dev_preview/examples/s3/src/bin/put-object-progress.rs @@ -160,7 +160,6 @@ async fn put_object(client: &Client, opts: &Opt) -> Result<(), anyhow::Error> { // ProgressBody wrapped implementation. let customized = request .customize() - .await? .map_request(ProgressBody::::replace); let out = customized.send().await?; diff --git a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml index 1f013781a88..7c3718c1621 100644 --- a/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml +++ b/rust_dev_preview/examples/sending-presigned-requests/Cargo.toml @@ -16,3 +16,4 @@ reqwest = "0.11" clap = { version = "~4.2", features = ["derive"] } tokio = { version = "1.20.1", features = ["full"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } +hyper-tls = "0.5.0" diff --git a/rust_dev_preview/examples/sending-presigned-requests/src/main.rs b/rust_dev_preview/examples/sending-presigned-requests/src/main.rs index 1f8cc963c9e..a9453025d79 100644 --- a/rust_dev_preview/examples/sending-presigned-requests/src/main.rs +++ b/rust_dev_preview/examples/sending-presigned-requests/src/main.rs @@ -127,7 +127,7 @@ fn print_as_curl_request(presigned_req: &PresignedRequest, body: Option<&str>) { /// This function demonstrates how you can send a presigned request using [hyper](https://crates.io/crates/hyper) async fn send_presigned_request_with_hyper(req: PresignedRequest, body: hyper::Body) { - let conn = aws_smithy_client::conns::https(); + let conn = hyper_tls::HttpsConnector::new(); let client = hyper::Client::builder().build(conn); let req = req.to_http_request(body).unwrap(); diff --git a/rust_dev_preview/examples/testing/Cargo.toml b/rust_dev_preview/examples/testing/Cargo.toml index 4cc5e3ae78e..59f75ba26f3 100644 --- a/rust_dev_preview/examples/testing/Cargo.toml +++ b/rust_dev_preview/examples/testing/Cargo.toml @@ -13,9 +13,6 @@ async-trait = "0.1.51" # snippet-end:[testing.rust.Cargo.toml] aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-sdk-s3 = { 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-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = [ diff --git a/rust_dev_preview/run_all.sh b/rust_dev_preview/run_all.sh index 29be134e609..988ef8537f1 100755 --- a/rust_dev_preview/run_all.sh +++ b/rust_dev_preview/run_all.sh @@ -15,11 +15,11 @@ export APP_ENVIRONMENT="test" FAIL=() for f in ${DIRS[@]} ; do - "$HOME/.cargo/bin/cargo" fmt --manifest-path rust_dev_preview/$f/Cargo.toml --all --check || FAIL+=("fmt $f") - "$HOME/.cargo/bin/cargo" clippy --manifest-path rust_dev_preview/$f/Cargo.toml --all || FAIL+=("clippy $f") - "$HOME/.cargo/bin/cargo" test --manifest-path rust_dev_preview/$f/Cargo.toml --all || FAIL+=("clippy $f") + "$HOME/.cargo/bin/cargo" fmt --manifest-path rust_dev_preview/$f/Cargo.toml --all --check || FAIL+=("fmt:$f") + "$HOME/.cargo/bin/cargo" clippy --manifest-path rust_dev_preview/$f/Cargo.toml --all || FAIL+=("clippy:$f") + "$HOME/.cargo/bin/cargo" test --manifest-path rust_dev_preview/$f/Cargo.toml --all || FAIL+=("test:$f") done -echo $FAIL - +echo $FAIL; exit "${#FAIL[@]}" + diff --git a/rust_dev_preview/test-utils/Cargo.toml b/rust_dev_preview/test-utils/Cargo.toml index 815d5cec597..2cc5b68ec19 100644 --- a/rust_dev_preview/test-utils/Cargo.toml +++ b/rust_dev_preview/test-utils/Cargo.toml @@ -10,7 +10,6 @@ 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-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"} diff --git a/rust_dev_preview/webassembly/Cargo.toml b/rust_dev_preview/webassembly/Cargo.toml index f3661acd212..8c92fe5304c 100644 --- a/rust_dev_preview/webassembly/Cargo.toml +++ b/rust_dev_preview/webassembly/Cargo.toml @@ -14,7 +14,6 @@ aws-config = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", aws-credential-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["hardcoded-credentials"] } aws-sdk-lambda = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } aws-smithy-async = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } -aws-smithy-client = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", default-features = false } aws-smithy-http = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next", features = ["event-stream"] } aws-smithy-runtime-api = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" } aws-smithy-types = { git = "https://github.com/awslabs/aws-sdk-rust", branch = "next" }