Remove middleware - part 2 (#2925)

This PR continues removing middleware by addressing the simpler `TODO(enableNewSmithyRuntimeCleanup)` comments in the code generator. ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._
smithy-lang · Aug 21, 2023 · b84c02b · b84c02b
1 parent 99ff449
commit b84c02b
Show file tree

Hide file tree

Showing 60 changed files with 345 additions and 3,011 deletions.
diff --git a/aws/rust-runtime/aws-inlineable/Cargo.toml b/aws/rust-runtime/aws-inlineable/Cargo.toml
@@ -25,7 +25,7 @@ aws-smithy-http-tower = { path = "../../../rust-runtime/aws-smithy-http-tower" }
 aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["client"] }
 aws-smithy-runtime = { path = "../../../rust-runtime/aws-smithy-runtime", features = ["client"] }
 aws-smithy-types = { path = "../../../rust-runtime/aws-smithy-types" }
-aws-smithy-async = { path = "../../../rust-runtime/aws-smithy-async" }
+aws-smithy-async = { path = "../../../rust-runtime/aws-smithy-async", features = ["rt-tokio"] }
 aws-types = { path = "../aws-types" }
 bytes = "1"
 bytes-utils = "0.1.1"
@@ -36,7 +36,6 @@ md-5 = "0.10.1"
 ring = "0.16"
 tokio = { version = "1.23.1", features = ["full"] }
 tokio-stream = "0.1.5"
-tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 
 [dev-dependencies]

diff --git a/aws/rust-runtime/aws-inlineable/src/lib.rs b/aws/rust-runtime/aws-inlineable/src/lib.rs
@@ -28,9 +28,6 @@ pub mod no_credentials;
 /// Support types required for adding presigning to an operation in a generated service.
 pub mod presigning;
 
-/// Presigning tower service
-pub mod presigning_service;
-
 /// Presigning interceptors
 pub mod presigning_interceptors;
 
@@ -43,9 +40,6 @@ pub mod glacier_checksums;
 /// Glacier-specific behavior
 pub mod glacier_interceptors;
 
-/// Default middleware stack for AWS services
-pub mod middleware;
-
 /// Strip prefixes from IDs returned by Route53 operations when those IDs are used to construct requests
 pub mod route53_resource_id_preprocessor_middleware;
 

diff --git a/aws/rust-runtime/aws-inlineable/src/middleware.rs b/aws/rust-runtime/aws-inlineable/src/middleware.rs
diff --git a/aws/rust-runtime/aws-inlineable/src/presigning.rs b/aws/rust-runtime/aws-inlineable/src/presigning.rs
@@ -174,6 +174,7 @@ impl PresigningConfigBuilder {
 pub struct PresignedRequest(http::Request<()>);
 
 impl PresignedRequest {
+    #[allow(dead_code)]
     pub(crate) fn new(inner: http::Request<()>) -> Self {
         Self(inner)
     }

diff --git a/aws/rust-runtime/aws-inlineable/src/presigning_service.rs b/aws/rust-runtime/aws-inlineable/src/presigning_service.rs
diff --git a/aws/rust-runtime/aws-inlineable/tests/middleware_e2e_test.rs b/aws/rust-runtime/aws-inlineable/tests/middleware_e2e_test.rs
diff --git a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsCodegenDecorator.kt b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsCodegenDecorator.kt
@@ -35,7 +35,6 @@ val DECORATORS: List<ClientCodegenDecorator> = listOf(
         RequireEndpointRules(),
         UserAgentDecorator(),
         SigV4AuthDecorator(),
-        SigV4SigningDecorator(),
         HttpRequestChecksumDecorator(),
         HttpResponseChecksumDecorator(),
         RetryClassifierDecorator(),