Clean up aws-smithy-http

smithy-lang · Oct 6, 2023 · 365f787 · 365f787
1 parent b02239a
commit 365f787
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 1,296 deletions.
diff --git a/aws/rust-runtime/aws-http/src/request_id.rs b/aws/rust-runtime/aws-http/src/request_id.rs
@@ -4,7 +4,6 @@
  */
 
 use aws_smithy_http::http::HttpHeaders;
-use aws_smithy_http::operation;
 use aws_smithy_http::result::SdkError;
 use aws_smithy_types::error::metadata::{
     Builder as ErrorMetadataBuilder, ErrorMetadata, ProvideErrorMetadata,
@@ -46,12 +45,6 @@ impl RequestId for Unhandled {
     }
 }
 
-impl RequestId for operation::Response {
-    fn request_id(&self) -> Option<&str> {
-        extract_request_id(self.http().headers())
-    }
-}
-
 impl<B> RequestId for http::Response<B> {
     fn request_id(&self) -> Option<&str> {
         extract_request_id(self.headers())
@@ -106,18 +99,15 @@ mod tests {
 
     #[test]
     fn test_request_id_sdk_error() {
-        let without_request_id =
-            || operation::Response::new(Response::builder().body(SdkBody::empty()).unwrap());
+        let without_request_id = || Response::builder().body(SdkBody::empty()).unwrap();
         let with_request_id = || {
-            operation::Response::new(
-                Response::builder()
-                    .header(
-                        "x-amzn-requestid",
-                        HeaderValue::from_static("some-request-id"),
-                    )
-                    .body(SdkBody::empty())
-                    .unwrap(),
-            )
+            Response::builder()
+                .header(
+                    "x-amzn-requestid",
+                    HeaderValue::from_static("some-request-id"),
+                )
+                .body(SdkBody::empty())
+                .unwrap()
         };
         assert_eq!(
             None,

diff --git a/aws/rust-runtime/aws-http/src/user_agent.rs b/aws/rust-runtime/aws-http/src/user_agent.rs
@@ -13,9 +13,9 @@ use std::fmt;
 
 /// AWS User Agent
 ///
-/// Ths struct should be inserted into the [`PropertyBag`](aws_smithy_http::operation::Request::properties)
-/// during operation construction. [`UserAgentStage`](UserAgentStage) reads `AwsUserAgent`
-/// from the property bag and sets the `User-Agent` and `x-amz-user-agent` headers.
+/// Ths struct should be inserted into the [`ConfigBag`](aws_smithy_types::config_bag::ConfigBag)
+/// during operation construction. The `UserAgentInterceptor` reads `AwsUserAgent`
+/// from the config bag and sets the `User-Agent` and `x-amz-user-agent` headers.
 #[derive(Clone, Debug)]
 pub struct AwsUserAgent {
     sdk_metadata: SdkMetadata,

diff --git a/aws/rust-runtime/aws-inlineable/src/s3_request_id.rs b/aws/rust-runtime/aws-inlineable/src/s3_request_id.rs
@@ -4,7 +4,6 @@
  */
 
 use aws_smithy_http::http::HttpHeaders;
-use aws_smithy_http::operation;
 use aws_smithy_http::result::SdkError;
 use aws_smithy_types::error::metadata::{
     Builder as ErrorMetadataBuilder, ErrorMetadata, ProvideErrorMetadata,
@@ -47,12 +46,6 @@ impl RequestIdExt for Unhandled {
     }
 }
 
-impl RequestIdExt for operation::Response {
-    fn extended_request_id(&self) -> Option<&str> {
-        extract_extended_request_id(self.http().headers())
-    }
-}
-
 impl<B> RequestIdExt for http::Response<B> {
     fn extended_request_id(&self) -> Option<&str> {
         extract_extended_request_id(self.headers())
@@ -115,15 +108,12 @@ mod test {
 
     #[test]
     fn test_extended_request_id_sdk_error() {
-        let without_extended_request_id =
-            || operation::Response::new(Response::builder().body(SdkBody::empty()).unwrap());
+        let without_extended_request_id = || Response::builder().body(SdkBody::empty()).unwrap();
         let with_extended_request_id = || {
-            operation::Response::new(
-                Response::builder()
-                    .header("x-amz-id-2", HeaderValue::from_static("some-request-id"))
-                    .body(SdkBody::empty())
-                    .unwrap(),
-            )
+            Response::builder()
+                .header("x-amz-id-2", HeaderValue::from_static("some-request-id"))
+                .body(SdkBody::empty())
+                .unwrap()
         };
         assert_eq!(
             None,

diff --git a/...lin/software/amazon/smithy/rust/codegen/client/smithy/customizations/HttpAuthDecorator.kt b/...lin/software/amazon/smithy/rust/codegen/client/smithy/customizations/HttpAuthDecorator.kt
@@ -26,7 +26,6 @@ import software.amazon.smithy.rust.codegen.core.rustlang.Writable
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
-import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
 import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
 import software.amazon.smithy.rust.codegen.core.util.dq
 import software.amazon.smithy.rust.codegen.core.util.getTrait
@@ -51,7 +50,6 @@ private fun codegenScope(runtimeConfig: RuntimeConfig): Array<Pair<String, Any>>
         "HTTP_DIGEST_AUTH_SCHEME_ID" to authHttpApi.resolve("HTTP_DIGEST_AUTH_SCHEME_ID"),
         "IdentityResolver" to smithyRuntimeApi.resolve("client::identity::IdentityResolver"),
         "Login" to smithyRuntimeApi.resolve("client::identity::http::Login"),
-        "PropertyBag" to RuntimeType.smithyHttp(runtimeConfig).resolve("property_bag::PropertyBag"),
         "SharedAuthScheme" to smithyRuntimeApi.resolve("client::auth::SharedAuthScheme"),
         "SharedIdentityResolver" to smithyRuntimeApi.resolve("client::identity::SharedIdentityResolver"),
         "Token" to smithyRuntimeApi.resolve("client::identity::http::Token"),

diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt
@@ -395,7 +395,6 @@ data class RuntimeType(val path: String, val dependency: RustDependency? = null)
 
         fun blob(runtimeConfig: RuntimeConfig) = smithyTypes(runtimeConfig).resolve("Blob")
         fun byteStream(runtimeConfig: RuntimeConfig) = smithyHttp(runtimeConfig).resolve("byte_stream::ByteStream")
-        fun classifyRetry(runtimeConfig: RuntimeConfig) = smithyHttp(runtimeConfig).resolve("retry::ClassifyRetry")
         fun dateTime(runtimeConfig: RuntimeConfig) = smithyTypes(runtimeConfig).resolve("DateTime")
         fun document(runtimeConfig: RuntimeConfig): RuntimeType = smithyTypes(runtimeConfig).resolve("Document")
         fun format(runtimeConfig: RuntimeConfig) = smithyTypes(runtimeConfig).resolve("date_time::Format")
@@ -422,11 +421,6 @@ data class RuntimeType(val path: String, val dependency: RustDependency? = null)
         fun labelFormat(runtimeConfig: RuntimeConfig, func: String) = smithyHttp(runtimeConfig).resolve("label::$func")
         fun operation(runtimeConfig: RuntimeConfig) = smithyHttp(runtimeConfig).resolve("operation::Operation")
         fun operationModule(runtimeConfig: RuntimeConfig) = smithyHttp(runtimeConfig).resolve("operation")
-        fun parseHttpResponse(runtimeConfig: RuntimeConfig) =
-            smithyHttp(runtimeConfig).resolve("response::ParseHttpResponse")
-
-        fun parseStrictResponse(runtimeConfig: RuntimeConfig) =
-            smithyHttp(runtimeConfig).resolve("response::ParseStrictResponse")
 
         fun protocolTest(runtimeConfig: RuntimeConfig, func: String): RuntimeType =
             smithyProtocolTest(runtimeConfig).resolve(func)

diff --git a/rust-runtime/aws-smithy-http/src/endpoint.rs b/rust-runtime/aws-smithy-http/src/endpoint.rs
@@ -16,7 +16,6 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 pub mod error;
-pub mod middleware;
 
 pub use error::ResolveEndpointError;
 

diff --git a/rust-runtime/aws-smithy-http/src/endpoint/middleware.rs b/rust-runtime/aws-smithy-http/src/endpoint/middleware.rs
diff --git a/rust-runtime/aws-smithy-http/src/http.rs b/rust-runtime/aws-smithy-http/src/http.rs
@@ -27,13 +27,3 @@ impl<B> HttpHeaders for http::Response<B> {
         self.headers_mut()
     }
 }
-
-impl HttpHeaders for crate::operation::Response {
-    fn http_headers(&self) -> &HeaderMap<HeaderValue> {
-        self.http().http_headers()
-    }
-
-    fn http_headers_mut(&mut self) -> &mut HeaderMap<HeaderValue> {
-        self.http_mut().http_headers_mut()
-    }
-}
diff --git a/rust-runtime/aws-smithy-http/src/lib.rs b/rust-runtime/aws-smithy-http/src/lib.rs
@@ -36,15 +36,11 @@ pub mod futures_stream_adapter;
 pub mod header;
 pub mod http;
 pub mod label;
-pub mod middleware;
 pub mod operation;
-pub mod property_bag;
 pub mod query;
 #[doc(hidden)]
 pub mod query_writer;
-pub mod response;
 pub mod result;
-pub mod retry;
 
 #[cfg(feature = "event-stream")]
 pub mod event_stream;